From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/self-test: Clean up data set
After running 'make dist-self-test-data' it was noticed that there have
been changes made to the kernel.spec file since the self-test
data was introduced and a few more variables need to be changed for
testing purposes.
Clean up the self-test data set.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -21,11 +21,17 @@ endif
include Makefile.variables
LANG=C
+
ifndef RHSELFTESTDATA
TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
else
+ # change TOPDIR to be relative
TOPDIR:=..
+ # RHEL_RELEASE may be updated which will cause a difference with the BUILD variable
+ RHEL_RELEASE:=6
+ BUILD:=$(RHEL_RELEASE)
endif
+
REDHAT:=$(TOPDIR)/redhat
include $(TOPDIR)/Makefile.rhelver
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
BUMP_RELEASE=yes
@@ -46,7 +47,7 @@ RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
RHEL_MAJOR=9
RHEL_MINOR=99
-RHEL_RELEASE=6
+RHEL_RELEASE=14
RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
@@ -91,7 +92,6 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-BUILD=6
PREBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -777,7 +777,6 @@ Source33: kernel-x86_64-debug-rhel.config
Source34: filter-x86_64.sh.rhel
Source35: filter-armv7hl.sh.rhel
-Source36: filter-i686.sh.rhel
Source37: filter-aarch64.sh.rhel
Source38: filter-ppc64le.sh.rhel
Source39: filter-s390x.sh.rhel
@@ -796,8 +795,6 @@ Source54: kernel-armv7hl-fedora.config
Source55: kernel-armv7hl-debug-fedora.config
Source56: kernel-armv7hl-lpae-fedora.config
Source57: kernel-armv7hl-lpae-debug-fedora.config
-Source58: kernel-i686-fedora.config
-Source59: kernel-i686-debug-fedora.config
Source60: kernel-ppc64le-fedora.config
Source61: kernel-ppc64le-debug-fedora.config
Source62: kernel-s390x-fedora.config
@@ -807,7 +804,6 @@ Source65: kernel-x86_64-debug-fedora.config
Source67: filter-x86_64.sh.fedora
Source68: filter-armv7hl.sh.fedora
-Source69: filter-i686.sh.fedora
Source70: filter-aarch64.sh.fedora
Source71: filter-ppc64le.sh.fedora
Source72: filter-s390x.sh.fedora
@@ -1581,7 +1577,7 @@ InitBuildVars() {
cp configs/$Config .config
%if %{signkernel}%{signmodules}
- cp $RPM_SOURCE_DIR/x509.genkey certs/.
+ cp configs/x509.genkey certs/.
%endif
Arch=`head -1 .config | cut -b 3-`
@@ -2036,7 +2032,7 @@ BuildKernel() {
remove_depmod_files
# Identify modules in the kernel-modules-extras package
- %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list
+ %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list)
# Identify modules in the kernel-modules-extras package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal
@@ -2047,6 +2043,7 @@ BuildKernel() {
# Copy the System.map file for depmod to use, and create a backup of the
# full module tree so we can restore it after we're done filtering
cp System.map $RPM_BUILD_ROOT/.
+ cp configs/filter-*.sh $RPM_BUILD_ROOT/.
pushd $RPM_BUILD_ROOT
mkdir restore
cp -r lib/modules/$KernelVer/* restore/.
@@ -2061,7 +2058,6 @@ BuildKernel() {
# modules lists. This actually removes anything going into -modules
# from the dir.
find lib/modules/$KernelVer/kernel -name *.ko | sort -n > modules.list
- cp $RPM_SOURCE_DIR/filter-*.sh .
./filter-modules.sh modules.list %{_target_cpu}
rm filter-*.sh
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
BUMP_RELEASE=yes
@@ -46,7 +47,7 @@ RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
RHEL_MAJOR=9
RHEL_MINOR=99
-RHEL_RELEASE=6
+RHEL_RELEASE=14
RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
@@ -91,7 +92,6 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-BUILD=6
PREBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -777,7 +777,6 @@ Source33: kernel-x86_64-debug-rhel.config
Source34: filter-x86_64.sh.rhel
Source35: filter-armv7hl.sh.rhel
-Source36: filter-i686.sh.rhel
Source37: filter-aarch64.sh.rhel
Source38: filter-ppc64le.sh.rhel
Source39: filter-s390x.sh.rhel
@@ -796,8 +795,6 @@ Source54: kernel-armv7hl-fedora.config
Source55: kernel-armv7hl-debug-fedora.config
Source56: kernel-armv7hl-lpae-fedora.config
Source57: kernel-armv7hl-lpae-debug-fedora.config
-Source58: kernel-i686-fedora.config
-Source59: kernel-i686-debug-fedora.config
Source60: kernel-ppc64le-fedora.config
Source61: kernel-ppc64le-debug-fedora.config
Source62: kernel-s390x-fedora.config
@@ -807,7 +804,6 @@ Source65: kernel-x86_64-debug-fedora.config
Source67: filter-x86_64.sh.fedora
Source68: filter-armv7hl.sh.fedora
-Source69: filter-i686.sh.fedora
Source70: filter-aarch64.sh.fedora
Source71: filter-ppc64le.sh.fedora
Source72: filter-s390x.sh.fedora
@@ -1581,7 +1577,7 @@ InitBuildVars() {
cp configs/$Config .config
%if %{signkernel}%{signmodules}
- cp $RPM_SOURCE_DIR/x509.genkey certs/.
+ cp configs/x509.genkey certs/.
%endif
Arch=`head -1 .config | cut -b 3-`
@@ -2036,7 +2032,7 @@ BuildKernel() {
remove_depmod_files
# Identify modules in the kernel-modules-extras package
- %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list
+ %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list)
# Identify modules in the kernel-modules-extras package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal
@@ -2047,6 +2043,7 @@ BuildKernel() {
# Copy the System.map file for depmod to use, and create a backup of the
# full module tree so we can restore it after we're done filtering
cp System.map $RPM_BUILD_ROOT/.
+ cp configs/filter-*.sh $RPM_BUILD_ROOT/.
pushd $RPM_BUILD_ROOT
mkdir restore
cp -r lib/modules/$KernelVer/* restore/.
@@ -2061,7 +2058,6 @@ BuildKernel() {
# modules lists. This actually removes anything going into -modules
# from the dir.
find lib/modules/$KernelVer/kernel -name *.ko | sort -n > modules.list
- cp $RPM_SOURCE_DIR/filter-*.sh .
./filter-modules.sh modules.list %{_target_cpu}
rm filter-*.sh
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
BUMP_RELEASE=yes
@@ -46,7 +47,7 @@ RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
RHEL_MAJOR=9
RHEL_MINOR=99
-RHEL_RELEASE=6
+RHEL_RELEASE=14
RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
@@ -91,7 +92,6 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-BUILD=6
PREBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -777,7 +777,6 @@ Source33: kernel-x86_64-debug-rhel.config
Source34: filter-x86_64.sh.rhel
Source35: filter-armv7hl.sh.rhel
-Source36: filter-i686.sh.rhel
Source37: filter-aarch64.sh.rhel
Source38: filter-ppc64le.sh.rhel
Source39: filter-s390x.sh.rhel
@@ -796,8 +795,6 @@ Source54: kernel-armv7hl-fedora.config
Source55: kernel-armv7hl-debug-fedora.config
Source56: kernel-armv7hl-lpae-fedora.config
Source57: kernel-armv7hl-lpae-debug-fedora.config
-Source58: kernel-i686-fedora.config
-Source59: kernel-i686-debug-fedora.config
Source60: kernel-ppc64le-fedora.config
Source61: kernel-ppc64le-debug-fedora.config
Source62: kernel-s390x-fedora.config
@@ -807,7 +804,6 @@ Source65: kernel-x86_64-debug-fedora.config
Source67: filter-x86_64.sh.fedora
Source68: filter-armv7hl.sh.fedora
-Source69: filter-i686.sh.fedora
Source70: filter-aarch64.sh.fedora
Source71: filter-ppc64le.sh.fedora
Source72: filter-s390x.sh.fedora
@@ -1581,7 +1577,7 @@ InitBuildVars() {
cp configs/$Config .config
%if %{signkernel}%{signmodules}
- cp $RPM_SOURCE_DIR/x509.genkey certs/.
+ cp configs/x509.genkey certs/.
%endif
Arch=`head -1 .config | cut -b 3-`
@@ -2036,7 +2032,7 @@ BuildKernel() {
remove_depmod_files
# Identify modules in the kernel-modules-extras package
- %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list
+ %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list)
# Identify modules in the kernel-modules-extras package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal
@@ -2047,6 +2043,7 @@ BuildKernel() {
# Copy the System.map file for depmod to use, and create a backup of the
# full module tree so we can restore it after we're done filtering
cp System.map $RPM_BUILD_ROOT/.
+ cp configs/filter-*.sh $RPM_BUILD_ROOT/.
pushd $RPM_BUILD_ROOT
mkdir restore
cp -r lib/modules/$KernelVer/* restore/.
@@ -2061,7 +2058,6 @@ BuildKernel() {
# modules lists. This actually removes anything going into -modules
# from the dir.
find lib/modules/$KernelVer/kernel -name *.ko | sort -n > modules.list
- cp $RPM_SOURCE_DIR/filter-*.sh .
./filter-modules.sh modules.list %{_target_cpu}
rm filter-*.sh
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
BUMP_RELEASE=yes
@@ -46,7 +47,7 @@ RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
RHEL_MAJOR=9
RHEL_MINOR=99
-RHEL_RELEASE=6
+RHEL_RELEASE=14
RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
@@ -91,7 +92,6 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-BUILD=6
PREBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -777,7 +777,6 @@ Source33: kernel-x86_64-debug-rhel.config
Source34: filter-x86_64.sh.rhel
Source35: filter-armv7hl.sh.rhel
-Source36: filter-i686.sh.rhel
Source37: filter-aarch64.sh.rhel
Source38: filter-ppc64le.sh.rhel
Source39: filter-s390x.sh.rhel
@@ -796,8 +795,6 @@ Source54: kernel-armv7hl-fedora.config
Source55: kernel-armv7hl-debug-fedora.config
Source56: kernel-armv7hl-lpae-fedora.config
Source57: kernel-armv7hl-lpae-debug-fedora.config
-Source58: kernel-i686-fedora.config
-Source59: kernel-i686-debug-fedora.config
Source60: kernel-ppc64le-fedora.config
Source61: kernel-ppc64le-debug-fedora.config
Source62: kernel-s390x-fedora.config
@@ -807,7 +804,6 @@ Source65: kernel-x86_64-debug-fedora.config
Source67: filter-x86_64.sh.fedora
Source68: filter-armv7hl.sh.fedora
-Source69: filter-i686.sh.fedora
Source70: filter-aarch64.sh.fedora
Source71: filter-ppc64le.sh.fedora
Source72: filter-s390x.sh.fedora
@@ -1581,7 +1577,7 @@ InitBuildVars() {
cp configs/$Config .config
%if %{signkernel}%{signmodules}
- cp $RPM_SOURCE_DIR/x509.genkey certs/.
+ cp configs/x509.genkey certs/.
%endif
Arch=`head -1 .config | cut -b 3-`
@@ -2036,7 +2032,7 @@ BuildKernel() {
remove_depmod_files
# Identify modules in the kernel-modules-extras package
- %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list
+ %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list)
# Identify modules in the kernel-modules-extras package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal
@@ -2047,6 +2043,7 @@ BuildKernel() {
# Copy the System.map file for depmod to use, and create a backup of the
# full module tree so we can restore it after we're done filtering
cp System.map $RPM_BUILD_ROOT/.
+ cp configs/filter-*.sh $RPM_BUILD_ROOT/.
pushd $RPM_BUILD_ROOT
mkdir restore
cp -r lib/modules/$KernelVer/* restore/.
@@ -2061,7 +2058,6 @@ BuildKernel() {
# modules lists. This actually removes anything going into -modules
# from the dir.
find lib/modules/$KernelVer/kernel -name *.ko | sort -n > modules.list
- cp $RPM_SOURCE_DIR/filter-*.sh .
./filter-modules.sh modules.list %{_target_cpu}
rm filter-*.sh
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
BUMP_RELEASE=yes
@@ -46,7 +47,7 @@ RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
RHEL_MAJOR=9
RHEL_MINOR=99
-RHEL_RELEASE=6
+RHEL_RELEASE=14
RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
@@ -91,7 +92,6 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-BUILD=6
PREBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -777,7 +777,6 @@ Source33: kernel-x86_64-debug-rhel.config
Source34: filter-x86_64.sh.rhel
Source35: filter-armv7hl.sh.rhel
-Source36: filter-i686.sh.rhel
Source37: filter-aarch64.sh.rhel
Source38: filter-ppc64le.sh.rhel
Source39: filter-s390x.sh.rhel
@@ -796,8 +795,6 @@ Source54: kernel-armv7hl-fedora.config
Source55: kernel-armv7hl-debug-fedora.config
Source56: kernel-armv7hl-lpae-fedora.config
Source57: kernel-armv7hl-lpae-debug-fedora.config
-Source58: kernel-i686-fedora.config
-Source59: kernel-i686-debug-fedora.config
Source60: kernel-ppc64le-fedora.config
Source61: kernel-ppc64le-debug-fedora.config
Source62: kernel-s390x-fedora.config
@@ -807,7 +804,6 @@ Source65: kernel-x86_64-debug-fedora.config
Source67: filter-x86_64.sh.fedora
Source68: filter-armv7hl.sh.fedora
-Source69: filter-i686.sh.fedora
Source70: filter-aarch64.sh.fedora
Source71: filter-ppc64le.sh.fedora
Source72: filter-s390x.sh.fedora
@@ -1581,7 +1577,7 @@ InitBuildVars() {
cp configs/$Config .config
%if %{signkernel}%{signmodules}
- cp $RPM_SOURCE_DIR/x509.genkey certs/.
+ cp configs/x509.genkey certs/.
%endif
Arch=`head -1 .config | cut -b 3-`
@@ -2036,7 +2032,7 @@ BuildKernel() {
remove_depmod_files
# Identify modules in the kernel-modules-extras package
- %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list
+ %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list)
# Identify modules in the kernel-modules-extras package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal
@@ -2047,6 +2043,7 @@ BuildKernel() {
# Copy the System.map file for depmod to use, and create a backup of the
# full module tree so we can restore it after we're done filtering
cp System.map $RPM_BUILD_ROOT/.
+ cp configs/filter-*.sh $RPM_BUILD_ROOT/.
pushd $RPM_BUILD_ROOT
mkdir restore
cp -r lib/modules/$KernelVer/* restore/.
@@ -2061,7 +2058,6 @@ BuildKernel() {
# modules lists. This actually removes anything going into -modules
# from the dir.
find lib/modules/$KernelVer/kernel -name *.ko | sort -n > modules.list
- cp $RPM_SOURCE_DIR/filter-*.sh .
./filter-modules.sh modules.list %{_target_cpu}
rm filter-*.sh
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
BUMP_RELEASE=yes
@@ -46,7 +47,7 @@ RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
RHEL_MAJOR=9
RHEL_MINOR=99
-RHEL_RELEASE=6
+RHEL_RELEASE=14
RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
@@ -91,7 +92,6 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-BUILD=6
PREBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -777,7 +777,6 @@ Source33: kernel-x86_64-debug-rhel.config
Source34: filter-x86_64.sh.rhel
Source35: filter-armv7hl.sh.rhel
-Source36: filter-i686.sh.rhel
Source37: filter-aarch64.sh.rhel
Source38: filter-ppc64le.sh.rhel
Source39: filter-s390x.sh.rhel
@@ -796,8 +795,6 @@ Source54: kernel-armv7hl-fedora.config
Source55: kernel-armv7hl-debug-fedora.config
Source56: kernel-armv7hl-lpae-fedora.config
Source57: kernel-armv7hl-lpae-debug-fedora.config
-Source58: kernel-i686-fedora.config
-Source59: kernel-i686-debug-fedora.config
Source60: kernel-ppc64le-fedora.config
Source61: kernel-ppc64le-debug-fedora.config
Source62: kernel-s390x-fedora.config
@@ -807,7 +804,6 @@ Source65: kernel-x86_64-debug-fedora.config
Source67: filter-x86_64.sh.fedora
Source68: filter-armv7hl.sh.fedora
-Source69: filter-i686.sh.fedora
Source70: filter-aarch64.sh.fedora
Source71: filter-ppc64le.sh.fedora
Source72: filter-s390x.sh.fedora
@@ -1581,7 +1577,7 @@ InitBuildVars() {
cp configs/$Config .config
%if %{signkernel}%{signmodules}
- cp $RPM_SOURCE_DIR/x509.genkey certs/.
+ cp configs/x509.genkey certs/.
%endif
Arch=`head -1 .config | cut -b 3-`
@@ -2036,7 +2032,7 @@ BuildKernel() {
remove_depmod_files
# Identify modules in the kernel-modules-extras package
- %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list
+ %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list)
# Identify modules in the kernel-modules-extras package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal
@@ -2047,6 +2043,7 @@ BuildKernel() {
# Copy the System.map file for depmod to use, and create a backup of the
# full module tree so we can restore it after we're done filtering
cp System.map $RPM_BUILD_ROOT/.
+ cp configs/filter-*.sh $RPM_BUILD_ROOT/.
pushd $RPM_BUILD_ROOT
mkdir restore
cp -r lib/modules/$KernelVer/* restore/.
@@ -2061,7 +2058,6 @@ BuildKernel() {
# modules lists. This actually removes anything going into -modules
# from the dir.
find lib/modules/$KernelVer/kernel -name *.ko | sort -n > modules.list
- cp $RPM_SOURCE_DIR/filter-*.sh .
./filter-modules.sh modules.list %{_target_cpu}
rm filter-*.sh
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
BUMP_RELEASE=yes
@@ -46,7 +47,7 @@ RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
RHEL_MAJOR=9
RHEL_MINOR=99
-RHEL_RELEASE=6
+RHEL_RELEASE=14
RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
@@ -91,7 +92,6 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-BUILD=6
PREBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -777,7 +777,6 @@ Source33: kernel-x86_64-debug-rhel.config
Source34: filter-x86_64.sh.rhel
Source35: filter-armv7hl.sh.rhel
-Source36: filter-i686.sh.rhel
Source37: filter-aarch64.sh.rhel
Source38: filter-ppc64le.sh.rhel
Source39: filter-s390x.sh.rhel
@@ -796,8 +795,6 @@ Source54: kernel-armv7hl-fedora.config
Source55: kernel-armv7hl-debug-fedora.config
Source56: kernel-armv7hl-lpae-fedora.config
Source57: kernel-armv7hl-lpae-debug-fedora.config
-Source58: kernel-i686-fedora.config
-Source59: kernel-i686-debug-fedora.config
Source60: kernel-ppc64le-fedora.config
Source61: kernel-ppc64le-debug-fedora.config
Source62: kernel-s390x-fedora.config
@@ -807,7 +804,6 @@ Source65: kernel-x86_64-debug-fedora.config
Source67: filter-x86_64.sh.fedora
Source68: filter-armv7hl.sh.fedora
-Source69: filter-i686.sh.fedora
Source70: filter-aarch64.sh.fedora
Source71: filter-ppc64le.sh.fedora
Source72: filter-s390x.sh.fedora
@@ -1581,7 +1577,7 @@ InitBuildVars() {
cp configs/$Config .config
%if %{signkernel}%{signmodules}
- cp $RPM_SOURCE_DIR/x509.genkey certs/.
+ cp configs/x509.genkey certs/.
%endif
Arch=`head -1 .config | cut -b 3-`
@@ -2036,7 +2032,7 @@ BuildKernel() {
remove_depmod_files
# Identify modules in the kernel-modules-extras package
- %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list
+ %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list)
# Identify modules in the kernel-modules-extras package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal
@@ -2047,6 +2043,7 @@ BuildKernel() {
# Copy the System.map file for depmod to use, and create a backup of the
# full module tree so we can restore it after we're done filtering
cp System.map $RPM_BUILD_ROOT/.
+ cp configs/filter-*.sh $RPM_BUILD_ROOT/.
pushd $RPM_BUILD_ROOT
mkdir restore
cp -r lib/modules/$KernelVer/* restore/.
@@ -2061,7 +2058,6 @@ BuildKernel() {
# modules lists. This actually removes anything going into -modules
# from the dir.
find lib/modules/$KernelVer/kernel -name *.ko | sort -n > modules.list
- cp $RPM_SOURCE_DIR/filter-*.sh .
./filter-modules.sh modules.list %{_target_cpu}
rm filter-*.sh
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
BUMP_RELEASE=yes
@@ -46,7 +47,7 @@ RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
RHEL_MAJOR=9
RHEL_MINOR=99
-RHEL_RELEASE=6
+RHEL_RELEASE=14
RHPKG_BIN=centpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
@@ -91,7 +92,6 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-BUILD=6
PREBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -777,7 +777,6 @@ Source33: kernel-x86_64-debug-rhel.config
Source34: filter-x86_64.sh.rhel
Source35: filter-armv7hl.sh.rhel
-Source36: filter-i686.sh.rhel
Source37: filter-aarch64.sh.rhel
Source38: filter-ppc64le.sh.rhel
Source39: filter-s390x.sh.rhel
@@ -796,8 +795,6 @@ Source54: kernel-armv7hl-fedora.config
Source55: kernel-armv7hl-debug-fedora.config
Source56: kernel-armv7hl-lpae-fedora.config
Source57: kernel-armv7hl-lpae-debug-fedora.config
-Source58: kernel-i686-fedora.config
-Source59: kernel-i686-debug-fedora.config
Source60: kernel-ppc64le-fedora.config
Source61: kernel-ppc64le-debug-fedora.config
Source62: kernel-s390x-fedora.config
@@ -807,7 +804,6 @@ Source65: kernel-x86_64-debug-fedora.config
Source67: filter-x86_64.sh.fedora
Source68: filter-armv7hl.sh.fedora
-Source69: filter-i686.sh.fedora
Source70: filter-aarch64.sh.fedora
Source71: filter-ppc64le.sh.fedora
Source72: filter-s390x.sh.fedora
@@ -1581,7 +1577,7 @@ InitBuildVars() {
cp configs/$Config .config
%if %{signkernel}%{signmodules}
- cp $RPM_SOURCE_DIR/x509.genkey certs/.
+ cp configs/x509.genkey certs/.
%endif
Arch=`head -1 .config | cut -b 3-`
@@ -2036,7 +2032,7 @@ BuildKernel() {
remove_depmod_files
# Identify modules in the kernel-modules-extras package
- %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list
+ %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list)
# Identify modules in the kernel-modules-extras package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal
@@ -2047,6 +2043,7 @@ BuildKernel() {
# Copy the System.map file for depmod to use, and create a backup of the
# full module tree so we can restore it after we're done filtering
cp System.map $RPM_BUILD_ROOT/.
+ cp configs/filter-*.sh $RPM_BUILD_ROOT/.
pushd $RPM_BUILD_ROOT
mkdir restore
cp -r lib/modules/$KernelVer/* restore/.
@@ -2061,7 +2058,6 @@ BuildKernel() {
# modules lists. This actually removes anything going into -modules
# from the dir.
find lib/modules/$KernelVer/kernel -name *.ko | sort -n > modules.list
- cp $RPM_SOURCE_DIR/filter-*.sh .
./filter-modules.sh modules.list %{_target_cpu}
rm filter-*.sh
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
@@ -28,7 +28,8 @@ do
# CURDIR from the output.
# UPSTREAM is the base merge commit and can change from day-to-day as
# the tree is changed. Omit UPSTREAM from the output.
- make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}" HEAD=${commit} dist-dump-variables | grep "=" | grep -v CURDIR | grep -v -w UPSTREAM >& "${varfilename}"
+ # RHEL_RELEASE can change build-to-build.
+ 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}"
# When executed from a script, the variables in Makefile.variables are
# listed as having origin 'environment'. This is because the script
@@ -41,6 +42,7 @@ do
do
[ "$VAR" == "RHDISTDATADIR" ] && continue
[ "$VAR" == "RHGITURL" ] && continue
+ [ "$VAR" == "BUILD" ] && continue
echo "$VAR=${!VAR}"
done >> "${varfilename}"
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
@@ -2,6 +2,7 @@
.SHELLSTATUS=0
ARCHCONFIG=X86_64
ARCH_LIST=aarch64 ppc64le s390x x86_64
+BUILD=6
BUILD_FLAGS=
BUMP_RELEASE=yes
CHANGELOG=kernel.changelog-9.99
@@ -44,7 +45,7 @@ RHDISTGIT_TMP=/tmp
RHDISTGIT_USER="shadowman"
RHEL_MAJOR=9
RHEL_MINOR=99
-RHEL_RELEASE=6
+RHEL_RELEASE=14
RHPKG_BIN=fedpkg
RHSELFTESTDATA=1
RPM=../redhat/rpm
@@ -89,7 +90,6 @@ BUILD_SCRATCH_TARGET=temp-ark-rhel-8-test
BUILD_TARGET=--scratch temp-ark-rhel-8-test
BUILD_PROFILE=
BUILD_FLAGS=
-BUILD=6
PREBUILD_GIT_ONLY=1
RHGITCOMMIT=HEAD
RHJOBS=1
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -777,7 +777,6 @@ Source33: kernel-x86_64-debug-rhel.config
Source34: filter-x86_64.sh.rhel
Source35: filter-armv7hl.sh.rhel
-Source36: filter-i686.sh.rhel
Source37: filter-aarch64.sh.rhel
Source38: filter-ppc64le.sh.rhel
Source39: filter-s390x.sh.rhel
@@ -796,8 +795,6 @@ Source54: kernel-armv7hl-fedora.config
Source55: kernel-armv7hl-debug-fedora.config
Source56: kernel-armv7hl-lpae-fedora.config
Source57: kernel-armv7hl-lpae-debug-fedora.config
-Source58: kernel-i686-fedora.config
-Source59: kernel-i686-debug-fedora.config
Source60: kernel-ppc64le-fedora.config
Source61: kernel-ppc64le-debug-fedora.config
Source62: kernel-s390x-fedora.config
@@ -807,7 +804,6 @@ Source65: kernel-x86_64-debug-fedora.config
Source67: filter-x86_64.sh.fedora
Source68: filter-armv7hl.sh.fedora
-Source69: filter-i686.sh.fedora
Source70: filter-aarch64.sh.fedora
Source71: filter-ppc64le.sh.fedora
Source72: filter-s390x.sh.fedora
@@ -1581,7 +1577,7 @@ InitBuildVars() {
cp configs/$Config .config
%if %{signkernel}%{signmodules}
- cp $RPM_SOURCE_DIR/x509.genkey certs/.
+ cp configs/x509.genkey certs/.
%endif
Arch=`head -1 .config | cut -b 3-`
@@ -2036,7 +2032,7 @@ BuildKernel() {
remove_depmod_files
# Identify modules in the kernel-modules-extras package
- %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list
+ %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list)
# Identify modules in the kernel-modules-extras package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal
@@ -2047,6 +2043,7 @@ BuildKernel() {
# Copy the System.map file for depmod to use, and create a backup of the
# full module tree so we can restore it after we're done filtering
cp System.map $RPM_BUILD_ROOT/.
+ cp configs/filter-*.sh $RPM_BUILD_ROOT/.
pushd $RPM_BUILD_ROOT
mkdir restore
cp -r lib/modules/$KernelVer/* restore/.
@@ -2061,7 +2058,6 @@ BuildKernel() {
# modules lists. This actually removes anything going into -modules
# from the dir.
find lib/modules/$KernelVer/kernel -name *.ko | sort -n > modules.list
- cp $RPM_SOURCE_DIR/filter-*.sh .
./filter-modules.sh modules.list %{_target_cpu}
rm filter-*.sh
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1647
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
