CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

linux: merge linux/linux-hwe helpers for both.

Browse source
This commit is contained in:
Luis Guzmán 2024-04-09 08:18:23 +00:00
parent 63ffabcd4a
commit dcc7af2408
328 changed files with 180 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

67
helpers/DATA/linux/d-i.patch
View file

@ -1,67 +0,0 @@
--- a/debian/rules 2023-02-10 11:40:38.000000000 -0600
+++ b/debian/rules 2023-02-10 11:53:56.313708852 -0600
@@ -128,12 +128,19 @@
dh_testroot
dh_clean
+ # d-i stuff
+ rm -rf $(DEBIAN)/d-i-$(arch)
+ # Generated on the fly.
+ rm -f $(DEBIAN)/d-i/firmware/$(arch)/kernel-image
+
# normal build junk
rm -rf $(DEBIAN)/abi/$(release)-$(revision)
rm -rf $(builddir)
rm -f $(stampdir)/stamp-*
rm -rf $(DEBIAN)/linux-*
+ # This gets rid of the d-i packages in control
+ cp -f $(DEBIAN)/control.stub $(DROOT)/control
cp $(DEBIAN)/changelog debian/changelog
# Install the copyright information.
@@ -184,7 +191,6 @@
$(DROOT)/scripts/control-create \
$(control_files) \
debian/canonical-revoked-certs.pem \
- $(DROOT)/control.d/flavour-module.stub \
$(DEBIAN)/changelog \
$(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars)
for i in $(control_files); do \
@@ -210,7 +216,13 @@
.PHONY: debian/control
debian/control: $(DEBIAN)/control.stub
+ echo "# placebo control.stub for kernel-wedge flow change" >debian/control.stub
cp $(DEBIAN)/control.stub debian/control
+ export KW_DEFCONFIG_DIR=$(DEBIAN)/d-i && \
+ export KW_CONFIG_DIR=$(DEBIAN)/d-i && \
+ LANG=C kernel-wedge gen-control $(release)-$(abinum) | \
+ perl -f $(DROOT)/scripts/misc/kernel-wedge-arch.pl $(arch) \
+ >>$(CURDIR)/debian/control
debian/canonical-certs.pem: $(wildcard $(DROOT)/certs/*-all.pem) $(wildcard $(DROOT)/certs/*-$(arch).pem) $(wildcard $(DEBIAN)/certs/*-all.pem) $(wildcard $(DEBIAN)/certs/*-$(arch).pem)
for cert in $(sort $(notdir $^)); \
--- a/debian/rules.d/2-binary-arch.mk 2023-02-10 11:40:38.000000000 -0600
+++ b/debian/rules.d/2-binary-arch.mk 2023-02-10 11:57:00.107737218 -0600
@@ -178,12 +178,14 @@
$(pkgdir)/boot/config-$(abi_release)-$*
install -m600 $(builddir)/build-$*/System.map \
$(pkgdir)/boot/System.map-$(abi_release)-$*
-
-ifeq ($(do_dtbs),true)
- $(build_cd) $(kmake) $(build_O) $(conc_level) dtbs_install \
- INSTALL_DTBS_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree
-endif
-
+ if [ "$(filter true,$(do_dtbs))" ]; then \
+ $(build_cd) $(kmake) $(build_O) $(conc_level) dtbs_install \
+ INSTALL_DTBS_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree; \
+ ( cd $(pkgdir)/lib/firmware/$(abi_release)-$*/ && find device-tree -print ) | \
+ while read dtb_file; do \
+ echo "$$dtb_file ?" >> $(DEBIAN)/d-i/firmware/$(arch)/kernel-image; \
+ done; \
+ fi
ifeq ($(no_dumpfile),)
makedumpfile -g $(pkgdir)/boot/vmcoreinfo-$(abi_release)-$* \
-x $(builddir)/build-$*/vmlinux