Skip to contentSkip to conversation

apparmor: fix QA Warnings

PATCH New Armin Kuster 1 participant 6 messages Jul 29, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 apparmor: fix QA Warnings

RROR: apparmor-3.1.3-r0 do_package_qa: QA Issue: File /usr/src/debug/apparmor/3.1.3/libraries/libapparmor/swig/perl/libapparmor_wrap.c in package apparmor-src contains reference to TMPDIR [buildpaths]
ERROR: apparmor-3.1.3-r0 do_package_qa: QA Issue: File /usr/lib/python3.12/site-packages/LibAppArmor/.debug/_LibAppArmor.cpython-312-aarch64-linux-gnu.so in package apparmor-dbg contains reference to TMPDIR [buildpaths]
ERROR: apparmor-3.1.3-r0 do_package_qa: QA Issue: File /usr/lib/perl5/vendor_perl/5.38.2/aarch64-linux/auto/LibAppArmor/.packlist in package apparmor contains reference to TMPDIR [buildpaths]
ERROR: apparmor-3.1.3-r0 do_package_qa: Fatal QA errors were found, failing task.

---
 recipes-mac/AppArmor/apparmor_3.1.3.bb | 5 +++++
 1 file changed, 5 insertions(+)
recipes-mac/AppArmor/apparmor_3.1.3.bb +5 -0
index 27c518c..49ab7a7 100644
@@ -74,6 +74,8 @@ do_compile () {
 }
 
 do_install () {
+    sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/libraries/libapparmor/swig/perl/libapparmor_wrap.c
+
     oe_runmake -C ${B}/libraries/libapparmor DESTDIR="${D}" install
     oe_runmake -C ${B}/binutils DESTDIR="${D}" install
     oe_runmake -C ${B}/utils DESTDIR="${D}" install
@@ -102,6 +104,9 @@ do_install () {
     fi
     chown root:root -R ${D}/${sysconfdir}/apparmor.d
     chown root:root -R ${D}/${datadir}/apparmor
+
+    find ${D}${libdir}/perl5/ -type f -name ".packlist" -delete
+    find ${D}${PYTHON_SITEPACKAGES_DIR}/LibAppArmor/ -type f -name "_LibAppArmor*.so" -delete
 }
 
 #Building ptest on arm fails.
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/6 python3-fail2ban: convert WORKDIR->UNPACKDIR

---
 .../recipes-security/fail2ban/python3-fail2ban_git.bb         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
dynamic-layers/meta-python/recipes-security/fail2ban/python3-fail2ban_git.bb +2 -2
index 1d0fb62..52d35f8 100644
@@ -26,13 +26,13 @@ inherit systemd
 
 SYSTEMD_SERVICE:${PN} = "fail2ban.service"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 do_install:append () {
     rm  -f ${D}/${bindir}/fail2ban-python
     install -d ${D}/${sysconfdir}/fail2ban
     install -d ${D}/${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/initd ${D}${sysconfdir}/init.d/fail2ban-server
+    install -m 0755 ${UNPACKDIR}/initd ${D}${sysconfdir}/init.d/fail2ban-server
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${systemd_system_unitdir}
Signature · 1 line
2.34.1
#2 lore raw

PATCH 3/6 krill: Fix QA warnings

In reply to Armin Kuster

ERROR: krill-0.12.3-r0 do_package_qa: QA Issue: File /usr/bin/.debug/krill in package krill-dbg contains reference to TMPDIR File /usr/bin/.debug/krillc in package krill-dbg contains reference to TMPDIR
File /usr/bin/.debug/krillup in package krill-dbg contains reference to TMPDIR [buildpaths]

---
 recipes-security/krill/krill_0.12.3.bb | 2 ++
 1 file changed, 2 insertions(+)
recipes-security/krill/krill_0.12.3.bb +2 -0
index 2e200dd..d5917a1 100644
@@ -26,6 +26,7 @@ do_install:append () {
 
     install -m 664 ${S}/defaults/krill.conf ${D}${sysconfdir}/.
     install ${S}/defaults/* ${D}${datadir}/krill/.
+    find  ${D}${bindir}/ -name "krill*"  -exec sed -i -e 's#${CARGO_HOME}/bitbake##g' {} +
 }
 
 KRILL_UID ?= "krill"
@@ -38,5 +39,6 @@ USERADD_PARAM:${PN} = "--system -g ${KRILL_GID} --home-dir  \
                        --shell /sbin/nologin ${BPN}"
 
 FILES:${PN} += "{sysconfdir}/defaults ${datadir}"
+INSANE_SKIP:${PN} = "already-stripped"
 
 COMPATIBLE_HOST = "(i.86|x86_64|aarch64).*-linux"
Signature · 1 line
2.34.1
#3 lore raw

PATCH 4/6 suricata: fix QA warnings

In reply to Armin Kuster

ERROR: suricata-7.0.0-r0 do_package: QA Issue: File '/usr/bin/suricata' from suricata was already stripped, this will prevent future debugging! [already-stripped]

---
 recipes-ids/suricata/suricata_7.0.0.bb | 5 +++++
 1 file changed, 5 insertions(+)
recipes-ids/suricata/suricata_7.0.0.bb +5 -0
index a137498..9795e95 100644
@@ -114,6 +114,10 @@ do_install () {
     sed -i -e "s:#!.*$:#!${USRBINPATH}/env python3:g" ${D}${bindir}/suricatasc
     sed -i -e "s:#!.*$:#!${USRBINPATH}/env python3:g" ${D}${bindir}/suricatactl
     sed -i -e "s:#!.*$:#!${USRBINPATH}/env python3:g" ${D}${libdir}/suricata/python/suricata/sc/suricatasc.py
+    # The build process dumps config logs into the binary, remove them.
+    sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${bindir}/suricata
+    sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' ${D}${bindir}/suricata
+    sed -i -e 's#CFLAGS.*##g' ${D}${bindir}/suricata
 }
 
 pkg_postinst_ontarget:${PN} () {
@@ -131,3 +135,4 @@ FILES:${PN} += "${systemd_unitdir} ${sysconfdir}/tmpfiles.d"
 FILES:${PN}-python = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}"
 
 CONFFILES:${PN} = "${sysconfdir}/suricata/suricata.yaml"
+INSANE_SKIP:${PN} = "already-stripped"
Signature · 1 line
2.34.1
#4 lore raw

PATCH 5/6 isic: Fix config error

In reply to Armin Kuster

configure: error: installation or configuration problem: C compiler cannot create executables. | NOTE: The following config.log files may provide further information.

---
 recipes-security/isic/isic_0.07.bb | 4 ++++
 1 file changed, 4 insertions(+)
recipes-security/isic/isic_0.07.bb +4 -0
index 3e56091..d39184e 100644
@@ -23,6 +23,10 @@ inherit autotools-brokensep
 
 EXTRA_OECONF += "--with-libnet-dir=${STAGING_DIR_HOST}${libdir} "
 
+# many configure tests are failing with gcc-14
+CFLAGS += "-Wno-error=implicit-int -Wno-error=implicit-function-declaration"
+BUILD_CFLAGS += "-Wno-error=implicit-int -Wno-error=implicit-function-declaration"
+
 do_configure () {
     oe_runconf
 }
Signature · 1 line
2.34.1
#5 lore raw

PATCH 6/6 arpwatch: Fix compile error

In reply to Armin Kuster

| ./dns.c:118:24: error: implicit declaration of function '_getshort'; did you mean '__putshort'? [-Wimplicit-function-declaration]

upon others

---
 recipes-scanners/arpwatch/arpwatch_3.3.bb | 4 ++++
 1 file changed, 4 insertions(+)
recipes-scanners/arpwatch/arpwatch_3.3.bb +4 -0
index cacfea7..84f93da 100644
@@ -21,6 +21,10 @@ ARPWATCH_GID ?= "arpwatch"
 APRWATCH_FROM ?= "root "
 ARPWATH_REPLY ?= "${ARPWATCH_UID}"
 
+# many configure tests are failing with gcc-14
+CFLAGS += "-Wno-error=implicit-int -Wno-error=implicit-function-declaration"
+BUILD_CFLAGS += "-Wno-error=implicit-int -Wno-error=implicit-function-declaration"
+
 PACKAGECONFIG ??= ""
 
 PACKAGECONFIG[email] = "-with-watcher=email=${APRWATCH_FROM} --with-watchee=email=${ARPWATH_REPLY}, , postfix, postfix postfix-cfg"
Signature · 1 line
2.34.1