[gentoo-commits] proj/releng:master commit in: tools/

[Matt Turner]

commit:     43aa276417114d50600816e0d1aa044da99ca1f0
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 04:45:43 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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