From 94f4f52101db6d6a45f88ea40240dd5ea3330ff3 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 18 Sep 2018 01:12:44 +0200 Subject: 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 Signed-off-by: Khem Raj --- meta-initramfs/recipes-devtools/klibc/klibc-utils.inc | 8 +++----- 1 file 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)}" -- cgit 1.2.3-korg