todo: figure out why stoney is not building

FyraLabs · Mar 29, 2024 · b439bad · b439bad
1 parent 4902297
commit b439bad
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/stoneyridge/scripts-Makefile-package-rename-package.patch b/stoneyridge/scripts-Makefile-package-rename-package.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/Makefile.package b/scripts/Makefile.package
+index 2a90139ecbe1..f3abcc639c46 100644
+--- a/scripts/Makefile.package
++++ b/scripts/Makefile.package
+@@ -24,7 +24,7 @@ include $(srctree)/scripts/Kbuild.include
+ # but the binrpm-pkg target can; for some reason O= gets ignored.
+
+ # Remove hyphens since they have special meaning in RPM filenames
+-KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
++KERNELPATH := kernel-stoneyridge-$(subst -,_,$(KERNELRELEASE))
+ KDEB_SOURCENAME ?= linux-upstream
+ KBUILD_PKG_ROOTCMD ?="fakeroot -u"
+ export KDEB_SOURCENAME
diff --git a/stoneyridge/scripts-package-mkspec-rename-package.patch b/stoneyridge/scripts-package-mkspec-rename-package.patch
@@ -1,5 +1,5 @@
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index f892cf8e37f0..f262e0650673 100755
+index f892cf8e37f0..c2b4264d3fdb 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
 @@ -39,7 +39,7 @@ EXCLUDES="$RCS_TAR_IGNORE --exclude=*vmlinux* --exclude=*.mod \
@@ -11,7 +11,16 @@ index f892cf8e37f0..f262e0650673 100755
  	Summary: The Linux Kernel
  	Version: $__KERNELRELEASE
  	Release: $(cat .version 2>/dev/null || echo 1)
-@@ -74,12 +74,12 @@ $S$M	%package devel
+@@ -47,7 +47,7 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
+ 	Group: System Environment/Kernel
+ 	Vendor: The Linux Community
+ 	URL: https://www.kernel.org
+-$S	Source: kernel-$__KERNELRELEASE.tar.gz
++$S	Source: kernel-stoneyridge-$__KERNELRELEASE.tar.gz
+ 	Provides: $PROVIDES
+ 	# $UTS_MACHINE as a fallback of _arch in case
+ 	# /usr/lib/rpm/platform/*/macros was not included.
+@@ -74,7 +74,7 @@ $S$M	%package devel
  $S$M	Summary: Development package for building kernel modules to match the $__KERNELRELEASE kernel
  $S$M	Group: System Environment/Kernel
  $S$M	AutoReqProv: no
@@ -20,9 +29,3 @@ index f892cf8e37f0..f262e0650673 100755
  $S$M	This package provides kernel headers and makefiles sufficient to build modules
  $S$M	against the $__KERNELRELEASE kernel package.
  $S$M
- $S	%prep
--$S	%setup -q
-+$S	%setup -q -n kernel-6.1.83_dirty
- $S
- $S	%build
- $S	$MAKE %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}