Re: [OS-BUILD PATCHv13 0/4] redhat/Makefile: automotive: support kernel-automotive

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

 



From: Jarod Wilson on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3870#note_2547467456

Okay, now I'm more curious. I pulled down the MR, rebased it on latest os-
build, and reverted most of the `:=` to `=` changes, and everything seems to
behave as expected.

Here's what I've applied (or unapplied, as the case may be):

```diff
diff --git i/redhat/Makefile w/redhat/Makefile
index 240a01b127d54..d14279ca06913 100644
--- i/redhat/Makefile
+++ w/redhat/Makefile
@@ -70,13 +70,13 @@ ARCHCONFIG := $(shell uname -m | sed -e s/x86_64/X86_64/ \
                                     -e s/s390x/S390/ -e s/ppc.*/PPC/ )

 # rpm information
-SPECFILE=$(SPECPACKAGE_NAME).spec
+SPECFILE:=$(SPECPACKAGE_NAME).spec
 RPM:=$(REDHAT)/rpm
 SRPMS:=$(RPM)/SRPMS
 SOURCES:=$(RPM)/SOURCES
 TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
 CHANGELOG_EXT:=changelog-$(RHEL_MAJOR).$(RHEL_MINOR)
-SPECCHANGELOG=$(SPECPACKAGE_NAME).$(CHANGELOG_EXT)
+SPECCHANGELOG:=$(SPECPACKAGE_NAME).$(CHANGELOG_EXT)
 ARCH_LIST=aarch64 ppc64le s390x x86_64 riscv64

 # save some user selectable values to know later if we can override them
@@ -274,7 +274,7 @@ else
 endif
 BASEVERSION:=$(SPECRPMVERSION)-$(SPECBUILD)
 RELEASETAG:=$(SPECPACKAGE_NAME)-$(BASEVERSION)
-SRPM=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
+SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm

 #
 # This conditional statement is where fedora, centos, and other (aka RHEL)
@@ -301,10 +301,10 @@ else ifeq ("$(DISTRO)", "centos")
   ifndef BUILD_TARGET
     BUILD_TARGET:=c$(RHEL_MAJOR)s-candidate
   endif
-  SPECTARFILE_RELEASE=$(BASEVERSION)$(DIST)
-  SPECKABIVERSION=$(BASEVERSION)$(DIST)
-  DISTRELEASETAG=$(RELEASETAG)$(DIST)
-  DISTBASEVERSION=$(BASEVERSION)$(DIST)
+  SPECTARFILE_RELEASE:=$(BASEVERSION)$(DIST)
+  SPECKABIVERSION:=$(BASEVERSION)$(DIST)
+  DISTRELEASETAG:=$(RELEASETAG)$(DIST)
+  DISTBASEVERSION:=$(BASEVERSION)$(DIST)
   PATCHLIST_URL:=none
   RHPKG_BIN:=centpkg
 else
@@ -324,10 +324,10 @@ else
     SPECTARFILE_RELEASE:=$(BASEVERSION)
     SPECKABIVERSION:=$(BASEVERSION)
   else
-    DISTRELEASETAG=$(RELEASETAG)$(DIST)
-    DISTBASEVERSION=$(BASEVERSION)$(DIST)
-    SPECTARFILE_RELEASE=$(BASEVERSION)$(DIST)
-    SPECKABIVERSION=$(BASEVERSION)$(DIST)
+    DISTRELEASETAG:=$(RELEASETAG)$(DIST)
+    DISTBASEVERSION:=$(BASEVERSION)$(DIST)
+    SPECTARFILE_RELEASE:=$(BASEVERSION)$(DIST)
+    SPECKABIVERSION:=$(BASEVERSION)$(DIST)
   endif
   PATCHLIST_URL:=none
   RHPKG_BIN:=rhpkg
@@ -366,8 +366,8 @@ ifeq ($(AUTOMOTIVE_BUILD), 1)
   FLAVOR:=rhel
 endif

-TARFILE=linux-$(SPECTARFILE_RELEASE).tar.xz
-TARBALL=$(REDHAT)/$(TARFILE)
+TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz
+TARBALL:=$(REDHAT)/$(TARFILE)

 KABI_TARBALL:=$(REDHAT)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.xz
 KABIDW := $(REDHAT)/kabi-dwarf
```

Both `make dist-srpm` and `make AUTOMOTIVE_BUILD=1 DIST=".el10iv" dist-srpm`
generate a source rpm in the end that looks sane at a glance, though I've not
tried building them. Was the problem later on with the build system or ci
pipelines?

-- 
_______________________________________________
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, report it: https://pagure.io/fedora-infrastructure/new_issue




[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