diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-01-08 08:35:52 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-01-08 14:22:10 +0100 |
| commit | f4b8d42822a645d4336f9c25090fc3281886ce7e (patch) | |
| tree | 76c883a3315afb2fe97604063408ef2929564a69 | |
| parent | 9de860c283e9c33727aa35bf3c766dfd4a37f9bd (diff) | |
| download | ptxdist-f4b8d42822a645d4336f9c25090fc3281886ce7e.tar.gz ptxdist-f4b8d42822a645d4336f9c25090fc3281886ce7e.tar.xz | |
libselinux: remove after more than one year in staging
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
22 files changed, 1 insertions, 429 deletions
diff --git a/patches/libselinux-2.1.12/0001-makefile-don-t-use-TLSFLAGS.patch b/patches/libselinux-2.1.12/0001-makefile-don-t-use-TLSFLAGS.patch deleted file mode 100644 index 9e3d7ed47..000000000 --- a/patches/libselinux-2.1.12/0001-makefile-don-t-use-TLSFLAGS.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Mon, 14 Jan 2013 19:22:25 +0100 -Subject: [PATCH] makefile: don't use TLSFLAGS - -They are generated by uname, which is not cross compile safe. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - src/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index ac019df..b63e032 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -84,10 +84,10 @@ SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno - - RANLIB=ranlib - --ARCH := $(patsubst i%86,i386,$(shell uname -m)) --ifneq (,$(filter i386,$(ARCH))) --TLSFLAGS += -mno-tls-direct-seg-refs --endif -+#ARCH := $(patsubst i%86,i386,$(shell uname -m)) -+#ifneq (,$(filter i386,$(ARCH))) -+#TLSFLAGS += -mno-tls-direct-seg-refs -+#endif - - SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ - diff --git a/patches/libselinux-2.1.12/0002-makefile-remove-host-path-from-list-of-header-search.patch b/patches/libselinux-2.1.12/0002-makefile-remove-host-path-from-list-of-header-search.patch deleted file mode 100644 index 710415e40..000000000 --- a/patches/libselinux-2.1.12/0002-makefile-remove-host-path-from-list-of-header-search.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Mon, 14 Jan 2013 19:53:14 +0100 -Subject: [PATCH] makefile: remove host path from list of header search dirs - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index b63e032..ef6910c 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -77,7 +77,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi - -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const \ - -Werror -Wno-aggregate-return -Wno-redundant-decls - --override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(EMFLAGS) -+override CFLAGS += -I../include -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(EMFLAGS) - - SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-parameter \ - -Wno-shadow -Wno-uninitialized -Wno-missing-prototypes -Wno-missing-declarations diff --git a/patches/libselinux-2.1.12/0003-makefile-remove-host-path-from-list-of-linker-search.patch b/patches/libselinux-2.1.12/0003-makefile-remove-host-path-from-list-of-linker-search.patch deleted file mode 100644 index 8418f14db..000000000 --- a/patches/libselinux-2.1.12/0003-makefile-remove-host-path-from-list-of-linker-search.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Mon, 14 Jan 2013 19:53:14 +0100 -Subject: [PATCH] makefile: remove host path from list of linker search dirs - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - src/Makefile | 8 ++++---- - utils/Makefile | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index ef6910c..68eb950 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -106,17 +106,17 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) - $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< - - $(SWIGSO): $(SWIGLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux - - $(SWIGRUBYSO): $(SWIGRUBYLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux - - $(LIBA): $(OBJS) - $(AR) rcs $@ $^ - $(RANLIB) $@ - - $(LIBSO): $(LOBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -Wl,-soname,$(LIBSO),-z,defs,-z,relro - ln -sf $@ $(TARGET) - - $(LIBPC): $(LIBPC).in ../VERSION -@@ -129,7 +129,7 @@ $(AUDIT2WHYLOBJ): audit2why.c - $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< - - $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a - - %.o: %.c policy.h - $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $< -diff --git a/utils/Makefile b/utils/Makefile -index 5f3e047..2cbec29 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -24,7 +24,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi - -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const \ - -Werror -Wno-aggregate-return -Wno-redundant-decls - override CFLAGS += -I../include -D_GNU_SOURCE $(EMFLAGS) --LDLIBS += -L../src -lselinux -L$(LIBDIR) -+LDLIBS += -L../src -lselinux - - TARGETS=$(patsubst %.c,%,$(wildcard *.c)) - diff --git a/patches/libselinux-2.1.12/0004-makefile-fix-linking-to-shlib-if-prefix.patch b/patches/libselinux-2.1.12/0004-makefile-fix-linking-to-shlib-if-prefix.patch deleted file mode 100644 index 62d595a0a..000000000 --- a/patches/libselinux-2.1.12/0004-makefile-fix-linking-to-shlib-if-prefix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Fri, 25 Jan 2013 19:39:03 +0100 -Subject: [PATCH] makefile: fix linking to shlib if prefix=/ - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - src/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/Makefile b/src/Makefile -index 68eb950..0d221bf 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -153,7 +153,11 @@ install: all - install -m 755 $(LIBSO) $(SHLIBDIR) - test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig - install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig -+ifeq ($(SHLIBDIR),$(LIBDIR)) -+ cd $(LIBDIR) && ln -sf $(LIBSO) $(TARGET) -+else - cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) -+endif - - install-pywrap: pywrap - test -d $(PYLIBDIR)/site-packages/selinux || install -m 755 -d $(PYLIBDIR)/site-packages/selinux diff --git a/patches/libselinux-2.1.12/0005-makefile-move-lpcre-from-beginning-of-gcc-linker-cal.patch b/patches/libselinux-2.1.12/0005-makefile-move-lpcre-from-beginning-of-gcc-linker-cal.patch deleted file mode 100644 index 695cd1da7..000000000 --- a/patches/libselinux-2.1.12/0005-makefile-move-lpcre-from-beginning-of-gcc-linker-cal.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Tue, 5 Feb 2013 18:19:22 +0100 -Subject: [PATCH] makefile: move -lpcre from beginning of gcc-linker call to - end - -...otherwise it won't link of --as-needed is enabled. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - src/Makefile | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 0d221bf..109d372 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -20,7 +20,8 @@ RUBYINC ?= $(shell pkg-config --cflags ruby-$(RUBYLIBVER)) - RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) - LIBBASE=$(shell basename $(LIBDIR)) - --LDFLAGS ?= -lpcre -+LDFLAGS ?= -+LDLIBS = -lpcre - - VERSION = $(shell cat ../VERSION) - LIBVERSION = 1 -@@ -106,17 +107,17 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) - $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< - - $(SWIGSO): $(SWIGLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux $(LDLIBS) - - $(SWIGRUBYSO): $(SWIGRUBYLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LDLIBS) - - $(LIBA): $(OBJS) - $(AR) rcs $@ $^ - $(RANLIB) $@ - - $(LIBSO): $(LOBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -Wl,-soname,$(LIBSO),-z,defs,-z,relro -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -Wl,-soname,$(LIBSO),-z,defs,-z,relro $(LDLIBS) - ln -sf $@ $(TARGET) - - $(LIBPC): $(LIBPC).in ../VERSION -@@ -129,7 +130,7 @@ $(AUDIT2WHYLOBJ): audit2why.c - $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< - - $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a $(LDLIBS) - - %.o: %.c policy.h - $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $< diff --git a/patches/libselinux-2.1.12/0006-makefile-use-python-config-instead-of-pkg-config.patch b/patches/libselinux-2.1.12/0006-makefile-use-python-config-instead-of-pkg-config.patch deleted file mode 100644 index 907c79880..000000000 --- a/patches/libselinux-2.1.12/0006-makefile-use-python-config-instead-of-pkg-config.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Wed, 13 Feb 2013 23:14:46 +0100 -Subject: [PATCH] makefile: use python-config instead of pkg-config - -...because our python has no pkg-config yet. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 109d372..e963009 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -12,7 +12,7 @@ LIBDIR ?= $(PREFIX)/lib - SHLIBDIR ?= $(DESTDIR)/lib - INCLUDEDIR ?= $(PREFIX)/include - PYLIBVER ?= $(shell $(PYTHON) -c 'import sys;print("python%d.%d" % sys.version_info[0:2])') --PYINC ?= $(shell pkg-config --cflags $(PYPREFIX)) -+PYINC ?= $(shell $(PYTHON)-config --cflags) - PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER) - RUBYLIBVER ?= $(shell $(RUBY) -e 'print RUBY_VERSION.split(".")[0..1].join(".")') - RUBYPLATFORM ?= $(shell $(RUBY) -e 'print RUBY_PLATFORM') diff --git a/patches/libselinux-2.1.12/0007-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch b/patches/libselinux-2.1.12/0007-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch deleted file mode 100644 index 5d96f0cb2..000000000 --- a/patches/libselinux-2.1.12/0007-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Mon, 18 Feb 2013 11:22:11 +0100 -Subject: [PATCH] makefile: add a dependency from wrapper libs to .so - -...otherwise in parallel builds the wrapper libs might get linked to the .a. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - src/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index e963009..dfa9060 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -106,10 +106,10 @@ $(SWIGLOBJ): $(SWIGCOUT) - $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) - $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< - --$(SWIGSO): $(SWIGLOBJ) -+$(SWIGSO): $(SWIGLOBJ) $(LIBSO) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux $(LDLIBS) - --$(SWIGRUBYSO): $(SWIGRUBYLOBJ) -+$(SWIGRUBYSO): $(SWIGRUBYLOBJ) $(LIBSO) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LDLIBS) - - $(LIBA): $(OBJS) -@@ -129,7 +129,7 @@ selinuxswig_python_exception.i: ../include/selinux/selinux.h - $(AUDIT2WHYLOBJ): audit2why.c - $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< - --$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) -+$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) $(LIBSO) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a $(LDLIBS) - - %.o: %.c policy.h diff --git a/patches/libselinux-2.1.12/series b/patches/libselinux-2.1.12/series deleted file mode 100644 index 410e8de2d..000000000 --- a/patches/libselinux-2.1.12/series +++ /dev/null @@ -1,10 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-makefile-don-t-use-TLSFLAGS.patch -0002-makefile-remove-host-path-from-list-of-header-search.patch -0003-makefile-remove-host-path-from-list-of-linker-search.patch -0004-makefile-fix-linking-to-shlib-if-prefix.patch -0005-makefile-move-lpcre-from-beginning-of-gcc-linker-cal.patch -0006-makefile-use-python-config-instead-of-pkg-config.patch -0007-makefile-add-a-dependency-from-wrapper-libs-to-.so.patch -# 110eefc2eace8149fe87fa36f9f513fb - git-ptx-patches magic diff --git a/rules/busybox.in b/rules/busybox.in index 380063406..a6d553041 100644 --- a/rules/busybox.in +++ b/rules/busybox.in @@ -3,7 +3,6 @@ menuconfig BUSYBOX tristate prompt "busybox " - select LIBSELINUX if BUSYBOX_SELINUX && STAGING select LIBC_C if !BUSYBOX_STATIC select LIBC_NSS_FILES if !BUSYBOX_STATIC select LIBC_M if !BUSYBOX_STATIC && BUSYBOX_FEATURE_AWK_LIBM diff --git a/rules/casync.in b/rules/casync.in index 335201c7b..e68fff1c2 100644 --- a/rules/casync.in +++ b/rules/casync.in @@ -11,7 +11,6 @@ menuconfig CASYNC select LIBC_M select FUSE if CASYNC_FUSE select FUSE_LIB if CASYNC_FUSE - select LIBSELINUX if GLOBAL_SELINUX select OPENSSL select UDEV if CASYNC_UDEV select UDEV_LIBUDEV if CASYNC_UDEV diff --git a/rules/core-selinux.in b/rules/core-selinux.in index 0e76d4222..2a5cb87ef 100644 --- a/rules/core-selinux.in +++ b/rules/core-selinux.in @@ -5,7 +5,7 @@ config GLOBAL_SELINUX select BUSYBOX_SELINUX if BUSYBOX select BUSYBOX_BUILD_LIBBUSYBOX if BUSYBOX select BUSYBOX_FEATURE_INDIVIDUAL if BUSYBOX - depends on STAGING + depends on BROKEN prompt "SELinux support" help This will enable SELinux for all packages with optional diff --git a/rules/coreutils.in b/rules/coreutils.in index 19a93758f..d24bbb949 100644 --- a/rules/coreutils.in +++ b/rules/coreutils.in @@ -6,7 +6,6 @@ menuconfig COREUTILS select LIBC_M if COREUTILS_SORT select LIBC_RT select GCCLIBS_GCC_S - select LIBSELINUX if GLOBAL_SELINUX help This package contains the essential basic system utilities. diff --git a/rules/f2fs-tools.in b/rules/f2fs-tools.in index 37d8f6acc..a9f9b6f91 100644 --- a/rules/f2fs-tools.in +++ b/rules/f2fs-tools.in @@ -4,7 +4,6 @@ config F2FS_TOOLS tristate prompt "f2fs-tools" select LIBUUID - select LIBSELINUX if GLOBAL_SELINUX help The f2fs-tools package provides the filesystem utilities for use with the f2fs filesystem (flash-friendly filesystem) diff --git a/rules/host-libselinux.in b/rules/host-libselinux.in deleted file mode 100644 index e7088ed85..000000000 --- a/rules/host-libselinux.in +++ /dev/null @@ -1,9 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=hosttools_noprompt - -config HOST_LIBSELINUX - tristate - default y if ALLYES - select HOST_LIBPCRE - select HOST_LIBSEPOL diff --git a/rules/host-libselinux.make b/rules/host-libselinux.make deleted file mode 100644 index 77b8d16eb..000000000 --- a/rules/host-libselinux.make +++ /dev/null @@ -1,28 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2013 by Marc Kleine-Budde <mkl@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -HOST_PACKAGES-$(PTXCONF_HOST_LIBSELINUX) += host-libselinux - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -HOST_LIBSELINUX_CONF_TOOL := NO -HOST_LIBSELINUX_MAKE_ENV := \ - $(HOST_ENV) \ - CFLAGS="-O2 -Wall -g" -HOST_LIBSELINUX_MAKE_OPT := PREFIX=$(PTXDIST_SYSROOT_HOST) -# no ':=' here -HOST_LIBSELINUX_INSTALL_OPT = \ - PREFIX=$(HOST_LIBSELINUX_PKGDIR) \ - install - -# vim: syntax=make diff --git a/rules/iproute2.in b/rules/iproute2.in index c089e7786..25a5ae347 100644 --- a/rules/iproute2.in +++ b/rules/iproute2.in @@ -11,7 +11,6 @@ menuconfig IPROUTE2 select LIBC_PTHREAD if IPROUTE2_ARPD select LIBC_RESOLV select LIBMNL if IPROUTE2_DEVLINK - select LIBSELINUX if GLOBAL_SELINUX help Networking and traffic control tools diff --git a/rules/libselinux.in b/rules/libselinux.in deleted file mode 100644 index 6d6b1e655..000000000 --- a/rules/libselinux.in +++ /dev/null @@ -1,27 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=selinux - -menuconfig LIBSELINUX - tristate - prompt "libselinux " - select LIBPCRE - select LIBSEPOL - select PYTHON if LIBSELINUX_PYTHON - select HOST_SWIG if LIBSELINUX_PYTHON - help - libselinux provides an API for SELinux applications to get and set - process and file security contexts and to obtain security policy - decisions. Required for any applications that use the SELinux - API. - - STAGING: remove in ptxdist-2020.12.0 - Old version that need to be updated. Fails to build with gcc >= 9.x. - -if LIBSELINUX - -config LIBSELINUX_PYTHON - bool "python wrapper" - depends on STAGING - -endif diff --git a/rules/libselinux.make b/rules/libselinux.make deleted file mode 100644 index 9f6b6a62f..000000000 --- a/rules/libselinux.make +++ /dev/null @@ -1,94 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2012 by Wolfram Sang <w.sang@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_LIBSELINUX) += libselinux - -# -# Paths and names -# -LIBSELINUX_VERSION := 2.1.12 -LIBSELINUX_MD5 := 73270f384a032fad34b5fe075fa05ce2 -LIBSELINUX := libselinux-$(LIBSELINUX_VERSION) -LIBSELINUX_SUFFIX := tar.gz -LIBSELINUX_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(LIBSELINUX).$(LIBSELINUX_SUFFIX) -LIBSELINUX_SOURCE := $(SRCDIR)/$(LIBSELINUX).$(LIBSELINUX_SUFFIX) -LIBSELINUX_DIR := $(BUILDDIR)/$(LIBSELINUX) -LIBSELINUX_LICENSE := public_domain - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -LIBSELINUX_CONF_TOOL := NO -# no := due to CROSS_PYTHON -LIBSELINUX_MAKE_ENV = \ - $(CROSS_ENV) \ - CFLAGS="-O2 -Wall -g" \ - PYTHON=$(CROSS_PYTHON) -LIBSELINUX_MAKE_OPT := \ - LIBDIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib -LIBSELINUX_INSTALL_OPT := \ - install - -ifdef PTXCONF_LIBSELINUX_PYTHON -LIBSELINUX_MAKE_OPT += pywrap -LIBSELINUX_INSTALL_OPT += install-pywrap -endif - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -LIBSELINUX_PROGS := \ - avcstat \ - compute_av \ - compute_create \ - compute_member \ - compute_relabel \ - compute_user \ - getconlist \ - getdefaultcon \ - getenforce \ - getfilecon \ - getpidcon \ - getsebool \ - getseuser \ - matchpathcon \ - policyvers \ - selinux_check_securetty_context \ - selinuxenabled \ - selinuxexeccon \ - setenforce \ - setfilecon \ - togglesebool - -$(STATEDIR)/libselinux.targetinstall: - @$(call targetinfo) - - @$(call install_init, libselinux) - @$(call install_fixup, libselinux,PRIORITY,optional) - @$(call install_fixup, libselinux,SECTION,base) - @$(call install_fixup, libselinux,AUTHOR,"Wolfram Sang <w.sang@pengutronix.de>") - @$(call install_fixup, libselinux,DESCRIPTION,missing) - - @$(call install_lib, libselinux, 0, 0, 0644, libselinux) - - @$(foreach prog, $(LIBSELINUX_PROGS), \ - $(call install_copy, libselinux, 0, 0, 0755, -, /usr/sbin/$(prog));) - -ifdef PTXCONF_LIBSELINUX_PYTHON - @$(call install_tree, libselinux, 0, 0, -, $(PYTHON_SITEPACKAGES)) -endif - @$(call install_finish, libselinux) - - @$(call touch) - -# vim: syntax=make diff --git a/rules/lxc.in b/rules/lxc.in index 2e7a55c26..e8dc765e6 100644 --- a/rules/lxc.in +++ b/rules/lxc.in @@ -6,7 +6,6 @@ menuconfig LXC select LIBCAP select LIBSECCOMP select GLIBC_GETENT - select LIBSELINUX if GLOBAL_SELINUX select BUSYBOX_FEATURE_SH_MATH if LXC_SYSTEMD_UNIT select SYSTEMD if LXC_SYSTEMD_UNIT select DNSMASQ if LXC_SYSTEMD_UNIT diff --git a/rules/openssh.in b/rules/openssh.in index b04a7a8a5..afbd19675 100644 --- a/rules/openssh.in +++ b/rules/openssh.in @@ -8,7 +8,6 @@ menuconfig OPENSSH select LIBC_UTIL select RC_ONCE if OPENSSH_SSHD_GENKEYS && RUNTIME select BUSYBOX_START_STOP_DAEMON if OPENSSH_SSHD_STARTSCRIPT - select LIBSELINUX if GLOBAL_SELINUX select OPENSSH_KEYGEN if OPENSSH_SSHD_GENKEYS prompt "openssh " help diff --git a/rules/shadow.in b/rules/shadow.in index d75bc74a6..1a77f21e5 100644 --- a/rules/shadow.in +++ b/rules/shadow.in @@ -6,7 +6,6 @@ menuconfig SHADOW tristate depends on (!BUSYBOX_ADDUSER && !BUSYBOX_ADDGROUP && !BUSYBOX_LOGIN && !BUSYBOX_PASSWD && !BUSYBOX_SU) || ALLYES select LIBC_CRYPT - select LIBSELINUX if GLOBAL_SELINUX select PAM if GLOBAL_PAM prompt "shadow " help diff --git a/rules/systemd.in b/rules/systemd.in index 04c6ee998..30a802f54 100644 --- a/rules/systemd.in +++ b/rules/systemd.in @@ -23,7 +23,6 @@ menuconfig SYSTEMD select ZSTD if SYSTEMD_ZSTD select LIBMICROHTTPD if SYSTEMD_MICROHTTPD select LIBSECCOMP if SYSTEMD_SECCOMP - select LIBSELINUX if GLOBAL_SELINUX select IPTABLES if SYSTEMD_IPMASQUERADE select LIBELF if SYSTEMD_COREDUMP select LIBELF_LIBDW if SYSTEMD_COREDUMP |