From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3A045138334 for ; Sun, 14 Jul 2019 13:00:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D704E089B; Sun, 14 Jul 2019 13:00:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 32D2AE088F for ; Sun, 14 Jul 2019 13:00:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 97FF4347A95 for ; Sun, 14 Jul 2019 13:00:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FBCB6F8 for ; Sun, 14 Jul 2019 13:00:29 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1563105496.4d685f1f1f13f15fbeee1f7200417949e3818b3d.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 4d685f1f1f13f15fbeee1f7200417949e3818b3d X-VCS-Branch: master Date: Sun, 14 Jul 2019 13:00:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f860c33d-ecb9-4a4f-965c-de5e2912bc92 X-Archives-Hash: da3d9944ee8a2cecc6f215303b105159 commit: 4d685f1f1f13f15fbeee1f7200417949e3818b3d Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Jul 14 09:35:32 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Jul 14 11:58:16 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4d685f1f gen_initramfs.sh: Refactor append_firmware() Signed-off-by: Thomas Deutschmann gentoo.org> gen_initramfs.sh | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index b15f1bf..c7fd1dc 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -1032,29 +1032,37 @@ append_dropbear() { } append_firmware() { - if [ ! -d "${FIRMWARE_DIR}" ] + local TDIR="${TEMP}/initramfs-firmware-temp" + if [ -d "${TDIR}" ] then - gen_die "specified firmware directory (${FIRMWARE_DIR}) does not exist" + rm -r "${TDIR}" || gen_die "Failed to clean out existing '${TDIR}'!" fi - if [ -d "${TEMP}/initramfs-firmware-temp" ] + + mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!" + cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!" + + if [ ! -d "${FIRMWARE_DIR}" ] then - rm -r "${TEMP}/initramfs-firmware-temp/" + gen_die "Specified firmware directory '${FIRMWARE_DIR}' does not exist!" fi - mkdir -p "${TEMP}/initramfs-firmware-temp/lib/firmware" - cd "${TEMP}/initramfs-firmware-temp" + + mkdir -p "${TDIR}"/lib/firmware || gen_die "Failed to create '${TDIR}/lib/firmware'!" + if [ -n "${FIRMWARE_FILES}" ] then - pushd ${FIRMWARE_DIR} >/dev/null - cp -rL --parents --target-directory="${TEMP}/initramfs-firmware-temp/lib/firmware/" ${FIRMWARE_FILES} - popd >/dev/null + pushd "${FIRMWARE_DIR}" &>/dev/null || gen_die "Failed to chdir to '${FIRMWARE_DIR}'!" + cp -rL --parents --target-directory="${TDIR}/lib/firmware" ${FIRMWARE_FILES} 2>/dev/null \ + || gen_die "Failed to copy firmware files (${FIRMWARE_FILES}) to '${TDIR}/lib/firmware'!" + popd &>/dev/null || gen_die "Failed to chdir!" else - cp -a "${FIRMWARE_DIR}"/* ${TEMP}/initramfs-firmware-temp/lib/firmware/ + cp -a "${FIRMWARE_DIR}"/* "${TDIR}"/lib/firmware/ 2>/dev/null \ + || gen_die "Failed to copy firmware files to '${TDIR}/lib/firmware'!" fi + + cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!" log_future_cpio_content find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ - || gen_die "appending firmware to cpio" - cd "${TEMP}" - rm -r "${TEMP}/initramfs-firmware-temp/" + || gen_die "Failed to append firmware to cpio!" } append_gpg() {