System76 Linux

pop-os · jackpot51 · Aug 24, 2022 · Sep 22, 2022 · Sep 22, 2022 · Sep 23, 2022
commit a79cfa80a38f7dca8a4f4f6c3f25d3cb3ca0793c
diff --git a/.gitignore b/.gitignore
@@ -76,7 +76,9 @@ modules.order
 #
 # Debian directory (make deb-pkg)
 #
-/debian/
+#/debian/
+/debian/build/
+/debian/files
 
 #
 # Snap directory (make snap-pkg)

diff --git a/debian.master/control.d/linux-libc-dev.stub b/debian.master/control.d/linux-libc-dev.stub
@@ -1,5 +1,5 @@
 Package: linux-libc-dev
-Architecture: amd64 armhf arm64 i386 ppc64el riscv64 s390x
+Architecture: amd64 armhf arm64 ppc64el riscv64 s390x
 Depends: ${misc:Depends}
 Conflicts: linux-kernel-headers
 Replaces: linux-kernel-headers

diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
@@ -2,5 +2,5 @@ arch="amd64 armhf arm64 ppc64el s390x"
 supported="Generic"
 target="Geared toward desktop and server systems."
 desc="=HUMAN= SMP"
-bootloader="grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-efi-arm64 [arm64] | grub-efi-arm [armhf] | grub-ieee1275 [ppc64el]"
+bootloader="kernelstub [amd64] | grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-efi-arm64 [arm64] | grub-efi-arm [armhf] | grub-ieee1275 [ppc64el]"
 provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64]"
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
@@ -36,7 +36,8 @@ Build-Depends:
  dkms <!stage1>,
  curl <!stage1>,
  zstd [amd64 s390x] <!stage1>,
- pahole [amd64 arm64 armhf ppc64el s390x riscv64] | dwarves (>= 1.21) [amd64 arm64 armhf ppc64el s390x riscv64] <!stage1>,
+ dwarves (>= 1.21) [amd64 arm64 armhf ppc64el s390x riscv64] <!stage1>,
+ python3-dev <!stage1>,
 Build-Depends-Indep:
  xmlto <!stage1>,
  docbook-utils <!stage1>,
@@ -154,3 +155,82 @@ Depends: ${misc:Depends}, python3
 Description: Linux kernel VM host tools
  This package provides kernel tools useful for VM hosts.
 
+# linux-meta {
+
+Package: SRCPKGNAME-headers-generic
+Build-Profiles: <!stage1>
+Architecture: amd64 armhf arm64 powerpc ppc64el s390x
+Section: kernel
+Depends:
+ ${misc:Depends},
+ linux-headers-PKGVER-ABINUM-generic (= ${source:Version})
+Description: Generic Linux kernel headers
+ This package will always depend on the latest generic kernel headers
+ available.
+
+Package: SRCPKGNAME-image-generic
+Build-Profiles: <!stage1>
+Architecture: amd64 armhf arm64 powerpc ppc64el s390x
+Section: kernel
+Depends:
+ ${misc:Depends},
+ linux-image-PKGVER-ABINUM-generic (= ${source:Version}),
+ linux-firmware,
+ intel-microcode [amd64],
+ amd64-microcode [amd64]
+Recommends: thermald [amd64]
+Description: Generic Linux kernel image
+ This package will always depend on the latest generic kernel image
+ available.
+
+Package: SRCPKGNAME-tools-generic
+Build-Profiles: <!stage1>
+Architecture: amd64 armhf arm64 powerpc ppc64el s390x
+Section: kernel
+Provides: linux-tools
+Depends:
+ ${misc:Depends},
+ linux-tools-PKGVER-ABINUM-generic (= ${source:Version})
+Description: Generic Linux kernel tools
+ This package will always depend on the latest generic kernel tools
+ available.
+
+Package: SRCPKGNAME-cloud-tools-generic
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Provides: linux-cloud-tools
+Depends:
+ ${misc:Depends},
+ linux-cloud-tools-PKGVER-ABINUM-generic (= ${source:Version})
+Description: Generic Linux kernel cloud tools
+ This package will always depend on the latest generic kernel cloud tools
+ available.
+
+Package: SRCPKGNAME-generic
+Build-Profiles: <!stage1>
+Architecture: amd64 armhf arm64 powerpc ppc64el s390x
+Section: kernel
+Depends:
+ ${misc:Depends},
+ SRCPKGNAME-image-generic (= ${binary:Version}),
+ SRCPKGNAME-headers-generic (= ${binary:Version})
+Description: Complete Generic Linux kernel and headers
+ This package will always depend on the latest complete generic Linux kernel
+ and headers.
+
+# } linux-meta
+
+# linux-system76 {
+
+Package: SRCPKGNAME-system76
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Depends:
+ ${misc:Depends},
+ SRCPKGNAME-generic (= ${binary:Version})
+Description: System76 recommended Linux kernel
+ This package depends upon the recommended kernel for System76 users.
+
+# } linux-system76
diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk
@@ -8,7 +8,7 @@ kernel_file	= arch/$(build_arch)/boot/bzImage
 install_file	= vmlinuz
 vdso		= vdso_install
 no_dumpfile	= true
-uefi_signed     = true
+uefi_signed     = false
 do_tools_usbip  = true
 do_tools_cpupower = true
 do_tools_perf   = true

diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk
diff --git a/debian/rules b/debian/rules
@@ -88,7 +88,6 @@ endif
 # Being used to build a mainline build -- turn off things which do not work.
 ifeq ($(do_mainline_build),true)
 	do_extras_package=false
-	do_tools=false
 	no_dumpfile=1
 $(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false))
 	skipabi=true

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
@@ -819,10 +819,46 @@ ifeq ($(do_cloud_tools),true)
 	$(call dh_all,$(cloudpkg))
 endif
 
+meta_version=$(release).$(revision)
+define dh_all_meta
+	dh_installchangelogs -p$(1)
+	dh_installdocs -p$(1)
+	dh_compress -p$(1)
+	dh_fixperms -p$(1) -X/boot/
+	dh_shlibdeps -p$(1) $(shlibdeps_opts)
+	dh_installdeb -p$(1)
+	dh_installdebconf -p$(1)
+	$(lockme) dh_gencontrol -p$(1) -- -Vlinux:rprovides='$(rprovides)' -v$(meta_version)
+	dh_md5sums -p$(1)
+	dh_builddeb -p$(1)
+endef
+
+binary-meta:
+	@echo Debug: $@
+
+ifeq ($(do_flavour_image_package),true)
+	$(call dh_all_meta,$(src_pkg_name)-headers-generic)
+endif # do_flavour_image_package
+ifeq ($(do_flavour_header_package),true)
+	$(call dh_all_meta,$(src_pkg_name)-image-generic)
+endif # do_flavour_header_package
+ifeq ($(do_linux_tools),true)
+	$(call dh_all_meta,$(src_pkg_name)-tools-generic)
+endif # do_linux_tools
+ifeq ($(do_cloud_tools),true)
+	$(call dh_all_meta,$(src_pkg_name)-cloud-tools-generic)
+endif # do_cloud_tools
+ifeq ($(do_flavour_image_package),true)
+ifeq ($(do_flavour_header_package),true)
+	$(call dh_all_meta,$(src_pkg_name)-generic)
+	$(call dh_all_meta,$(src_pkg_name)-system76)
+endif # do_flavour_header_package
+endif # do_flavour_image_package
+
 binary-debs: signing = $(CURDIR)/debian/$(bin_pkg_name)-signing
 binary-debs: signingv = $(CURDIR)/debian/$(bin_pkg_name)-signing/$(release)-$(revision)
 binary-debs: signing_tar = $(src_pkg_name)_$(release)-$(revision)_$(arch).tar.gz
-binary-debs: binary-perarch $(addprefix binary-,$(flavours))
+binary-debs: binary-perarch binary-meta $(addprefix binary-,$(flavours))
 	@echo Debug: $@
 ifeq ($(any_signed),true)
 	install -d $(signingv)/control

diff --git a/debian/source/format b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (native)
diff --git a/rebuild.sh b/rebuild.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -ex
+
+if ! diff -u debian/changelog debian.master/changelog
+then
+    fakeroot debian/rules clean
+fi
+
+dh_clean
+
+rm -rf debian/build/build-generic/_____________________________________dkms/
+
+time debuild --no-lintian -b -nc -uc -us
diff --git a/reinstall.sh b/reinstall.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+
+version="$(dpkg-parsechangelog -S Version | sed 's/-76/*76/g')"
+sudo dpkg -i \
+    ../linux-generic_${version}_amd64.deb \
+    ../linux-headers-*_${version}_*.deb \
+    ../linux-image-*_${version}_amd64.deb \
+    ../linux-libc-dev_${version}_amd64.deb \
+    ../linux-modules-*_${version}_amd64.deb \
+    ../linux-system76_${version}_amd64.deb \
+    ../linux-tools-*_${version}_amd64.deb \
+    ../linux-tools-common_${version}_all.deb
diff --git a/system76.sh b/system76.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [ -n "$(git status --porcelain)" ]
+then
+    echo "ERROR: uncommitted changes"
+    exit 1
+fi
+
+package="$(dpkg-parsechangelog --file "debian.master/changelog" --show-field Source)"
+version="$(dpkg-parsechangelog --file "debian.master/changelog" --show-field Version)"
+
+linux_version="$(echo "${version}" | cut -d "-" -f1)"
+debian_version="$(echo "${version}" | cut -d "-" -f2-)"
+
+if [[ "${debian_version}" == "76"* ]]
+then
+    echo "${package} ${version} already updated for system76"
+else
+    new_version="${linux_version}-76${debian_version}"
+    sed -i "s/${package} (${version})/${package} (${new_version})/" "debian.master/changelog"
+    dch --changelog "debian.master/changelog" --release 'Release for System76'
+fi
+
+fakeroot debian/rules clean
+
+git add .
+git commit -s -m "DROP ON REBASE: ${new_version} based on ${version}"