diff options
author | Andrea Adami <andrea.adami@gmail.com> | 2018-09-18 01:12:44 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-09-17 22:21:42 -0700 |
commit | 94f4f52101db6d6a45f88ea40240dd5ea3330ff3 (patch) | |
tree | 891749f0030a6af6f7590fbf6d229a2085af44e4 /meta-initramfs | |
parent | ed34bf11ab49a522d008676496a6f10e14ca1625 (diff) | |
download | meta-openembedded-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.inc | 8 |
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 7df33d64e..2aac9e6eb 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc | |||
@@ -1,16 +1,16 @@ | |||
1 | do_install() { | 1 | do_install() { |
2 | install -d ${D}${base_bindir} | 2 | install -d ${D}${base_bindir} |
3 | install -d ${D}${base_sbindir} | 3 | install -d ${D}${base_sbindir} |
4 | # debian packages kinit + kinit.shared but only sh.shared | ||
5 | if [ "${KLIBC_UTILS_VARIANT}" = "shared" ]; then | 4 | if [ "${KLIBC_UTILS_VARIANT}" = "shared" ]; then |
6 | install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit | ||
7 | install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared | 5 | install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared |
8 | install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared | 6 | install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared |
9 | else | 7 | else |
10 | install -m 755 usr/dash/sh ${D}${base_bindir}/sh | 8 | install -m 755 usr/dash/sh ${D}${base_bindir}/sh |
11 | install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit | 9 | install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit |
10 | install -m 755 usr/gzip/gzip ${D}${base_bindir} | ||
11 | ln -s gzip ${D}${base_bindir}/gunzip | ||
12 | ln -s gzip ${D}${base_bindir}/zcat | ||
12 | fi | 13 | fi |
13 | install -m 755 usr/gzip/gzip ${D}${base_bindir} | ||
14 | install -m 755 usr/kinit/fstype/${KLIBC_UTILS_VARIANT}/fstype ${D}${base_bindir} | 14 | install -m 755 usr/kinit/fstype/${KLIBC_UTILS_VARIANT}/fstype ${D}${base_bindir} |
15 | install -m 755 usr/kinit/ipconfig/${KLIBC_UTILS_VARIANT}/ipconfig ${D}${base_bindir} | 15 | install -m 755 usr/kinit/ipconfig/${KLIBC_UTILS_VARIANT}/ipconfig ${D}${base_bindir} |
16 | install -m 755 usr/kinit/nfsmount/${KLIBC_UTILS_VARIANT}/nfsmount ${D}${base_bindir} | 16 | install -m 755 usr/kinit/nfsmount/${KLIBC_UTILS_VARIANT}/nfsmount ${D}${base_bindir} |
@@ -44,8 +44,6 @@ do_install() { | |||
44 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir} | 44 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir} |
45 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir} | 45 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir} |
46 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir} | 46 | install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir} |
47 | ln -s gzip ${D}${base_bindir}/gunzip | ||
48 | ln -s gzip ${D}${base_bindir}/zcat | ||
49 | } | 47 | } |
50 | 48 | ||
51 | EXTRA_KLIBC_DEPS = "${@oe.utils.conditional('KLIBC_UTILS_VARIANT', 'shared', '${THIS_LIBKLIBC}', '', d)}" | 49 | EXTRA_KLIBC_DEPS = "${@oe.utils.conditional('KLIBC_UTILS_VARIANT', 'shared', '${THIS_LIBKLIBC}', '', d)}" |