linux-hwe-5.19: replace script with dctrl-tools

This commit is contained in:
Luis Guzmán 2023-06-29 05:34:30 +00:00
parent 85c184daa4
commit c1bdd1c40b
3 changed files with 7 additions and 34 deletions

View file

@ -40,7 +40,7 @@ index fe52711..b2d1921 100755
+ 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) \
+ grep-dctrl -FArchitecture $(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)

View file

@ -1,26 +0,0 @@
#!/usr/bin/perl
#
# kernel-wedge-arch.pl -- select only specifiers for the supplied arch.
#
use strict;
require Dpkg::Control;
require Dpkg::Deps;
my $fh = \*STDIN;
my @entries;
my $wanted = $ARGV[0];
my $entry;
while (!eof($fh)) {
$entry = Dpkg::Control->new();
$entry->parse($fh, '???');
if ($entry->{'Architecture'} eq $wanted) {
print("\n" . $entry);
}
}
close($fh);

View file

@ -112,9 +112,7 @@ Description: Metapackage depending on kernel udebs
for easier version and migration tracking.
EOF
for i in debian.master debian.hwe-$HWEKR
do
cat << EOF >> $i/control.d/flavour-control.stub
cat << EOF >> debian.hwe-$HWEKR/control.d/flavour-control.stub
Package: SRCPKGNAME-udebs-FLAVOUR
Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
XC-Package-Type: udeb
@ -125,13 +123,14 @@ Description: Metapackage depending on kernel udebs
This package depends on the all udebs that the kernel build generated,
for easier version and migration tracking.
EOF
done
sed '/include.*2-binary-arch.mk/a\\n# Rules for building the udebs ($(DEBIAN)-installer)\ninclude $(DROOT)/rules.d/5-udebs.mk' -i debian/rules
sed 's/+= binary-debs/+= binary-udebs/' -i debian/rules.d/2-binary-arch.mk
sed '/Build-Depends:/a\ kernel-wedge <!stage1>,' -i debian/control \
debian.master/control.stub.in \
for i in dctrl-tools kernel-wedge
do
sed "/Build-Depends:/a\ $i <\!stage1> <\!noudeb> <\!cross> <\!autopkgtest>," -i debian/control \
debian.hwe-$HWEKR/control.stub.in
done
# Wipe dkms-versions
# lists zfs / v4l2loopback versions