Bug#742640: src:eglibc: build stage2 without selinux
On Thu, Jul 10, 2014 at 09:46:05PM +0200, Aurelien Jarno wrote: Hmm, the above has actually been removed in favor of a test on $(DEB_BUILD_PROFILES). Instead of duplicating the code, please test for both stage1 and stage2 in the same test. Updating patch addressing both concerns. Successfully tested on jenkins.d.n. Helmut diff -Nru eglibc-2.19/debian/sysdeps/linux.mk eglibc-2.19/debian/sysdeps/linux.mk --- eglibc-2.19/debian/sysdeps/linux.mk +++ eglibc-2.19/debian/sysdeps/linux.mk @@ -11,5 +11,5 @@ -ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),) +ifneq ($(filter stage1 stage2,$(DEB_BUILD_PROFILES)),) libc_extra_config_options = $(extra_config_options) else libc_extra_config_options = --with-selinux --enable-systemtap $(extra_config_options)
Bug#742640: src:eglibc: build stage2 without selinux
Version: 2.19-5 On Tue, Mar 25, 2014 at 09:51:33PM +0100, Helmut Grohne wrote: The eglibc package currently lacks a stage2 build profile entirely. A stage2 is needed though, because libselinux cannot be built without an actual libc among other things and eglibc explicitly enabled selinux via a configure flag. The attached patch removes that flag when the package is built with dpkg-buildpackage -Pstage2. Updated patch to apply against glibc 2.19. It also disables systemptap now. Helmut diff -Nru eglibc-2.19/debian/sysdeps/linux.mk eglibc-2.19/debian/sysdeps/linux.mk --- eglibc-2.19/debian/sysdeps/linux.mk +++ eglibc-2.19/debian/sysdeps/linux.mk @@ -12,7 +12,11 @@ ifeq ($(DEB_BUILD_PROFILE),bootstrap) libc_extra_config_options = $(extra_config_options) else - libc_extra_config_options = --with-selinux --enable-systemtap $(extra_config_options) + ifneq ($(filter stage2,$(DEB_BUILD_PROFILES)),) +libc_extra_config_options = $(extra_config_options) + else +libc_extra_config_options = --with-selinux --enable-systemtap $(extra_config_options) + endif endif ifndef LINUX_SOURCE
Bug#742640: src:eglibc: build stage2 without selinux
On Thu, Jul 10, 2014 at 08:58:41AM +0200, Helmut Grohne wrote: Version: 2.19-5 On Tue, Mar 25, 2014 at 09:51:33PM +0100, Helmut Grohne wrote: The eglibc package currently lacks a stage2 build profile entirely. A stage2 is needed though, because libselinux cannot be built without an actual libc among other things and eglibc explicitly enabled selinux via a configure flag. The attached patch removes that flag when the package is built with dpkg-buildpackage -Pstage2. Updated patch to apply against glibc 2.19. It also disables systemptap now. Helmut diff -Nru eglibc-2.19/debian/sysdeps/linux.mk eglibc-2.19/debian/sysdeps/linux.mk --- eglibc-2.19/debian/sysdeps/linux.mk +++ eglibc-2.19/debian/sysdeps/linux.mk @@ -12,7 +12,11 @@ ifeq ($(DEB_BUILD_PROFILE),bootstrap) libc_extra_config_options = $(extra_config_options) Hmm, the above has actually been removed in favor of a test on $(DEB_BUILD_PROFILES). else - libc_extra_config_options = --with-selinux --enable-systemtap $(extra_config_options) + ifneq ($(filter stage2,$(DEB_BUILD_PROFILES)),) +libc_extra_config_options = $(extra_config_options) + else +libc_extra_config_options = --with-selinux --enable-systemtap $(extra_config_options) + endif endif ifndef LINUX_SOURCE Instead of duplicating the code, please test for both stage1 and stage2 in the same test. -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140710194605.gd14...@hall.aurel32.net
Bug#742640: src:eglibc: build stage2 without selinux
Package: src:eglibc Version: 2.18-4 Severity: wishlist Tags: patch The eglibc package currently lacks a stage2 build profile entirely. A stage2 is needed though, because libselinux cannot be built without an actual libc among other things and eglibc explicitly enabled selinux via a configure flag. The attached patch removes that flag when the package is built with dpkg-buildpackage -Pstage2. Note that I did not convert the stage1 code to comply with the build profile spec. Thus eglibc now evaluates DEB_STAGE or DEB_BUILD_PROFILE (singular) for stage1 and DEB_BUILD_PROFILES (plural, in accordance with build profile spec) for stage2. Not all architectures successfully build a stage2 with this patch, but arm64, armel, armhf and m68k do. Helmut diff -Nru eglibc-2.18/debian/sysdeps/linux.mk eglibc-2.18/debian/sysdeps/linux.mk --- eglibc-2.18/debian/sysdeps/linux.mk +++ eglibc-2.18/debian/sysdeps/linux.mk @@ -12,7 +12,11 @@ ifeq ($(DEB_BUILD_PROFILE),bootstrap) libc_extra_config_options = $(extra_config_options) else - libc_extra_config_options = --with-selinux $(extra_config_options) + ifneq ($(filter stage2,$(DEB_BUILD_PROFILES)),) +libc_extra_config_options = $(extra_config_options) + else +libc_extra_config_options = --with-selinux $(extra_config_options) + endif endif ifndef LINUX_SOURCE
