package/apparmor: fix per-package build with apache
PATCH 1/1 package/apparmor: fix per-package build with apache
Per-package build of apparmor with apache fails on:
/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apparmor/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/apxs -c mod_apparmor.c -L/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apparmor/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib -lapparmor
/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/build-1/libtool --silent --mode=compile /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/bin/x86_64-linux-gcc -prefer-pic -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/include -I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/apr-1 -I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/apr-1 -I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../../../x86_64-buildroot-linux-musl/sysroot/usr/include -c -o mod_apparmor.lo mod_apparmor.c && touch mod_apparmor.slo
mod_apparmor.c:28:10: fatal error: sys/apparmor.h: No such file or directory
#include <sys/apparmor.h>
^~~~~~~~~~~~~~~~The issue is that sys/appamor.h is not installed in the apache
per-package directory which is mangled byAPACHE_FIX_STAGING_APACHE_CONFIG, i.e. /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/include
So help apxs to find sys/apparmor.h by passing
-I$(STAGING_DIR)/usr/include
Fixes:
- http://autobuild.buildroot.org/results/ef1fcd57e0c09a2806bf2272bb21df6d3300b45b
--- package/apparmor/apparmor.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
package/apparmor/apparmor.mk +2 -1
@@ -52,7 +52,8 @@ endif ifeq ($(BR2_PACKAGE_APACHE),y) APPARMOR_DEPENDENCIES += apache APPARMOR_TOOLS += changehat/mod_apparmor -APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs +APPARMOR_MAKE_OPTS += \ + APXS="$(STAGING_DIR)/usr/bin/apxs -I$(STAGING_DIR)/usr/include" endif define APPARMOR_BUILD_CMDS
Signature · 1 line
2.28.0
PATCH 1/1 package/apparmor: fix per-package build with apache
Fabrice, All,
+Thomas, +Peter, +Arnout: please read in full, then there is a question for you toward the end...
On 2020-09-01 22:10 +0200, Fabrice Fontaine spake thusly:
Quoted 10 lines
Per-package build of apparmor with apache fails on:
/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apparmor/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/apxs-cmod_apparmor.c-L/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apparmor/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib -lapparmor
/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/build-1/libtool--silent --mode=compile/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/bin/x86_64-linux-gcc-prefer-pic -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 -I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/include -I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/apr-1 -I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/apr-1 -I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../../../x86_64-buildroot-lin
ux-musl/sysroot/usr/include -c -o mod_apparmor.lomod_apparmor.c&& touch mod_apparmor.slo
mod_apparmor.c:28:10: fatal error:sys/apparmor.h: No such file or directory#include <sys/apparmor.h> ^~~~~~~~~~~~~~~~
Quoted 7 lines
The issue is that
sys/appamor.his not installed in the apache
per-package directory which is mangled byAPACHE_FIX_STAGING_APACHE_CONFIG, i.e./usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/includeSo help apxs to find
sys/apparmor.hby passing
-I$(STAGING_DIR)/usr/include
For a short time, I was a bit puzzled as to why adding the current sysroot explicitly would fix the issue. That's in fact because sys/apparmor.h comes from the libapparmor package, not from the apparmor pacakge itself.
So, indeed, this technically fixes the issue.
However, see below, I think there is a more fundamental issue with apxs and how we "fix" and use it.
Quoted 13 lines
Fixes:
- http://autobuild.buildroot.org/results/ef1fcd57e0c09a2806bf2272bb21df6d3300b45bSigned-off-by Fabrice Fontaine <[email protected]>--- package/apparmor/apparmor.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)package/apparmor/apparmor.mk +0
-0
package/apparmor/apparmor.mk endif · line 56
Quoted 6 lines
package/apparmor/apparmor.mk +2
-1@@ -52,7 +52,8 @@ endif ifeq ($(BR2_PACKAGE_APACHE),y) APPARMOR_DEPENDENCIES += apache APPARMOR_TOOLS += changehat/mod_apparmor -APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs +APPARMOR_MAKE_OPTS += \ + APXS="$(STAGING_DIR)/usr/bin/apxs -I$(STAGING_DIR)/usr/include"
So, APXS contains hard-coded path to the apache's sysroot, but also host directory. This can be seen in the traces you included in your commit log (lines manually splitted for (relative) readability):
/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apparmor/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/apxs \
-c mod_apparmor.c \
-L/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apparmor/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib \
-lapparmor
/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/build-1/libtool \
--silent --mode=compile \
/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/bin/x86_64-linux-gcc \
-prefer-pic -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g2 \
-I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/include \
-I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/apr-1 \
-I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/apr-1 \
-I/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/per-package/apache/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../../../x86_64-buildroot-linux-musl/sysroot/usr/include \
-c -o mod_apparmor.lo mod_apparmor.c && touch mod_apparmor.sloSo, it is calling libtool from apache's host dir, and consequently, it is calling gcc from apache's host dir, and uses include paths that point to apache's sysroot.
This is no good.
In theory, we would want to fix apxs so we can only use path to the current package's sysroot. This could probably be achievable, because:
- apxs is a perl script, so we could either sed it to replace paths, but this is not noce, or we could fix it to introduce a variable that contains the base directory to look from;
- there is a config_vars.mk file that contains hard-coded paths, which we could probably modify to also include a base directory to look from. For example, we could introduce "APXS_BASE_DIR = blabla", and then, right before the condifure step of dependant packages, fixup that file to inject the correct PPD base directory.
This would not be very different from the fixups we apply to the meson's cross-compilation.conf configuration file, but there we do have an edge, in that this is done by an infra.
However, for this apxs configs_var.mk, it is not so trivial, because this is not part of an infra, and we do not have a way for packages to export a hook that other packages would have to run automatically.
We could probably have the apache package provide this as a set of macros:
define APACHE_APXS_FIXUPS
$(SED) blablaba $(STAGING_DIR)/usr/build/config_vars.mk
endefand then packages would do something like:
APPARMOR_PRE_CONFIGURE_HOOKS += APACHE_APXS_FIXUPS
But:
1. this is not so clean, because of the cross-package reference,
2. we so far have only two packages using apxs, and that is probably too-big a hammer to introduce this generic tweaking...
So, I am still a bit undecided whether to apply this quick workaround your patch is, or to require a full-blown, complete and correct fix...
Thomas, Peter, Arnout, thoughts?
Regards,
Yann E. MORIN.
Quoted 10 lines
package/apparmor/apparmor.mk +0
-0endif define APPARMOR_BUILD_CMDSSignature · 6 lines
2.28.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 package/apparmor: fix per-package build with apache
Hello,
Quoted 42 lines · On Sat, 5 Sep 2020 14:50:58 +0200 "Yann E. MORIN" <[email protected]>…
So, it is calling libtool from apache's host dir, and consequently, it is calling gcc from apache's host dir, and uses include paths that point to apache's sysroot.
This is no good.
In theory, we would want to fix apxs so we can only use path to the current package's sysroot. This could probably be achievable, because:
- apxs is a perl script, so we could either sed it to replace paths, but this is not noce, or we could fix it to introduce a variable that contains the base directory to look from;
- there is a config_vars.mk file that contains hard-coded paths, which we could probably modify to also include a base directory to look from. For example, we could introduce "
APXS_BASE_DIR= blabla", and then, right before the condifure step of dependant packages, fixup that file to inject the correct PPD base directory.This would not be very different from the fixups we apply to the meson's cross-compilation.conf configuration file, but there we do have an edge, in that this is done by an infra.
However, for this apxs configs_var.mk, it is not so trivial, because this is not part of an infra, and we do not have a way for packages to export a hook that other packages would have to run automatically.
We could probably have the apache package provide this as a set of macros:
define APACHE_APXS_FIXUPS $(SED) blablaba $(STAGING_DIR)/usr/build/config_vars.mk endefand then packages would do something like:
APPARMOR_PRE_CONFIGURE_HOOKS += APACHE_APXS_FIXUPSBut:
1. this is not so clean, because of the cross-package reference,
Quoted 7 lines
2. we so far have only two packages using apxs, and that is probably too-big a hammer to introduce this generic tweaking...
So, I am still a bit undecided whether to apply this quick workaround your patch is, or to require a full-blown, complete and correct fix...
Thomas, Peter, Arnout, thoughts?
We're already fixing a similar issue in the apache package as follows:
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
define APACHE_FIXUP_APR_LIBTOOL
$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \ $(STAGING_DIR)/usr/build-1/libtool
endefAPACHE_POST_CONFIGURE_HOOKS += APACHE_FIXUP_APR_LIBTOOL endif
Any reason not to do the same here ?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/apparmor: fix per-package build with apache
Hello,
Le sam. 5 sept. 2020 ? 15:16, Thomas Petazzoni
<[email protected]> a ?crit :
Quoted 60 lines
Hello,
Quoted 42 lines · On Sat, 5 Sep 2020 14:50:58 +0200 "Yann E. MORIN" <[email protected]>…
So, it is calling libtool from apache's host dir, and consequently, it is calling gcc from apache's host dir, and uses include paths that point to apache's sysroot.
This is no good.
In theory, we would want to fix apxs so we can only use path to the current package's sysroot. This could probably be achievable, because:
- apxs is a perl script, so we could either sed it to replace paths, but this is not noce, or we could fix it to introduce a variable that contains the base directory to look from;
- there is a config_vars.mk file that contains hard-coded paths, which we could probably modify to also include a base directory to look from. For example, we could introduce "
APXS_BASE_DIR= blabla", and then, right before the condifure step of dependant packages, fixup that file to inject the correct PPD base directory.This would not be very different from the fixups we apply to the meson's cross-compilation.conf configuration file, but there we do have an edge, in that this is done by an infra.
However, for this apxs configs_var.mk, it is not so trivial, because this is not part of an infra, and we do not have a way for packages to export a hook that other packages would have to run automatically.
We could probably have the apache package provide this as a set of macros:
define APACHE_APXS_FIXUPS $(SED) blablaba $(STAGING_DIR)/usr/build/config_vars.mk endefand then packages would do something like:
APPARMOR_PRE_CONFIGURE_HOOKS += APACHE_APXS_FIXUPSBut:
1. this is not so clean, because of the cross-package reference,
Quoted 7 lines
2. we so far have only two packages using apxs, and that is probably too-big a hammer to introduce this generic tweaking...
So, I am still a bit undecided whether to apply this quick workaround your patch is, or to require a full-blown, complete and correct fix...
Thomas, Peter, Arnout, thoughts?
We're already fixing a similar issue in the apache package as follows:
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
defineAPACHE_FIXUP_APR_LIBTOOL
Quoted 7 lines
$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \ $(STAGING_DIR)/usr/build-1/libtoolendef
APACHE_POST_CONFIGURE_HOOKS+=APACHE_FIXUP_APR_LIBTOOLendifAny reason not to do the same here ?
Thanks for spotting this solution, I'll send a v2.
Quoted 6 lines
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Best Regards,
Fabrice