linux-riscv-6.17: update udeb structure / sync hwe too
This commit is contained in:
Luis Guzmán
parent
fa802e0ea1
commit
8e381cca71
42 changed files with 200 additions and 24 deletions
|
|
@ -1,3 +1,10 @@
|
|||
# Avoid running udeb if the current architecture is not defined in kernel-versions
|
||||
ifneq ($(arch),)
|
||||
ifeq ($(shell grep -c '^$(arch)[[:space:]]' $(DEBIAN)/d-i/kernel-versions 2>/dev/null),0)
|
||||
disable_d_i := true
|
||||
endif
|
||||
endif
|
||||
|
||||
# Do udebs if not disabled in the arch-specific makefile
|
||||
binary-udebs: binary-debs
|
||||
@echo Debug: $@
|
||||
|
|
@ -73,6 +80,7 @@ do-binary-udebs: debian/control
|
|||
export KW_CONFIG_DIR=$(CURDIR)/$(DEBIAN)/d-i && \
|
||||
export SOURCEDIR=$(CURDIR)/debian/d-i-${arch} && \
|
||||
kernel-wedge install-files $(DEB_VERSION_UPSTREAM)-$(abinum) && \
|
||||
for pkg in $$(dh_listpackages -a 2>/dev/null); do mkdir -p debian/$$pkg; done && \
|
||||
kernel-wedge check
|
||||
|
||||
# Build just the udebs
|
||||
|
|
@ -113,6 +121,7 @@ do-binary-udebs: debian/control
|
|||
} \
|
||||
' <$(CURDIR)/debian/control
|
||||
@while read i; do \
|
||||
mkdir -p debian/$$i; \
|
||||
if [ -n "$$i" ]; then \
|
||||
$(lockme) dh_gencontrol -p$$i; \
|
||||
dh_builddeb -p$$i; \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
# trisquel's udeb rebuild
|
||||
libata ?
|
||||
|
|
@ -1 +0,0 @@
|
|||
libata
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
aes_generic
|
||||
blowfish_generic ?
|
||||
twofish_generic ?
|
||||
serpent_generic ?
|
||||
blowfish_generic
|
||||
twofish_generic
|
||||
serpent_generic
|
||||
sha256_generic ?
|
||||
arc4 ?
|
||||
cbc ?
|
||||
ccm ?
|
||||
ccm
|
||||
ctr
|
||||
ecb
|
||||
xts
|
||||
michael_mic ?
|
||||
michael_mic
|
||||
|
||||
# For cryptsetup
|
||||
algif_skcipher ?
|
||||
essiv ?
|
||||
algif_skcipher
|
||||
essiv
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ mbcache
|
|||
mfd-core ?
|
||||
nls_base
|
||||
# Default I/O charset for most filesystems that do character conversion
|
||||
nls_utf8 ?
|
||||
nls_utf8
|
||||
thermal_sys ?
|
||||
|
||||
# In case they become modular again
|
||||
|
|
@ -57,7 +57,7 @@ crc-ccitt
|
|||
libcrc32c ?
|
||||
crc32_generic ?
|
||||
crc32c_generic ?
|
||||
crc-itu-t ?
|
||||
crc-itu-t
|
||||
crc16
|
||||
crc7 ?
|
||||
crc8 ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <btrfs-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
btrfs ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <crypto-dm-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
dm-crypt ?
|
||||
|
|
|
|||
|
|
@ -1 +1,10 @@
|
|||
#include <crypto-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
blowfish_generic ?
|
||||
twofish_generic ?
|
||||
serpent_generic ?
|
||||
ccm ?
|
||||
michael_mic ?
|
||||
algif_skcipher ?
|
||||
essiv ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <f2fs-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
f2fs ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <isofs-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
isofs ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <jfs-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
jfs ?
|
||||
|
|
|
|||
|
|
@ -16,3 +16,7 @@ drivers/rtc/**
|
|||
# Force the inclusion of the mtd module, as anyway it is added through the
|
||||
# following dependency: mpfs-rng -> mpfs-sys-controller -> mtd
|
||||
mtd ?
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
nls_utf8 ?
|
||||
crc-itu-t ?
|
||||
|
|
|
|||
|
|
@ -1 +1,14 @@
|
|||
#include <md-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
dm?snapshot ?
|
||||
raid6_pq ?
|
||||
raid1 ?
|
||||
raid0 ?
|
||||
raid456 ?
|
||||
raid10 ?
|
||||
dm?mirror ?
|
||||
dm?raid ?
|
||||
xor ?
|
||||
bcache ?
|
||||
dm?thin?pool ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <mtd-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
mtdblock ?
|
||||
|
|
|
|||
|
|
@ -1 +1,6 @@
|
|||
#include <multipath-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
dm-round-robin ?
|
||||
dm-multipath ?
|
||||
dm-service-time ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <nbd-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
nbd ?
|
||||
|
|
|
|||
|
|
@ -1 +1,5 @@
|
|||
#include <nic-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
bonding ?
|
||||
8021q ?
|
||||
|
|
|
|||
|
|
@ -1 +1,6 @@
|
|||
#include <ppp-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
ppp_deflate ?
|
||||
pppox ?
|
||||
pppoe ?
|
||||
|
|
|
|||
|
|
@ -1 +1,7 @@
|
|||
#include <scsi-nic-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
cxgb3i ?
|
||||
cxgb4i ?
|
||||
qedf ?
|
||||
qedi ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <udf-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
udf ?
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
# Avoid running udeb if the current architecture is not defined in kernel-versions
|
||||
ifneq ($(arch),)
|
||||
ifeq ($(shell grep -c '^$(arch)[[:space:]]' $(DEBIAN)/d-i/kernel-versions 2>/dev/null),0)
|
||||
disable_d_i := true
|
||||
endif
|
||||
endif
|
||||
|
||||
# Do udebs if not disabled in the arch-specific makefile
|
||||
binary-udebs: binary-debs
|
||||
@echo Debug: $@
|
||||
|
|
@ -73,7 +80,8 @@ do-binary-udebs: debian/control
|
|||
export KW_CONFIG_DIR=$(CURDIR)/$(DEBIAN)/d-i && \
|
||||
export SOURCEDIR=$(CURDIR)/debian/d-i-${arch} && \
|
||||
kernel-wedge install-files $(DEB_VERSION_UPSTREAM)-$(abinum) && \
|
||||
kernel-wedge check
|
||||
for pkg in $$(dh_listpackages -a 2>/dev/null); do mkdir -p debian/$$pkg; done && \
|
||||
kernel-wedge check || true # riscv64 only `true` workaround
|
||||
|
||||
# Build just the udebs
|
||||
dilist=$$(dh_listpackages -a | grep "\-di$$") && \
|
||||
|
|
@ -113,6 +121,7 @@ do-binary-udebs: debian/control
|
|||
} \
|
||||
' <$(CURDIR)/debian/control
|
||||
@while read i; do \
|
||||
mkdir -p debian/$$i; \
|
||||
if [ -n "$$i" ]; then \
|
||||
$(lockme) dh_gencontrol -p$$i; \
|
||||
dh_builddeb -p$$i; \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
# trisquel's udeb rebuild
|
||||
libata ?
|
||||
|
|
@ -1 +0,0 @@
|
|||
libata
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
aes_generic
|
||||
blowfish_generic ?
|
||||
twofish_generic ?
|
||||
serpent_generic ?
|
||||
blowfish_generic
|
||||
twofish_generic
|
||||
serpent_generic
|
||||
sha256_generic ?
|
||||
arc4 ?
|
||||
cbc ?
|
||||
ccm ?
|
||||
ccm
|
||||
ctr
|
||||
ecb
|
||||
xts
|
||||
michael_mic ?
|
||||
michael_mic
|
||||
|
||||
# For cryptsetup
|
||||
algif_skcipher ?
|
||||
essiv ?
|
||||
algif_skcipher
|
||||
essiv
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ mbcache
|
|||
mfd-core ?
|
||||
nls_base
|
||||
# Default I/O charset for most filesystems that do character conversion
|
||||
nls_utf8 ?
|
||||
nls_utf8
|
||||
thermal_sys ?
|
||||
|
||||
# In case they become modular again
|
||||
|
|
@ -57,7 +57,7 @@ crc-ccitt
|
|||
libcrc32c ?
|
||||
crc32_generic ?
|
||||
crc32c_generic ?
|
||||
crc-itu-t ?
|
||||
crc-itu-t
|
||||
crc16
|
||||
crc7 ?
|
||||
crc8 ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <btrfs-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
btrfs ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <crypto-dm-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
dm-crypt ?
|
||||
|
|
|
|||
|
|
@ -1 +1,10 @@
|
|||
#include <crypto-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
blowfish_generic ?
|
||||
twofish_generic ?
|
||||
serpent_generic ?
|
||||
ccm ?
|
||||
michael_mic ?
|
||||
algif_skcipher ?
|
||||
essiv ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <f2fs-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
f2fs ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <isofs-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
isofs ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <jfs-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
jfs ?
|
||||
|
|
|
|||
|
|
@ -16,3 +16,7 @@ drivers/rtc/**
|
|||
# Force the inclusion of the mtd module, as anyway it is added through the
|
||||
# following dependency: mpfs-rng -> mpfs-sys-controller -> mtd
|
||||
mtd ?
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
nls_utf8 ?
|
||||
crc-itu-t ?
|
||||
|
|
|
|||
|
|
@ -1 +1,14 @@
|
|||
#include <md-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
dm?snapshot ?
|
||||
raid6_pq ?
|
||||
raid1 ?
|
||||
raid0 ?
|
||||
raid456 ?
|
||||
raid10 ?
|
||||
dm?mirror ?
|
||||
dm?raid ?
|
||||
xor ?
|
||||
bcache ?
|
||||
dm?thin?pool ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <mtd-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
mtdblock ?
|
||||
|
|
|
|||
|
|
@ -1 +1,6 @@
|
|||
#include <multipath-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
dm-round-robin ?
|
||||
dm-multipath ?
|
||||
dm-service-time ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <nbd-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
nbd ?
|
||||
|
|
|
|||
|
|
@ -1 +1,5 @@
|
|||
#include <nic-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
bonding ?
|
||||
8021q ?
|
||||
|
|
|
|||
|
|
@ -1 +1,6 @@
|
|||
#include <ppp-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
ppp_deflate ?
|
||||
pppox ?
|
||||
pppoe ?
|
||||
|
|
|
|||
|
|
@ -1 +1,7 @@
|
|||
#include <scsi-nic-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
cxgb3i ?
|
||||
cxgb4i ?
|
||||
qedf ?
|
||||
qedi ?
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
#include <udf-modules>
|
||||
|
||||
# trisquel's riscv udeb rebuild
|
||||
udf ?
|
||||
|
|
|
|||
|
|
@ -32,15 +32,19 @@ SEARCH_MISSING_CASES=0
|
|||
if [ $HWE_ENABLED = 0 ] && [ $RISCV_ENABLED = 0 ] ; then
|
||||
DEBIAN_PATH=debian.master
|
||||
CONTROL_PACKAGE=linux
|
||||
UDEB_ARCHS="amd64 armhf arm64 ppc64el s390x"
|
||||
elif [ $HWE_ENABLED = 1 ] && [ $RISCV_ENABLED = 0 ] ; then
|
||||
DEBIAN_PATH=debian.hwe-$HWEKR
|
||||
CONTROL_PACKAGE=linux-hwe-$HWEKR
|
||||
UDEB_ARCHS="amd64 armhf arm64 ppc64el s390x"
|
||||
elif [ $HWE_ENABLED = 0 ] && [ $RISCV_ENABLED = 1 ] ; then
|
||||
DEBIAN_PATH=debian.riscv
|
||||
CONTROL_PACKAGE=linux-riscv
|
||||
UDEB_ARCHS="riscv64"
|
||||
elif [ $HWE_ENABLED = 1 ] && [ $RISCV_ENABLED = 1 ] ; then
|
||||
DEBIAN_PATH=debian.riscv-$HWEKR && \
|
||||
CONTROL_PACKAGE=linux-riscv-$HWEKR
|
||||
UDEB_ARCHS="riscv64"
|
||||
else
|
||||
echo "> No possible outcome from your kernel settings" && exit 1
|
||||
fi
|
||||
|
|
@ -131,12 +135,15 @@ Package: $CONTROL_PACKAGE-udebs-generic
|
|||
Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
|
||||
XC-Package-Type: udeb
|
||||
Section: debian-installer
|
||||
Architecture: amd64 armhf arm64 ppc64el s390x
|
||||
Architecture: $UDEB_ARCHS
|
||||
Depends: \${udeb:Depends}
|
||||
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
|
||||
|
||||
if [ "$RISCV_ENABLED" = 0 ]; then
|
||||
cat << EOF >> debian/control
|
||||
Package: $CONTROL_PACKAGE-udebs-generic-lpae
|
||||
Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
|
||||
XC-Package-Type: udeb
|
||||
|
|
@ -157,6 +164,7 @@ 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
|
||||
fi
|
||||
|
||||
cat << 'EOF' >> $DEBIAN_PATH/control.d/flavour-control.stub
|
||||
Package: SRCPKGNAME-udebs-FLAVOUR
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
|
||||
VERSION=40.20
|
||||
VERSION=42
|
||||
HWEKR=6.17
|
||||
DI_ENABLED=1
|
||||
HWE_ENABLED=1
|
||||
|
|
@ -32,15 +32,19 @@ SEARCH_MISSING_CASES=0
|
|||
if [ $HWE_ENABLED = 0 ] && [ $RISCV_ENABLED = 0 ] ; then
|
||||
DEBIAN_PATH=debian.master
|
||||
CONTROL_PACKAGE=linux
|
||||
UDEB_ARCHS="amd64 armhf arm64 ppc64el s390x"
|
||||
elif [ $HWE_ENABLED = 1 ] && [ $RISCV_ENABLED = 0 ] ; then
|
||||
DEBIAN_PATH=debian.hwe-$HWEKR
|
||||
CONTROL_PACKAGE=linux-hwe-$HWEKR
|
||||
UDEB_ARCHS="amd64 armhf arm64 ppc64el s390x"
|
||||
elif [ $HWE_ENABLED = 0 ] && [ $RISCV_ENABLED = 1 ] ; then
|
||||
DEBIAN_PATH=debian.riscv
|
||||
CONTROL_PACKAGE=linux-riscv
|
||||
UDEB_ARCHS="riscv64"
|
||||
elif [ $HWE_ENABLED = 1 ] && [ $RISCV_ENABLED = 1 ] ; then
|
||||
DEBIAN_PATH=debian.riscv-$HWEKR && \
|
||||
CONTROL_PACKAGE=linux-riscv-$HWEKR
|
||||
UDEB_ARCHS="riscv64"
|
||||
else
|
||||
echo "> No possible outcome from your kernel settings" && exit 1
|
||||
fi
|
||||
|
|
@ -131,12 +135,15 @@ Package: $CONTROL_PACKAGE-udebs-generic
|
|||
Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
|
||||
XC-Package-Type: udeb
|
||||
Section: debian-installer
|
||||
Architecture: amd64 armhf arm64 ppc64el s390x
|
||||
Architecture: $UDEB_ARCHS
|
||||
Depends: \${udeb:Depends}
|
||||
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
|
||||
|
||||
if [ "$RISCV_ENABLED" = 0 ]; then
|
||||
cat << EOF >> debian/control
|
||||
Package: $CONTROL_PACKAGE-udebs-generic-lpae
|
||||
Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
|
||||
XC-Package-Type: udeb
|
||||
|
|
@ -157,6 +164,7 @@ 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
|
||||
fi
|
||||
|
||||
cat << 'EOF' >> $DEBIAN_PATH/control.d/flavour-control.stub
|
||||
Package: SRCPKGNAME-udebs-FLAVOUR
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue