aboutsummaryrefslogtreecommitdiffstats
path: root/meta-initramfs
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2018-09-18 01:12:44 +0200
committerKhem Raj <raj.khem@gmail.com>2018-09-17 22:21:42 -0700
commit94f4f52101db6d6a45f88ea40240dd5ea3330ff3 (patch)
tree891749f0030a6af6f7590fbf6d229a2085af44e4 /meta-initramfs
parented34bf11ab49a522d008676496a6f10e14ca1625 (diff)
downloadmeta-openembedded-contrib-94f4f52101db6d6a45f88ea40240dd5ea3330ff3.tar.gz
klibc-utils: remove the two static binaries (kinit and gzip)
The shared utils can be built with security flags enabled. This breaks however build of kinit and gzipm both static. Remove them from this recipe. Fix QA Issue: 'klibc-utils-gzip/bin/gzip' has relocations in .text [textrel] 'klibc-utils-kinit/bin/kinit' has relocations in .text [textrel] Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-initramfs')
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-utils.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc
index 7df33d64e4..2aac9e6ebf 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc
@@ -1,16 +1,16 @@
do_install() {
install -d ${D}${base_bindir}
install -d ${D}${base_sbindir}
- # debian packages kinit + kinit.shared but only sh.shared
if [ "${KLIBC_UTILS_VARIANT}" = "shared" ]; then
- install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit
install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared
install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared
else
install -m 755 usr/dash/sh ${D}${base_bindir}/sh
install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit
+ install -m 755 usr/gzip/gzip ${D}${base_bindir}
+ ln -s gzip ${D}${base_bindir}/gunzip
+ ln -s gzip ${D}${base_bindir}/zcat
fi
- install -m 755 usr/gzip/gzip ${D}${base_bindir}
install -m 755 usr/kinit/fstype/${KLIBC_UTILS_VARIANT}/fstype ${D}${base_bindir}
install -m 755 usr/kinit/ipconfig/${KLIBC_UTILS_VARIANT}/ipconfig ${D}${base_bindir}
install -m 755 usr/kinit/nfsmount/${KLIBC_UTILS_VARIANT}/nfsmount ${D}${base_bindir}
@@ -44,8 +44,6 @@ do_install() {
install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir}
install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir}
install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir}
- ln -s gzip ${D}${base_bindir}/gunzip
- ln -s gzip ${D}${base_bindir}/zcat
}
EXTRA_KLIBC_DEPS = "${@oe.utils.conditional('KLIBC_UTILS_VARIANT', 'shared', '${THIS_LIBKLIBC}', '', d)}"