cyteen
/
sd-card-images
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Add support for Ubuntu images

This commit is contained in:
Johan Gunnarsson 2021-08-24 19:39:57 +02:00
parent 1ee438d68a
commit 9c6cf17ade
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
2nd-stage-files/pre-2nd-stage-files-arm64/etc/initramfs/post-update.d/zz-update-uimg
View File

@ -20,6 +20,8 @@ FDT="\
cat << EOF > /boot/boot.cmd
load \${devtype} \${devnum}:\${distro_bootpart} \${kernel_addr_r} /boot/vmlinuz-${ABI}
load \${devtype} \${devnum}:\${distro_bootpart} \${ramdisk_addr_r} /boot/initrd.uimg-${ABI}
setexpr kernel_comp_addr_r \${ramdisk_addr_r} + \${filesize}
setexpr kernel_comp_size 0x4000000
part uuid \${devtype} \${devnum}:\${distro_bootpart} partuuid
setenv bootargs root=PARTUUID=\${partuuid} rw rootwait
for fdtpath in ${FDT}; do

9
debians-arm.csv
View File

@ -8,3 +8,12 @@ debian,bullseye,arm64
debian,sid,armhf
debian,sid,arm64
ubuntu,focal,armhf
ubuntu,focal,arm64
ubuntu,groovy,armhf
ubuntu,groovy,arm64
ubuntu,hirsute,armhf
ubuntu,hirsute,arm64

1 OS Dist Arch
8 ubuntu focal armhf
9 ubuntu focal arm64
10 ubuntu groovy armhf
11 ubuntu groovy arm64
12 ubuntu hirsute armhf
13 ubuntu hirsute arm64
14
15
16
17
18
19

6
debians-x86.csv
View File

@ -8,3 +8,9 @@ debian,bullseye,amd64
debian,sid,i386
debian,sid,amd64
ubuntu,focal,amd64
ubuntu,groovy,amd64
ubuntu,hirsute,amd64

1 OS Dist Arch
8 ubuntu focal amd64
9 ubuntu groovy amd64
10 ubuntu hirsute amd64
11
12
13
14
15
16

23
scripts/build-debian
View File

@ -28,7 +28,12 @@ debian-amd64)
URL=http://deb.debian.org/debian
SCRIPT=/usr/share/debootstrap/scripts/sid
;;
ubuntu-armhf|ubuntu-arm64|ubuntu-amd64)
ubuntu-amd64)
KERNEL=linux-image-generic
URL=http://archive.ubuntu.com/ubuntu
SCRIPT=/usr/share/debootstrap/scripts/gutsy
;;
ubuntu-armhf|ubuntu-arm64)
KERNEL=linux-image-generic
URL=http://ports.ubuntu.com/ubuntu-ports
SCRIPT=/usr/share/debootstrap/scripts/gutsy
@ -66,14 +71,14 @@ openssh-server \
PASSWORD=$(pwgen -B -A 6 1)
# Write apt sources config
case "${OS}-${DIST}" in
debian-sid)
case "${OS}-${ARCH}-${DIST}" in
debian-*-sid)
tee debian/tmp/sources.list <<- EOF
deb http://deb.debian.org/debian ${DIST} main
deb-src http://deb.debian.org/debian ${DIST} main
EOF
;;
debian-bullseye)
debian-*-bullseye)
tee debian/tmp/sources.list <<- EOF
deb http://deb.debian.org/debian ${DIST} main
deb-src http://deb.debian.org/debian ${DIST} main
@ -89,6 +94,16 @@ deb http://deb.debian.org/debian ${DIST}-updates main
deb-src http://deb.debian.org/debian ${DIST}-updates main
deb http://security.debian.org/debian-security ${DIST}/updates main
deb-src http://security.debian.org/debian-security ${DIST}/updates main
EOF
;;
ubuntu-amd64-*)
tee debian/tmp/sources.list <<- EOF
deb http://archive.ubuntu.com/ubuntu ${DIST} main universe
deb-src http://archive.ubuntu.com/ubuntu ${DIST} main universe
deb http://archive.ubuntu.com/ubuntu ${DIST}-updates main universe
deb-src http://archive.ubuntu.com/ubuntu ${DIST}-updates main universe
deb http://archive.ubuntu.com/ubuntu ${DIST}-security main universe
deb-src http://archive.ubuntu.com/ubuntu ${DIST}-security main universe
EOF
;;
ubuntu-*)