From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A80D759CA9 for ; Sun, 27 Mar 2016 06:10:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E50C421C014; Sun, 27 Mar 2016 06:10:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50B6F21C00D for ; Sun, 27 Mar 2016 06:10:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 962B4340A9F for ; Sun, 27 Mar 2016 06:10:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9DC086A for ; Sun, 27 Mar 2016 06:10:44 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1459058681.4fb8318037a8ea12f54b7c711d702b432113f233.vapier@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_package.sh X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 4fb8318037a8ea12f54b7c711d702b432113f233 X-VCS-Branch: master Date: Sun, 27 Mar 2016 06:10:44 +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-Archives-Salt: 8011230a-e108-4a18-b7b4-da4e9abdfcb1 X-Archives-Hash: 4c0f96b090ad2ee9b249ed1a627cf912 commit: 4fb8318037a8ea12f54b7c711d702b432113f233 Author: Mike Frysinger gentoo org> AuthorDate: Sun Mar 27 06:04:41 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Mar 27 06:04:41 2016 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4fb83180 adjust System.map die check for #570822 Builds with newer genkernel have been failing in catalyst like so: * ERROR: Could not copy System.map from kerncache for the kernel package! The code that added it seems to have been meant to check the minkernpackage/ subdir where the file was renamed instead of the current subdir. Change the check to simplify verify the mv didn't fail instead of duplicating the file name entirely. Signed-off-by: Mike Frysinger gentoo.org> gen_package.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gen_package.sh b/gen_package.sh index 9dd166b..b08ff03 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -45,11 +45,8 @@ gen_minkernpackage() { if [ "${KERNCACHE}" != "" ] then /bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV} - mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}} - if [ ! -f System.map-${KNAME}-${ARCH}-${KV} ] - then + mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}} || gen_die 'Could not copy System.map from kerncache for the kernel package!' - fi else cp "${KERNEL_OUTPUTDIR}/System.map" "${TEMP}/minkernpackage/System.map-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!'; fi