[OS-BUILD PATCH 1/4] redhat/self-test: Omit SHELL variable from test data

Thursday, 19 May 2022

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/self-test: Omit SHELL variable from test data

The SHELL variable reports the shell that is executed by the user.  This
obviously may vary from user to user, so it can be dropped.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7
b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25
b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -47,7 +47,6 @@ RHPKG_BIN=centpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh
index blahblah..blahblah 100755
--- a/redhat/self-test/data/create-data.sh
+++ b/redhat/self-test/data/create-data.sh
@@ -29,8 +29,9 @@ do
 			# UPSTREAM is the base merge commit and can change from day-to-day as
 			# the tree is changed.  Omit UPSTREAM from the output.
 			# RHEL_RELEASE can change build-to-build.
+			# SHELL can change depending on user's environment
 			unset SINGLE_TARBALL
-			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR | grep -v -w
UPSTREAM | grep -v -w RHEL_RELEASE >& "${varfilename}"
+			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}"
HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR | grep -v -w
UPSTREAM | grep -v -w RHEL_RELEASE | grep -v -w SHELL >&
"${varfilename}"
 
 			# When executed from a script, the variables in Makefile.variables are
 			# listed as having origin 'environment'.  This is because the script
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7
b/redhat/self-test/data/fedora-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7
b/redhat/self-test/data/fedora-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7
b/redhat/self-test/data/fedora-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25
b/redhat/self-test/data/fedora-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7
b/redhat/self-test/data/fedora-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
@@ -45,7 +45,6 @@ RHPKG_BIN=fedpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7
b/redhat/self-test/data/rhel-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7
@@ -45,7 +45,6 @@ RHPKG_BIN=rhpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25
b/redhat/self-test/data/rhel-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25
@@ -45,7 +45,6 @@ RHPKG_BIN=rhpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7
b/redhat/self-test/data/rhel-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7
@@ -45,7 +45,6 @@ RHPKG_BIN=rhpkg
 RHSELFTESTDATA=1 
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
-SHELL=/bin/sh 
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1741

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[OS-BUILD PATCH 1/4] redhat/self-test: Omit SHELL variable from test data