From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adam Duskett Date: Thu, 13 Jul 2017 10:24:45 -0400 Subject: [Buildroot] [PATCH 2/2] selinux packages: change glibc check to musl check In-Reply-To: <20170713142445.27967-1-aduskett@gmail.com> References: <20170713142445.27967-1-aduskett@gmail.com> Message-ID: <20170713142445.27967-2-aduskett@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net As per the previous patch, now that fts support is enabled by, default for uClibc, the selinux packages can compile by default with uClibc and glibc. Signed-off-by: Adam Duskett --- package/checkpolicy/Config.in | 6 ++-- package/libselinux/Config.in | 8 +++--- package/libsemanage/Config.in | 8 +++--- package/policycoreutils/Config.in | 12 ++++---- package/refpolicy/0001-fix-fallthrough-error.patch | 32 ++++++++++++++++++++++ package/refpolicy/Config.in | 6 ++-- package/setools/Config.in | 6 ++-- 7 files changed, 55 insertions(+), 23 deletions(-) create mode 100644 package/refpolicy/0001-fix-fallthrough-error.patch diff --git a/package/checkpolicy/Config.in b/package/checkpolicy/Config.in index 97ad0b770..7d16ef14a 100644 --- a/package/checkpolicy/Config.in +++ b/package/checkpolicy/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_CHECKPOLICY bool "checkpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux depends on !BR2_STATIC_LIBS # libselinux - depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux + depends on !BR2_TOOLCHAIN_USES_MUSL # libselinux depends on !BR2_arc # libselinux select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_FLEX @@ -15,7 +15,7 @@ config BR2_PACKAGE_CHECKPOLICY http://selinuxproject.org/page/Main_Page -comment "checkpolicy needs a glibc toolchain w/ threads, dynamic library" +comment "checkpolicy needs a uClibc or glibc toolchain w/ threads, dynamic library" depends on !BR2_arc depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_USES_GLIBC + BR2_TOOLCHAIN_USES_MUSL diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in index 6be816db7..746ba4907 100644 --- a/package/libselinux/Config.in +++ b/package/libselinux/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_LIBSELINUX bool "libselinux" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - # Uses , not available in musl or uClibc - depends on BR2_TOOLCHAIN_USES_GLIBC + # Uses , not available in musl + depends on BR2_TOOLCHAIN_USES_MUSL # Toolchain issue: "fixup not contained within frag" depends on !BR2_arc select BR2_PACKAGE_LIBSEPOL @@ -19,7 +19,7 @@ config BR2_PACKAGE_LIBSELINUX http://selinuxproject.org/page/Main_Page -comment "libselinux needs a glibc toolchain w/ threads, dynamic library" +comment "libselinux needs a uClibc or glibc toolchain w/ threads, dynamic library" depends on !BR2_arc depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_USES_GLIBC + BR2_TOOLCHAIN_USES_MUSL diff --git a/package/libsemanage/Config.in b/package/libsemanage/Config.in index 7ee9c3860..3ab9c36c4 100644 --- a/package/libsemanage/Config.in +++ b/package/libsemanage/Config.in @@ -3,10 +3,10 @@ config BR2_PACKAGE_LIBSEMANAGE depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - # - libselinux needs fts.h (not available in uClibc/musl) + # - libselinux needs fts.h (not available in musl) # - libsemanage itself needs getpwent_r() not available in musl # - audit is not available on musl - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_arc select BR2_PACKAGE_AUDIT select BR2_PACKAGE_LIBSELINUX @@ -23,8 +23,8 @@ config BR2_PACKAGE_LIBSEMANAGE http://selinuxproject.org/page/Main_Page -comment "libsemanage needs a glibc toolchain w/ threads, dynamic library" +comment "libsemanage needs a uClibc or glibc toolchain w/ threads, dynamic library" depends on !BR2_arc depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_USES_GLIBC + BR2_TOOLCHAIN_USES_MUSL diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in index 6b58d6ea3..7f71ebeba 100644 --- a/package/policycoreutils/Config.in +++ b/package/policycoreutils/Config.in @@ -1,7 +1,7 @@ -comment "policycoreutils needs a glibc toolchain w/ threads, dynamic library" +comment "policycoreutils needs a uClibc or glibc toolchain w/ threads, dynamic library" depends on !BR2_arc depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_GLIBC || \ + depends on BR2_TOOLCHAIN_USES_MUSL || \ !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS config BR2_PACKAGE_POLICYCOREUTILS @@ -10,7 +10,7 @@ config BR2_PACKAGE_POLICYCOREUTILS depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage depends on !BR2_STATIC_LIBS #libsemanage depends on !BR2_arc # libsemanage - depends on BR2_TOOLCHAIN_USES_GLIBC # libsemanage + depends on !BR2_TOOLCHAIN_USES_MUSL # libsemanage select BR2_PACKAGE_LIBSEMANAGE select BR2_PACKAGE_LIBCAP_NG help @@ -51,7 +51,7 @@ config BR2_PACKAGE_POLICYCOREUTILS_AUDIT2ALLOW depends on BR2_USE_MMU # python3, sepolgen depends on BR2_TOOLCHAIN_HAS_THREADS # python3, sepolgen, checkpolicy depends on !BR2_STATIC_LIBS # python3, sepolgen - depends on BR2_TOOLCHAIN_USES_GLIBC # checkpolicy + depends on !BR2_TOOLCHAIN_USES_MUSL # checkpolicy depends on !BR2_arc # checkpolicy select BR2_PACKAGE_SEPOLGEN select BR2_PACKAGE_CHECKPOLICY @@ -59,11 +59,11 @@ config BR2_PACKAGE_POLICYCOREUTILS_AUDIT2ALLOW help Enable audit2allow to be built -comment "audit2allow needs a glibc toolchain w/ wchar, threads, dynamic library" +comment "audit2allow needs a uClibc or glibc toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_arc depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND bool "restorecond" diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 954dc3a09..1fdc1481e 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_REFPOLICY bool "refpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # policycoreutils - depends on BR2_TOOLCHAIN_USES_GLIBC # policycoreutils + depends on !BR2_TOOLCHAIN_USES_MUSL # policycoreutils depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # policycoreutils depends on !BR2_STATIC_LIBS # policycoreutils depends on !BR2_arc # policycoreutils @@ -28,11 +28,11 @@ config BR2_PACKAGE_REFPOLICY https://github.com/TresysTechnology/refpolicy -comment "refpolicy needs a glibc toolchain w/ threads, dynamic library" +comment "refpolicy needs a uClibc or glibc toolchain w/ threads, dynamic library" depends on !BR2_arc depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_USES_GLIBC + BR2_TOOLCHAIN_USES_MUSL if BR2_PACKAGE_REFPOLICY diff --git a/package/setools/Config.in b/package/setools/Config.in index d7b119ffc..364c6dbf6 100644 --- a/package/setools/Config.in +++ b/package/setools/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_SETOOLS depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux + depends on !BR2_TOOLCHAIN_USES_MUSL # libselinux # bfin: infamous _ symbol prefix issue # nios2: triggers some toolchain issue "No symbol version # section for versioned symbol" @@ -29,8 +29,8 @@ config BR2_PACKAGE_SETOOLS https://github.com/TresysTechnology/setools3/wiki -comment "setools needs a glibc toolchain w/ threads, C++, wchar, dynamic library" +comment "setools needs a uClibc or glibc toolchain w/ threads, C++, wchar, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ || !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_USES_GLIBC + || BR2_TOOLCHAIN_USES_MUSL depends on !BR2_nios2 && !BR2_bfin && !BR2_arc -- 2.13.0