From 95b848f2198018b44e44f3526a9de67a3c89c3c7 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 22 Jul 2019 14:48:07 +0000 Subject: containers/go/build: don't override global package strip flags When the go-lang container recipes were first created there were issues with strip and the resulting binaries. As such, strip was inhibited for the various packages. This variable is now set in the default classes, and tests show that strip works on the binaries (saving up to 2M on disk for some binaries) with no runtime issues found. So we drop our explicit set of the inhibit and let the build proceed by the defaults. If issues are found, we can re-enable the setting or bbappends can turn it back on for builds showing issues. Signed-off-by: Bruce Ashfield --- recipes-containers/containerd/containerd.inc | 1 - recipes-containers/cri-o/cri-o_git.bb | 1 - recipes-containers/docker/docker.inc | 2 -- recipes-containers/kubernetes/kubernetes_git.bb | 1 - recipes-containers/runc/runc.inc | 1 - recipes-core/runv/runv_git.bb | 1 - recipes-networking/cni/cni_git.bb | 1 - 7 files changed, 8 deletions(-) diff --git a/recipes-containers/containerd/containerd.inc b/recipes-containers/containerd/containerd.inc index 2a2d8c5c..e226edf1 100644 --- a/recipes-containers/containerd/containerd.inc +++ b/recipes-containers/containerd/containerd.inc @@ -95,7 +95,6 @@ do_install() { FILES_${PN} += "${systemd_system_unitdir}/*" -INHIBIT_PACKAGE_STRIP = "1" INSANE_SKIP_${PN} += "ldflags already-stripped" COMPATIBLE_HOST = "^(?!(qemu)?mips).*" diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb index 1a56dc45..c27aef78 100644 --- a/recipes-containers/cri-o/cri-o_git.bb +++ b/recipes-containers/cri-o/cri-o_git.bb @@ -143,7 +143,6 @@ FILES_${PN}-config = "${sysconfdir}/crio/config/*" FILES_${PN} += "${systemd_unitdir}/system/*" FILES_${PN} += "/usr/local/bin/*" -INHIBIT_PACKAGE_STRIP = "1" INSANE_SKIP_${PN} += "ldflags already-stripped" deltask compile_ptest_base diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc index eacaf7f4..149ca824 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc @@ -52,6 +52,4 @@ GROUPADD_PARAM_${PN} = "-r docker" COMPATIBLE_HOST = "^(?!(qemu)?mips).*" -# DO NOT STRIP docker -INHIBIT_PACKAGE_STRIP = "1" INSANE_SKIP_${PN} += "ldflags textrel" diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb index 516afa31..ea347197 100644 --- a/recipes-containers/kubernetes/kubernetes_git.bb +++ b/recipes-containers/kubernetes/kubernetes_git.bb @@ -106,6 +106,5 @@ FILES_kubectl = "${bindir}/kubectl" FILES_kube-proxy = "${bindir}/kube-proxy" FILES_${PN}-misc = "${bindir}" -INHIBIT_PACKAGE_STRIP = "1" deltask compile_ptest_base diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc index 5a2ca31a..46fd09dc 100644 --- a/recipes-containers/runc/runc.inc +++ b/recipes-containers/runc/runc.inc @@ -64,4 +64,3 @@ do_install() { ln -sf runc ${D}/${bindir}/docker-runc } -INHIBIT_PACKAGE_STRIP = "1" diff --git a/recipes-core/runv/runv_git.bb b/recipes-core/runv/runv_git.bb index 0301dd28..ef94f096 100644 --- a/recipes-core/runv/runv_git.bb +++ b/recipes-core/runv/runv_git.bb @@ -78,5 +78,4 @@ deltask compile_ptest_base FILES_${PN} += "/usr/local/bin/*" -INHIBIT_PACKAGE_STRIP = "1" INSANE_SKIP_${PN} += "ldflags already-stripped" diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index 4c1714ae..d07154bb 100644 --- a/recipes-networking/cni/cni_git.bb +++ b/recipes-networking/cni/cni_git.bb @@ -92,7 +92,6 @@ do_install() { FILES_${PN} += "/opt/cni/bin/*" -INHIBIT_PACKAGE_STRIP = "1" INSANE_SKIP_${PN} += "ldflags already-stripped" deltask compile_ptest_base -- cgit v1.2.3-54-g00ecf