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 BCA19138334 for ; Sat, 23 Mar 2019 09:52:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42F94E0A04; Sat, 23 Mar 2019 09:52:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1FC04E09F1 for ; Sat, 23 Mar 2019 09:52:47 +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 EA271335D02 for ; Sat, 23 Mar 2019 09:52:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26E6A580 for ; Sat, 23 Mar 2019 09:52:42 +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: <1553328378.459790c8075e8152e764a9d1d070994fd5cb83b6.whissi@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: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 459790c8075e8152e764a9d1d070994fd5cb83b6 X-VCS-Branch: master Date: Sat, 23 Mar 2019 09:52:42 +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: 98c68649-2fd2-4ddc-83e7-508964867c6b X-Archives-Hash: 5627e71dbee4b749f2a9f77d4adbf662 commit: 459790c8075e8152e764a9d1d070994fd5cb83b6 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Mar 23 03:51:52 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Mar 23 08:06:18 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=459790c8 gen_kerncache_is_valid(): No need to do anything if $KERNCACHE file doesn't exist Signed-off-by: Thomas Deutschmann gentoo.org> gen_package.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gen_package.sh b/gen_package.sh index 32cbf85..bd137ad 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -169,20 +169,21 @@ gen_kerncache_extract_config() gen_kerncache_is_valid() { KERNCACHE_IS_VALID="no" - if ! isTrue "${KERNEL_SOURCES}" - then - BUILD_KERNEL="no" - # Can make this more secure .... - /bin/tar -xf ${KERNCACHE} -C ${TEMP} - if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${TEMP}/kernel-${ARCH}-${KV} ] - then - print_info 1 'Valid kernel cache found; no sources will be used' - KERNCACHE_IS_VALID="yes" - fi - else - if [ -e "${KERNCACHE}" ] + if [ -e "${KERNCACHE}" ] + then + if ! isTrue "${KERNEL_SOURCES}" then + BUILD_KERNEL="no" + # Can make this more secure .... + + /bin/tar -xf ${KERNCACHE} -C ${TEMP} + if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${TEMP}/kernel-${ARCH}-${KV} ] + then + print_info 1 'Valid kernel cache found; no sources will be used' + KERNCACHE_IS_VALID="yes" + fi + else KERNEL_CONFIG="/${KERNEL_OUTPUTDIR}/.config" if [ "${CMD_KERNEL_CONFIG}" != '' ] then @@ -208,7 +209,6 @@ gen_kerncache_is_valid() fi test2=$("${CONFGREP}" -v "^#" ${KERNEL_CONFIG} | md5sum | cut -d " " -f 1) - if [ "${test1}" == "${test2}" ] then echo