lkml.org 
[lkml]   [2004]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH][SELINUX] 2/7 Add netif controls
    From
    Date
    On Fri, 2004-01-09 at 15:57, Andrew Morton wrote:
    > The selinux makefiles seem a little unusual. Can this not use the usual
    >
    > obj-$(CONFIG_FOO) += bar.o
    >
    > ?
    >
    > Similarly, security/Makefile uses:
    >
    > ifeq ($(CONFIG_SECURITY_SELINUX),y)
    > obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o
    > endif
    >
    > why the `ifeq'?

    Hmm...possible diff below against 2.6.1 for the security and selinux
    makefiles.

    Index: linux-2.6/security/Makefile
    ===================================================================
    RCS file: /nfshome/pal/CVS/linux-2.6/security/Makefile,v
    retrieving revision 1.1.1.3
    diff -u -r1.1.1.3 Makefile
    --- linux-2.6/security/Makefile 29 Sep 2003 13:14:38 -0000 1.1.1.3
    +++ linux-2.6/security/Makefile 9 Jan 2004 21:06:46 -0000
    @@ -12,8 +12,6 @@
    # Object file lists
    obj-$(CONFIG_SECURITY) += security.o dummy.o
    # Must precede capability.o in order to stack properly.
    -ifeq ($(CONFIG_SECURITY_SELINUX),y)
    - obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o
    -endif
    +obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o
    obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o
    obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o
    Index: linux-2.6/security/selinux/Makefile
    ===================================================================
    RCS file: /nfshome/pal/CVS/linux-2.6/security/selinux/Makefile,v
    retrieving revision 1.1.1.1
    diff -u -r1.1.1.1 Makefile
    --- linux-2.6/security/selinux/Makefile 12 Aug 2003 13:05:04 -0000 1.1.1.1
    +++ linux-2.6/security/selinux/Makefile 9 Jan 2004 21:06:08 -0000
    @@ -4,7 +4,9 @@

    obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ss/

    -selinux-objs := avc.o hooks.o selinuxfs.o
    +selinux-y := avc.o hooks.o selinuxfs.o
    +
    +selinux-$(CONFIG_SECURITY_NETWORK) += netif.o

    EXTRA_CFLAGS += -Isecurity/selinux/include

    Index: linux-2.6/security/selinux/ss/Makefile
    ===================================================================
    RCS file: /nfshome/pal/CVS/linux-2.6/security/selinux/ss/Makefile,v
    retrieving revision 1.1.1.2
    diff -u -r1.1.1.2 Makefile
    --- linux-2.6/security/selinux/ss/Makefile 9 Jan 2004 14:24:58 -0000 1.1.1.2
    +++ linux-2.6/security/selinux/ss/Makefile 9 Jan 2004 21:06:15 -0000
    @@ -5,9 +5,7 @@
    EXTRA_CFLAGS += -Isecurity/selinux/include
    obj-y := ss.o

    -ss-objs := ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o
    +ss-y := ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o

    -ifeq ($(CONFIG_SECURITY_SELINUX_MLS),y)
    -ss-objs += mls.o
    -endif
    +ss-$(CONFIG_SECURITY_SELINUX_MLS) += mls.o

    --
    Stephen Smalley <sds@epoch.ncsc.mil>
    National Security Agency

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 13:59    [W:0.026 / U:29.904 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site