[OS-BUILD PATCHv2 1/17] redhat/Makefile: Remove KEXTRAVERSION

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Prarit Bhargava <prarit@xxxxxxxxxx>

redhat/Makefile: Remove KEXTRAVERSION

KEXTRAVERSION isn't used for anything and can be removed.

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
@@ -147,11 +147,9 @@ endif
 # from makefile as opposed to any adjusted version for snapshotting.
 ifneq ($(SPECKEXTRAVERSION),)
   MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
-  KEXTRAVERSION:=$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./)
-  PREBUILD:=0$(KEXTRAVERSION).
+  PREBUILD:=0$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./).
   UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION)
 else
-  KEXTRAVERSION:=
   ifeq ($(SPECKSUBLEVEL),0)
     MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)
     UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)
@@ -195,8 +193,7 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
     # packaging. Fix this by bumping the patch level and marking
     # this as rc0
     ifeq ($(SPECKEXTRAVERSION),)
-      KEXTRAVERSION:=.rc0
-      PREBUILD:=0$(KEXTRAVERSION).
+      PREBUILD:=0.rc0.
       SPECKPATCHLEVEL:=$(shell expr $(SPECKPATCHLEVEL) + 1)
     endif
     ifndef PREBUILD_GIT_ONLY
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2 
-KEXTRAVERSION=.rc0 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2 
-KEXTRAVERSION=.rc0 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2 
-KEXTRAVERSION= 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2 
-KEXTRAVERSION= 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -24,7 +24,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2 
-KEXTRAVERSION=.rc0 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2 
-KEXTRAVERSION=.rc0 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2 
-KEXTRAVERSION= 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2 
-KEXTRAVERSION= 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.bz2 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2 
-KEXTRAVERSION=.rc5 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 
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
@@ -22,7 +22,6 @@ INCLUDE_RHEL_FILES=1
 KABIDW=../redhat/kabi-dwarf 
 KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2 
 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.bz2 
-KEXTRAVERSION=.rc0 
 LANG=C 
 LOCVERFILE=../localversion 
 MACH=x86_64 

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
_______________________________________________
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




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux