diff options
author | Yoann Congal <yoann.congal@smile.fr> | 2024-05-21 10:08:05 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-05-21 14:15:10 -0700 |
commit | d161de0b00b91cd0c286fbbc1190f87cf20fe088 (patch) | |
tree | 0644fb237920f2f554ad7a25a85002c61022a0b7 | |
parent | 3584b79a4cdc410ee4aaf12b57bccd0ce035537c (diff) | |
download | meta-openembedded-d161de0b00b91cd0c286fbbc1190f87cf20fe088.tar.gz |
mdio-tools: fix mdio-netlink kernel module reproducibility
mdio-netlink source make reference to ${S}/.. which breaks
-fdebug-prefix-map and results in the full TMPDIR path being present in
the -dbg package and, also, change a related CRC in the main package.
This changes ${S} to enclose the whole SRC_URI repo and adapt relative paths to
build (MODULES_MODULE_SYMVERS_LOCATION)
This make mdio-netlink reproducible and fixes this warning:
WARNING: mdio-netlink-1.3.1-r0 do_package_qa: QA Issue: File /lib/modules/6.6.29-yocto-standard/updates/.debug/mdio-netlink.ko in package mdio-netlink-dbg contains reference to TMPDIR [buildpaths]
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Reviewed-by: Alexandre Truong <alexandre.truong@smile.fr>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rwxr-xr-x | meta-networking/conf/include/non-repro-meta-networking.inc | 2 | ||||
-rw-r--r-- | meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/meta-networking/conf/include/non-repro-meta-networking.inc b/meta-networking/conf/include/non-repro-meta-networking.inc index e0f448fe31..45eed5398e 100755 --- a/meta-networking/conf/include/non-repro-meta-networking.inc +++ b/meta-networking/conf/include/non-repro-meta-networking.inc | |||
@@ -15,7 +15,6 @@ KNOWN_NON_REPRO_META_NETWORKING = " \ | |||
15 | htpdate-doc \ | 15 | htpdate-doc \ |
16 | keepalived \ | 16 | keepalived \ |
17 | keepalived-dbg \ | 17 | keepalived-dbg \ |
18 | kernel-module-mdio-netlink-6.6.17-yocto-standard \ | ||
19 | libbearssl-staticdev \ | 18 | libbearssl-staticdev \ |
20 | libfko3 \ | 19 | libfko3 \ |
21 | libfko-client \ | 20 | libfko-client \ |
@@ -25,7 +24,6 @@ KNOWN_NON_REPRO_META_NETWORKING = " \ | |||
25 | libowfat-staticdev \ | 24 | libowfat-staticdev \ |
26 | libruli-staticdev \ | 25 | libruli-staticdev \ |
27 | libsamba-util0 \ | 26 | libsamba-util0 \ |
28 | mdio-netlink-dbg \ | ||
29 | mosquitto \ | 27 | mosquitto \ |
30 | mosquitto-dbg \ | 28 | mosquitto-dbg \ |
31 | ncftp \ | 29 | ncftp \ |
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb index b50d33f908..3867b89052 100644 --- a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb +++ b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb | |||
@@ -3,11 +3,12 @@ require mdio-tools.inc | |||
3 | DEPENDS += "virtual/kernel libmnl" | 3 | DEPENDS += "virtual/kernel libmnl" |
4 | # This module requires Linux 5.6 higher | 4 | # This module requires Linux 5.6 higher |
5 | 5 | ||
6 | S = "${WORKDIR}/git/kernel" | 6 | S = "${WORKDIR}/git" |
7 | 7 | ||
8 | inherit module | 8 | inherit module |
9 | 9 | ||
10 | EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR}" | 10 | EXTRA_OEMAKE = "-C kernel/ KDIR=${STAGING_KERNEL_DIR}" |
11 | MODULES_MODULE_SYMVERS_LOCATION="kernel" | ||
11 | MODULES_INSTALL_TARGET = "install" | 12 | MODULES_INSTALL_TARGET = "install" |
12 | 13 | ||
13 | RPROVIDES:${PN} += "kernel-module-mdio-netlink" | 14 | RPROVIDES:${PN} += "kernel-module-mdio-netlink" |