From c05c38a9b79219513fca0fe889269db3f29fda43 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 25 Aug 2015 15:33:00 -0700 Subject: [PATCH] coreos-firmware: do not exclude directories and symlinks Commit ed4660a2d9abe4583b9b327d2801703ec9f4ca18 added an explicit error message to catch when something goes wrong and cannot find any firmware required by the kernel. This additionally changed the call to doins to an explicit list of files, flattening out the directory tree and excluding symlinks. The tree *must* be preserved exactly in order for the kernel to find the files it needs. --- ...20150320.ebuild => coreos-firmware-20150320-r1.ebuild} | 0 .../coreos-firmware/coreos-firmware-99999999.ebuild | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/{coreos-firmware-20150320.ebuild => coreos-firmware-20150320-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20150320.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20150320-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20150320.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20150320-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild index 5fb8acd55d..57ed198566 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild @@ -115,10 +115,10 @@ src_prepare() { } src_install() { - local list=$(find -type f) || die - - [[ -n "${list}" ]] || die "No firmware files found to install." + if [[ -z "$(find -type f)" ]]; then + die "No firmware files found to install." + fi insinto /lib/firmware/ - doins -r ${list} + doins -r . }