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 D6A43138350 for ; Wed, 29 Apr 2020 23:20:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28D76E08F2; Wed, 29 Apr 2020 23:20:25 +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 10618E08F2 for ; Wed, 29 Apr 2020 23:20:25 +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 EA85234EEC8 for ; Wed, 29 Apr 2020 23:20:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D9EE200 for ; Wed, 29 Apr 2020 23:20:13 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1588189070.43aa276417114d50600816e0d1aa044da99ca1f0.mattst88@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto X-VCS-Directories: tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 43aa276417114d50600816e0d1aa044da99ca1f0 X-VCS-Branch: master Date: Wed, 29 Apr 2020 23:20:13 +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: ad7ef7a9-4aa8-458c-b71e-0794f7f3e772 X-Archives-Hash: d25a63dec30e215eb5d563954d87f41c commit: 43aa276417114d50600816e0d1aa044da99ca1f0 Author: Matt Turner gentoo org> AuthorDate: Wed Apr 29 04:45:43 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Apr 29 19:37:50 2020 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=43aa2764 catalyst-auto: Drop unnecessary spec munging No longer necessary with @TIMESTAMP@. Signed-off-by: Matt Turner gentoo.org> tools/catalyst-auto | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tools/catalyst-auto b/tools/catalyst-auto index 2e449ea0..66ff5ecc 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -325,24 +325,6 @@ run_catalyst_commands() { # Fix up specs with datestamp for i in $(find -name '*.spec'); do - # Grab current version_stamp and source_subpath - old_version_stamp=$(grep version_stamp "${i}" | sed -e 's|^version_stamp: *||') - old_source_subpath=$(grep source_subpath "${i}" | sed -e 's|^source_subpath: *||') - - new_version_stamp=$(echo "${old_version_stamp}" | sed -e "s|^\(.*-\)\?.*$|\1${TIMESTAMP}|") - new_source_subpath=$(echo "${old_source_subpath}" | sed -e "s|${old_version_stamp}|${new_version_stamp}|") - - sed -i "s|^version_stamp:.*$|version_stamp: ${new_version_stamp}|" "${i}" - sed -i "s|^snapshot:.*$|snapshot: ${TIMESTAMP}|" "${i}" - - # We don't want to mangle the source_subpath for our stage1 spec - if ! grep -q '^target: *stage[14]$' "${i}"; then - sed -i "s|^source_subpath:.*$|source_subpath: ${new_source_subpath}|" "${i}" - fi - - sed -i "/^livecd\/iso/s|${old_version_stamp}|${new_version_stamp}|" "${i}" - sed -i "/^livecd\/volid/s|${old_version_stamp}|${new_version_stamp}|" "${i}" - kconfig_lines=$(grep '^boot/kernel/[^/]\+/config:' "${i}") if [[ -n ${kconfig_lines} ]]; then echo "${kconfig_lines}" | while read line; do