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 DF3BD1396D2 for ; Sun, 3 Sep 2017 06:28:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9EE0E0E59; Sun, 3 Sep 2017 06:28:27 +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 A41BFE0E5E for ; Sun, 3 Sep 2017 06:28:27 +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 B4FD3341698 for ; Sun, 3 Sep 2017 06:28:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58FDD8C39 for ; Sun, 3 Sep 2017 06:28:25 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1504420096.1c0c5daadb6632fa503bf980104789f74db72c7f.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_compile.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 1c0c5daadb6632fa503bf980104789f74db72c7f X-VCS-Branch: master Date: Sun, 3 Sep 2017 06:28:25 +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: 22f5bc77-55ef-4778-aa52-e780f665846a X-Archives-Hash: 41b9cb45497197402dd56630cb907875 commit: 1c0c5daadb6632fa503bf980104789f74db72c7f Author: Robin H. Johnson gentoo org> AuthorDate: Sun Sep 3 06:24:42 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Sep 3 06:28:16 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1c0c5daa gen_compile: be a little bit more verbose about patching. Signed-off-by: Robin H. Johnson gentoo.org> gen_compile.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gen_compile.sh b/gen_compile.sh index f3f9ef1..76e11a8 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -208,17 +208,19 @@ reset_args() apply_patches() { util=$1 version=$2 + patchdir=${GK_SHARE}/patches/${util}/${version} - if [ -d "${GK_SHARE}/patches/${util}/${version}" ] + if [ -d "${patchdir}" ] then print_info 1 "${util}: >> Applying patches..." - for i in ${GK_SHARE}/patches/${util}/${version}/*{diff,patch} + for i in ${patchdir}/*{diff,patch} do [ -f "${i}" ] || continue patch_success=0 for j in `seq 0 5` do - patch -p${j} --backup-if-mismatch -f < "${i}" >/dev/null + patch -p${j} --backup-if-mismatch -f < "${i}" --dry-run >/dev/null && \ + patch -p${j} --backup-if-mismatch -f < "${i}" if [ $? = 0 ] then patch_success=1 @@ -232,6 +234,8 @@ apply_patches() { gen_die "could not apply patch ${i} for ${util}-${version}" fi done + else + print_info 1 "${util}: >> No patches found in $patchdir ..." fi }