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

linux: re-enable udeb building

Browse source
This commit is contained in:
Ruben Rodriguez 2022-10-27 11:37:29 -04:00
parent fb2e8b9b8e
commit 67b24bfa7c
267 changed files with 1891 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

79
helpers/DATA/linux/5-udebs.mk Normal file
View file

@ -0,0 +1,79 @@
# Do udebs if not disabled in the arch-specific makefile
binary-udebs: binary-debs
@echo Debug: $@
ifeq ($(disable_d_i),)
@$(MAKE) --no-print-directory -f $(DROOT)/rules DEBIAN=$(DEBIAN) \
do-binary-udebs
endif
do-binary-udebs: linux_udeb_name=$(shell if echo $(src_pkg_name)|egrep -q '(linux-lts|linux-hwe)'; then echo $(src_pkg_name); else echo linux; fi)
do-binary-udebs: debian/control
@echo Debug: $@
dh_testdir
dh_testroot
# unpack the kernels into a temporary directory
mkdir -p debian/d-i-${arch}
imagelist=$$(cat $(CURDIR)/$(DEBIAN)/d-i/kernel-versions | grep ^${arch} | gawk '{print $$3}') && \
for f in $$imagelist; do \
i=$(release)-$(abinum)-$$f; \
for f in \
../linux-image-$$i\_$(release)-$(revision)_${arch}.deb \
../linux-image-unsigned-$$i\_$(release)-$(revision)_${arch}.deb \
../linux-modules-$$i\_$(release)-$(revision)_${arch}.deb \
../linux-modules-extra-$$i\_$(release)-$(revision)_${arch}.deb; \
do \
[ -f $$f ] && dpkg -x $$f debian/d-i-${arch}; \
done; \
/sbin/depmod -b debian/d-i-${arch} $$i; \
done
# kernel-wedge will error if no modules unless this is touched
touch $(DEBIAN)/d-i/no-modules
touch $(CURDIR)/$(DEBIAN)/d-i/ignore-dups
export KW_DEFCONFIG_DIR=$(CURDIR)/$(DEBIAN)/d-i && \
export KW_CONFIG_DIR=$(CURDIR)/$(DEBIAN)/d-i && \
export SOURCEDIR=$(CURDIR)/debian/d-i-${arch} && \
kernel-wedge install-files $(release)-$(abinum) && \
kernel-wedge check
# Build just the udebs
dilist=$$(dh_listpackages -s | grep "\-di$$") && \
[ -z "$dilist" ] || \
for i in $$dilist; do \
dh_fixperms -p$$i; \
$(lockme) dh_gencontrol -p$$i; \
dh_builddeb -p$$i; \
done
# Generate the meta-udeb dependancy lists.
@gawk ' \
/^Package:/ { \
package=$$2; flavour=""; parch="" } \
(/Package-Type: udeb/ && package !~ /^$(linux_udeb_name)-udebs-/) { \
match(package, "'$(release)'-'$(abinum)'-(.*)-di", bits); \
flavour = bits[1]; \
} \
(/^Architecture:/ && $$0 " " ~ / '$(arch)'/) { \
parch=$$0; \
} \
(flavour != "" && parch != "") { \
udebs[flavour] = udebs[flavour] package ", "; \
flavour=""; parch=""; \
} \
END { \
for (flavour in udebs) { \
package="$(linux_udeb_name)-udebs-" flavour; \
file="debian/" package ".substvars"; \
print("udeb:Depends=" udebs[flavour]) > file; \
metas="'$(builddir)'/udeb-meta-packages"; \
print(package) >metas \
} \
} \
' <$(CURDIR)/debian/control
@while read i; do \
$(lockme) dh_gencontrol -p$$i; \
dh_builddeb -p$$i; \
done <$(builddir)/udeb-meta-packages

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

@ -0,0 +1,67 @@
--- a/debian/rules 2022-10-22 11:16:58.933510340 -0400
+++ b/debian/rules 2022-10-18 15:38:19.000000000 -0400
@@ -125,12 +135,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.
@@ -180,7 +197,6 @@
$(DEBIAN)/control.stub: \
$(DROOT)/scripts/control-create \
$(control_files) \
- $(DROOT)/control.d/flavour-module.stub \
$(DEBIAN)/changelog \
$(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars)
for i in $(control_files); do \
@@ -205,7 +221,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 2022-10-22 11:16:58.937510259 -0400
+++ b/debian/rules.d/2-binary-arch.mk 2022-10-18 15:38:19.000000000 -0400
@@ -178,12 +176,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

4
helpers/DATA/linux/d-i/firmware/README.txt Normal file
View file

@ -0,0 +1,4 @@
#
# Place the names of udeb modules into this directory that require
# runtime firmware.
#

4
helpers/DATA/linux/d-i/firmware/amd64/README.txt Normal file
View file

@ -0,0 +1,4 @@
#
# Place the names of udeb modules into this directory that require
# runtime firmware.
#

1
helpers/DATA/linux/d-i/firmware/amd64/nic-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-modules>

1
helpers/DATA/linux/d-i/firmware/amd64/scsi-modules Normal file
View file

@ -0,0 +1 @@
#include <scsi-modules>

4
helpers/DATA/linux/d-i/firmware/arm64/README.txt Normal file
View file

@ -0,0 +1,4 @@
#
# Place the names of udeb modules into this directory that require
# runtime firmware.
#

1
helpers/DATA/linux/d-i/firmware/arm64/nic-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-modules>

1
helpers/DATA/linux/d-i/firmware/arm64/scsi-modules Normal file
View file

@ -0,0 +1 @@
#include <scsi-modules>

4
helpers/DATA/linux/d-i/firmware/armhf/README.txt Normal file
View file

@ -0,0 +1,4 @@
#
# Place the names of udeb modules into this directory that require
# runtime firmware.
#

4
helpers/DATA/linux/d-i/firmware/i386/README.txt Normal file
View file

@ -0,0 +1,4 @@
#
# Place the names of udeb modules into this directory that require
# runtime firmware.
#

1
helpers/DATA/linux/d-i/firmware/i386/nic-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-modules>

1
helpers/DATA/linux/d-i/firmware/i386/scsi-modules Normal file
View file

@ -0,0 +1 @@
#include <scsi-modules>

1
helpers/DATA/linux/d-i/firmware/nic-modules Normal file
View file

@ -0,0 +1 @@

4
helpers/DATA/linux/d-i/firmware/powerpc/README.txt Normal file
View file

@ -0,0 +1,4 @@
#
# Place the names of udeb modules into this directory that require
# runtime firmware.
#

1
helpers/DATA/linux/d-i/firmware/powerpc/nic-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-modules>

1
helpers/DATA/linux/d-i/firmware/powerpc/scsi-modules Normal file
View file

@ -0,0 +1 @@
#include <scsi-modules>

4
helpers/DATA/linux/d-i/firmware/ppc64el/README.txt Normal file
View file

@ -0,0 +1,4 @@
#
# Place the names of udeb modules into this directory that require
# runtime firmware.
#

1
helpers/DATA/linux/d-i/firmware/ppc64el/nic-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-modules>

1
helpers/DATA/linux/d-i/firmware/ppc64el/scsi-modules Normal file
View file

@ -0,0 +1 @@
#include <scsi-modules>

4
helpers/DATA/linux/d-i/firmware/s390x/README.txt Normal file
View file

@ -0,0 +1,4 @@
#
# Place the names of udeb modules into this directory that require
# runtime firmware.
#

1
helpers/DATA/linux/d-i/firmware/s390x/nic-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-modules>

1
helpers/DATA/linux/d-i/firmware/s390x/scsi-modules Normal file
View file

@ -0,0 +1 @@
#include <scsi-modules>

1
helpers/DATA/linux/d-i/firmware/scsi-modules Normal file
View file

@ -0,0 +1 @@

16
helpers/DATA/linux/d-i/kernel-versions Normal file
View file

@ -0,0 +1,16 @@
# arch version flavour installedname suffix bdep
amd64 - generic - - -
i386 - generic - - -
armhf - generic - - -
armhf - generic-lpae - - -
arm64 - generic - - -
ppc64el - generic - - -
s390x - generic - - -
# Ports
# arch version flavour installedname suffix bdep

1
helpers/DATA/linux/d-i/modules/amd64-virtual/block-modules Normal file
View file

@ -0,0 +1 @@
#include <block-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/crypto-modules Normal file
View file

@ -0,0 +1 @@
#include <crypto-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/fat-modules Normal file
View file

@ -0,0 +1 @@
#include <fat-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/fb-modules Normal file
View file

@ -0,0 +1 @@
#include <fb-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/floppy-modules Normal file
View file

@ -0,0 +1 @@
#include <floppy-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/fs-core-modules Normal file
View file

@ -0,0 +1 @@
#include <fs-core-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/fs-secondary-modules Normal file
View file

@ -0,0 +1 @@
#include <fs-secondary-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/kernel-image Normal file
View file

@ -0,0 +1 @@
#include <kernel-image>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/md-modules Normal file
View file

@ -0,0 +1 @@
#include <md-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/message-modules Normal file
View file

@ -0,0 +1 @@
#include <message-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/mouse-modules Normal file
View file

@ -0,0 +1 @@
#include <mouse-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/multipath-modules Normal file
View file

@ -0,0 +1 @@
#include <multipath-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/nic-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/nic-shared-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-shared-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/parport-modules Normal file
View file

@ -0,0 +1 @@
#include <parport-modules>

2
helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-modules Normal file
View file

@ -0,0 +1,2 @@
#include <scsi-modules>
ipr ?

1
helpers/DATA/linux/d-i/modules/amd64-virtual/serial-modules Normal file
View file

@ -0,0 +1 @@
#include <serial-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/storage-core-modules Normal file
View file

@ -0,0 +1 @@
#include <storage-core-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/virtio-modules Normal file
View file

@ -0,0 +1 @@
#include <virtio-modules>

1
helpers/DATA/linux/d-i/modules/amd64-virtual/vlan-modules Normal file
View file

@ -0,0 +1 @@
#include <vlan-modules>

1
helpers/DATA/linux/d-i/modules/amd64/block-modules Normal file
View file

@ -0,0 +1 @@
#include <block-modules>

1
helpers/DATA/linux/d-i/modules/amd64/crypto-modules Normal file
View file

@ -0,0 +1 @@
#include <crypto-modules>

1
helpers/DATA/linux/d-i/modules/amd64/fat-modules Normal file
View file

@ -0,0 +1 @@
#include <fat-modules>

1
helpers/DATA/linux/d-i/modules/amd64/fb-modules Normal file
View file

@ -0,0 +1 @@
#include <fb-modules>

1
helpers/DATA/linux/d-i/modules/amd64/firewire-core-modules Normal file
View file

@ -0,0 +1 @@
#include <firewire-core-modules>

1
helpers/DATA/linux/d-i/modules/amd64/floppy-modules Normal file
View file

@ -0,0 +1 @@
#include <floppy-modules>

1
helpers/DATA/linux/d-i/modules/amd64/fs-core-modules Normal file
View file

@ -0,0 +1 @@
#include <fs-core-modules>

1
helpers/DATA/linux/d-i/modules/amd64/fs-secondary-modules Normal file
View file

@ -0,0 +1 @@
#include <fs-secondary-modules>

1
helpers/DATA/linux/d-i/modules/amd64/input-modules Normal file
View file

@ -0,0 +1 @@
#include <input-modules>

1
helpers/DATA/linux/d-i/modules/amd64/ipmi-modules Normal file
View file

@ -0,0 +1 @@
#include <ipmi-modules>

1
helpers/DATA/linux/d-i/modules/amd64/kernel-image Normal file
View file

@ -0,0 +1 @@
#include <kernel-image>

1
helpers/DATA/linux/d-i/modules/amd64/md-modules Normal file
View file

@ -0,0 +1 @@
#include <md-modules>

1
helpers/DATA/linux/d-i/modules/amd64/message-modules Normal file
View file

@ -0,0 +1 @@
#include <message-modules>

1
helpers/DATA/linux/d-i/modules/amd64/mouse-modules Normal file
View file

@ -0,0 +1 @@
#include <mouse-modules>

1
helpers/DATA/linux/d-i/modules/amd64/multipath-modules Normal file
View file

@ -0,0 +1 @@
#include <multipath-modules>

1
helpers/DATA/linux/d-i/modules/amd64/nfs-modules Normal file
View file

@ -0,0 +1 @@
#include <nfs-modules>

1
helpers/DATA/linux/d-i/modules/amd64/nic-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-modules>

1
helpers/DATA/linux/d-i/modules/amd64/nic-pcmcia-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-pcmcia-modules>

1
helpers/DATA/linux/d-i/modules/amd64/nic-shared-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-shared-modules>

1
helpers/DATA/linux/d-i/modules/amd64/nic-usb-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-usb-modules>

1
helpers/DATA/linux/d-i/modules/amd64/parport-modules Normal file
View file

@ -0,0 +1 @@
#include <parport-modules>

1
helpers/DATA/linux/d-i/modules/amd64/pata-modules Normal file
View file

@ -0,0 +1 @@
#include <pata-modules>

1
helpers/DATA/linux/d-i/modules/amd64/pcmcia-modules Normal file
View file

@ -0,0 +1 @@
#include <pcmcia-modules>

1
helpers/DATA/linux/d-i/modules/amd64/pcmcia-storage-modules Normal file
View file

@ -0,0 +1 @@
#include <pcmcia-storage-modules>

1
helpers/DATA/linux/d-i/modules/amd64/plip-modules Normal file
View file

@ -0,0 +1 @@
#include <plip-modules>

1
helpers/DATA/linux/d-i/modules/amd64/ppp-modules Normal file
View file

@ -0,0 +1 @@
#include <ppp-modules>

1
helpers/DATA/linux/d-i/modules/amd64/sata-modules Normal file
View file

@ -0,0 +1 @@
#include <sata-modules>

2
helpers/DATA/linux/d-i/modules/amd64/scsi-modules Normal file
View file

@ -0,0 +1,2 @@
#include <scsi-modules>
ipr ?

1
helpers/DATA/linux/d-i/modules/amd64/serial-modules Normal file
View file

@ -0,0 +1 @@
#include <serial-modules>

1
helpers/DATA/linux/d-i/modules/amd64/speakup-modules Normal file
View file

@ -0,0 +1 @@
#include <speakup-modules>

1
helpers/DATA/linux/d-i/modules/amd64/storage-core-modules Normal file
View file

@ -0,0 +1 @@
#include <storage-core-modules>

1
helpers/DATA/linux/d-i/modules/amd64/usb-modules Normal file
View file

@ -0,0 +1 @@
#include <usb-modules>

1
helpers/DATA/linux/d-i/modules/amd64/virtio-modules Normal file
View file

@ -0,0 +1 @@
#include <virtio-modules>

1
helpers/DATA/linux/d-i/modules/amd64/vlan-modules Normal file
View file

@ -0,0 +1 @@
#include <vlan-modules>

1
helpers/DATA/linux/d-i/modules/arm64/block-modules Normal file
View file

@ -0,0 +1 @@
#include <block-modules>

1
helpers/DATA/linux/d-i/modules/arm64/crypto-modules Normal file
View file

@ -0,0 +1 @@
#include <crypto-modules>

1
helpers/DATA/linux/d-i/modules/arm64/fat-modules Normal file
View file

@ -0,0 +1 @@
#include <fat-modules>

1
helpers/DATA/linux/d-i/modules/arm64/fs-core-modules Normal file
View file

@ -0,0 +1 @@
#include <fs-core-modules>

1
helpers/DATA/linux/d-i/modules/arm64/fs-secondary-modules Normal file
View file

@ -0,0 +1 @@
#include <fs-secondary-modules>

1
helpers/DATA/linux/d-i/modules/arm64/input-modules Normal file
View file

@ -0,0 +1 @@
#include <input-modules>

1
helpers/DATA/linux/d-i/modules/arm64/ipmi-modules Normal file
View file

@ -0,0 +1 @@
#include <ipmi-modules>

1
helpers/DATA/linux/d-i/modules/arm64/kernel-image Normal file
View file

@ -0,0 +1 @@
#include <kernel-image>

1
helpers/DATA/linux/d-i/modules/arm64/md-modules Normal file
View file

@ -0,0 +1 @@
#include <md-modules>

1
helpers/DATA/linux/d-i/modules/arm64/message-modules Normal file
View file

@ -0,0 +1 @@
#include <message-modules>

1
helpers/DATA/linux/d-i/modules/arm64/mouse-modules Normal file
View file

@ -0,0 +1 @@
#include <mouse-modules>

1
helpers/DATA/linux/d-i/modules/arm64/multipath-modules Normal file
View file

@ -0,0 +1 @@
#include <multipath-modules>

1
helpers/DATA/linux/d-i/modules/arm64/nfs-modules Normal file
View file

@ -0,0 +1 @@
#include <nfs-modules>

1
helpers/DATA/linux/d-i/modules/arm64/nic-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-modules>

1
helpers/DATA/linux/d-i/modules/arm64/nic-shared-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-shared-modules>

1
helpers/DATA/linux/d-i/modules/arm64/nic-usb-modules Normal file
View file

@ -0,0 +1 @@
#include <nic-usb-modules>

1
helpers/DATA/linux/d-i/modules/arm64/parport-modules Normal file
View file

@ -0,0 +1 @@
#include <parport-modules>

1
helpers/DATA/linux/d-i/modules/arm64/plip-modules Normal file
View file

@ -0,0 +1 @@
#include <plip-modules>

1
helpers/DATA/linux/d-i/modules/arm64/ppp-modules Normal file
View file

@ -0,0 +1 @@
#include <ppp-modules>

1
helpers/DATA/linux/d-i/modules/arm64/sata-modules Normal file
View file

@ -0,0 +1 @@
#include <sata-modules>

2
helpers/DATA/linux/d-i/modules/arm64/scsi-modules Normal file
View file

@ -0,0 +1,2 @@
#include <scsi-modules>
ipr ?

Some files were not shown because too many files have changed in this diff Show more