From ee346149d712796f4a55ad3cc13614479b33913f Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Thu, 21 May 2020 19:53:55 +0200 Subject: [PATCH] Remove leftover yaboot directory for buster and bullseye Both powerpc and ppc64 were switched over from Yaboot to GRUB in 4940b6 and 1e09a3 respectively, so the directory containing yaboot support files is no longer needed and can be removed. --- data/bullseye/yaboot/boot.msg | 19 --------- data/bullseye/yaboot/boot32.msg | 14 ------- data/bullseye/yaboot/mac32.conf | 35 ---------------- data/bullseye/yaboot/ofboot.b | 71 -------------------------------- data/bullseye/yaboot/yaboot.conf | 66 ----------------------------- data/buster/yaboot/boot.msg | 19 --------- data/buster/yaboot/boot32.msg | 14 ------- data/buster/yaboot/mac32.conf | 35 ---------------- data/buster/yaboot/ofboot.b | 71 -------------------------------- data/buster/yaboot/yaboot.conf | 66 ----------------------------- debian/changelog | 3 ++ 11 files changed, 3 insertions(+), 410 deletions(-) delete mode 100644 data/bullseye/yaboot/boot.msg delete mode 100644 data/bullseye/yaboot/boot32.msg delete mode 100644 data/bullseye/yaboot/mac32.conf delete mode 100644 data/bullseye/yaboot/ofboot.b delete mode 100644 data/bullseye/yaboot/yaboot.conf delete mode 100644 data/buster/yaboot/boot.msg delete mode 100644 data/buster/yaboot/boot32.msg delete mode 100644 data/buster/yaboot/mac32.conf delete mode 100644 data/buster/yaboot/ofboot.b delete mode 100644 data/buster/yaboot/yaboot.conf diff --git a/data/bullseye/yaboot/boot.msg b/data/bullseye/yaboot/boot.msg deleted file mode 100644 index 8133ab39..00000000 --- a/data/bullseye/yaboot/boot.msg +++ /dev/null @@ -1,19 +0,0 @@ -Welcome to Debian GNU/Linux ${DEBIAN_VERSION}! - -This is a Debian installation ${MEDIA_TYPE}, -built on ${BUILD_DATE}. - - -Enter one of the following options to begin: - -install 64-bit processor (G5 or POWER3/4/5/6/7) -install32 32-bit processor (G4 or earlier) - -Press TAB for a full list of options. - - -If the system fails to boot with a white screen -which doesn't go away, add 'video=ofonly'. - - - diff --git a/data/bullseye/yaboot/boot32.msg b/data/bullseye/yaboot/boot32.msg deleted file mode 100644 index 0d04e7fd..00000000 --- a/data/bullseye/yaboot/boot32.msg +++ /dev/null @@ -1,14 +0,0 @@ -Welcome to Debian GNU/Linux ${DEBIAN_VERSION}! - -This is a Debian installation ${MEDIA_TYPE}, -built on ${BUILD_DATE}. - - -Press ENTER to continue, or press TAB for a -full list of options. - - -If the system fails to boot with a white screen -which doesn't go away, try: - -install video=ofonly diff --git a/data/bullseye/yaboot/mac32.conf b/data/bullseye/yaboot/mac32.conf deleted file mode 100644 index b4db2a88..00000000 --- a/data/bullseye/yaboot/mac32.conf +++ /dev/null @@ -1,35 +0,0 @@ -## This file is for CD booting only, do not use as reference. -## Debian GNU/Linux PowerPC (CODENAME) - -default=install -message=/install/boot32.msg - -# 32-bit PowerPC subarch - -image=/install/powerpc/vmlinux - label=install - initrd=/install/powerpc/initrd.gz - append="---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=expert - initrd=/install/powerpc/initrd.gz - append="priority=low ---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=rescue - initrd=/install/powerpc/initrd.gz - append="rescue/enable=true ---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=auto - initrd=/install/powerpc/initrd.gz - append="auto=true priority=critical ---" - initrd-size=10240 - read-only diff --git a/data/bullseye/yaboot/ofboot.b b/data/bullseye/yaboot/ofboot.b deleted file mode 100644 index 7b8e6ba0..00000000 --- a/data/bullseye/yaboot/ofboot.b +++ /dev/null @@ -1,71 +0,0 @@ - - -MacRISC MacRISC3 MacRISC4 - - -GNU/Linux PPC bootloader - - -" screen" output -load-base release-load-area -" /cpus/@0" find-package if - " 64-bit" rot get-package-property 0= if - 2drop - " boot cd:,\install\yaboot conf=cd:,\install\yaboot.conf" eval - else - " boot cd:,\install\yaboot conf=cd:,\install\mac32.conf" eval - then -then - - -1010 -000000000000F8FEACF6000000000000 -0000000000F5FFFFFEFEF50000000000 -00000000002BFAFEFAFCF70000000000 -0000000000F65D5857812B0000000000 -0000000000F5350B2F88560000000000 -0000000000F6335708F8FE0000000000 -00000000005600F600F5FD8100000000 -00000000F9F8000000F5FAFFF8000000 -000000008100F5F50000F6FEFE000000 -000000F8F700F500F50000FCFFF70000 -00000088F70000F50000F5FCFF2B0000 -0000002F582A00F5000008ADE02C0000 -00090B0A35A62B0000002D3B350A0000 -000A0A0B0B3BF60000505E0B0A0B0A00 -002E350B0B2F87FAFCF45F0B2E090000 -00000007335FF82BF72B575907000000 -000000000000ACFFFF81000000000000 -000000000081FFFFFFFF810000000000 -0000000000FBFFFFFFFFAC0000000000 -000000000081DFDFDFFFFB0000000000 -000000000081DD5F83FFFD0000000000 -000000000081DDDF5EACFF0000000000 -0000000000FDF981F981FFFF00000000 -00000000FFACF9F9F981FFFFAC000000 -00000000FFF98181F9F981FFFF000000 -000000ACACF981F981F9F9FFFFAC0000 -000000FFACF9F981F9F981FFFFFB0000 -00000083DFFBF981F9F95EFFFFFC0000 -005F5F5FDDFFFBF9F9F983DDDD5F0000 -005F5F5F5FDD81F9F9E7DF5F5F5F5F00 -0083DD5F5F83FFFFFFFFDF5F835F0000 -000000FBDDDFACFBACFBDFDFFB000000 -000000000000FFFFFFFF000000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFFFF00000000 -00000000FFFFFFFFFFFFFFFFFF000000 -00000000FFFFFFFFFFFFFFFFFF000000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFF000000 - - diff --git a/data/bullseye/yaboot/yaboot.conf b/data/bullseye/yaboot/yaboot.conf deleted file mode 100644 index a4f68527..00000000 --- a/data/bullseye/yaboot/yaboot.conf +++ /dev/null @@ -1,66 +0,0 @@ -## This yaboot.conf is for CD booting only, do not use as reference. -## Debian GNU/Linux PowerPC (CODENAME) - -default=install -message=/install/boot.msg - -# 64-bit PowerPC subarch - -image=/install/powerpc64/vmlinux - label=install - initrd=/install/powerpc64/initrd.gz - append="---" - initrd-size=10240 - read-only - -image=/install/powerpc64/vmlinux - label=expert - initrd=/install/powerpc64/initrd.gz - append="priority=low ---" - initrd-size=10240 - read-only - -image=/install/powerpc64/vmlinux - label=rescue - initrd=/install/powerpc64/initrd.gz - append="rescue/enable=true ---" - initrd-size=10240 - read-only - -image=/install/powerpc64/vmlinux - label=auto - initrd=/install/powerpc64/initrd.gz - append="auto=true priority=critical ---" - initrd-size=10240 - read-only - - -# 32-bit PowerPC subarch - -image=/install/powerpc/vmlinux - label=install32 - initrd=/install/powerpc/initrd.gz - append="---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=expert32 - initrd=/install/powerpc/initrd.gz - append="priority=low ---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=rescue32 - initrd=/install/powerpc/initrd.gz - append="rescue/enable=true ---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=auto32 - initrd=/install/powerpc/initrd.gz - append="auto=true priority=critical ---" - initrd-size=10240 - read-only diff --git a/data/buster/yaboot/boot.msg b/data/buster/yaboot/boot.msg deleted file mode 100644 index 8133ab39..00000000 --- a/data/buster/yaboot/boot.msg +++ /dev/null @@ -1,19 +0,0 @@ -Welcome to Debian GNU/Linux ${DEBIAN_VERSION}! - -This is a Debian installation ${MEDIA_TYPE}, -built on ${BUILD_DATE}. - - -Enter one of the following options to begin: - -install 64-bit processor (G5 or POWER3/4/5/6/7) -install32 32-bit processor (G4 or earlier) - -Press TAB for a full list of options. - - -If the system fails to boot with a white screen -which doesn't go away, add 'video=ofonly'. - - - diff --git a/data/buster/yaboot/boot32.msg b/data/buster/yaboot/boot32.msg deleted file mode 100644 index 0d04e7fd..00000000 --- a/data/buster/yaboot/boot32.msg +++ /dev/null @@ -1,14 +0,0 @@ -Welcome to Debian GNU/Linux ${DEBIAN_VERSION}! - -This is a Debian installation ${MEDIA_TYPE}, -built on ${BUILD_DATE}. - - -Press ENTER to continue, or press TAB for a -full list of options. - - -If the system fails to boot with a white screen -which doesn't go away, try: - -install video=ofonly diff --git a/data/buster/yaboot/mac32.conf b/data/buster/yaboot/mac32.conf deleted file mode 100644 index b4db2a88..00000000 --- a/data/buster/yaboot/mac32.conf +++ /dev/null @@ -1,35 +0,0 @@ -## This file is for CD booting only, do not use as reference. -## Debian GNU/Linux PowerPC (CODENAME) - -default=install -message=/install/boot32.msg - -# 32-bit PowerPC subarch - -image=/install/powerpc/vmlinux - label=install - initrd=/install/powerpc/initrd.gz - append="---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=expert - initrd=/install/powerpc/initrd.gz - append="priority=low ---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=rescue - initrd=/install/powerpc/initrd.gz - append="rescue/enable=true ---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=auto - initrd=/install/powerpc/initrd.gz - append="auto=true priority=critical ---" - initrd-size=10240 - read-only diff --git a/data/buster/yaboot/ofboot.b b/data/buster/yaboot/ofboot.b deleted file mode 100644 index 7b8e6ba0..00000000 --- a/data/buster/yaboot/ofboot.b +++ /dev/null @@ -1,71 +0,0 @@ - - -MacRISC MacRISC3 MacRISC4 - - -GNU/Linux PPC bootloader - - -" screen" output -load-base release-load-area -" /cpus/@0" find-package if - " 64-bit" rot get-package-property 0= if - 2drop - " boot cd:,\install\yaboot conf=cd:,\install\yaboot.conf" eval - else - " boot cd:,\install\yaboot conf=cd:,\install\mac32.conf" eval - then -then - - -1010 -000000000000F8FEACF6000000000000 -0000000000F5FFFFFEFEF50000000000 -00000000002BFAFEFAFCF70000000000 -0000000000F65D5857812B0000000000 -0000000000F5350B2F88560000000000 -0000000000F6335708F8FE0000000000 -00000000005600F600F5FD8100000000 -00000000F9F8000000F5FAFFF8000000 -000000008100F5F50000F6FEFE000000 -000000F8F700F500F50000FCFFF70000 -00000088F70000F50000F5FCFF2B0000 -0000002F582A00F5000008ADE02C0000 -00090B0A35A62B0000002D3B350A0000 -000A0A0B0B3BF60000505E0B0A0B0A00 -002E350B0B2F87FAFCF45F0B2E090000 -00000007335FF82BF72B575907000000 -000000000000ACFFFF81000000000000 -000000000081FFFFFFFF810000000000 -0000000000FBFFFFFFFFAC0000000000 -000000000081DFDFDFFFFB0000000000 -000000000081DD5F83FFFD0000000000 -000000000081DDDF5EACFF0000000000 -0000000000FDF981F981FFFF00000000 -00000000FFACF9F9F981FFFFAC000000 -00000000FFF98181F9F981FFFF000000 -000000ACACF981F981F9F9FFFFAC0000 -000000FFACF9F981F9F981FFFFFB0000 -00000083DFFBF981F9F95EFFFFFC0000 -005F5F5FDDFFFBF9F9F983DDDD5F0000 -005F5F5F5FDD81F9F9E7DF5F5F5F5F00 -0083DD5F5F83FFFFFFFFDF5F835F0000 -000000FBDDDFACFBACFBDFDFFB000000 -000000000000FFFFFFFF000000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFFFF00000000 -00000000FFFFFFFFFFFFFFFFFF000000 -00000000FFFFFFFFFFFFFFFFFF000000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFF000000 - - diff --git a/data/buster/yaboot/yaboot.conf b/data/buster/yaboot/yaboot.conf deleted file mode 100644 index a4f68527..00000000 --- a/data/buster/yaboot/yaboot.conf +++ /dev/null @@ -1,66 +0,0 @@ -## This yaboot.conf is for CD booting only, do not use as reference. -## Debian GNU/Linux PowerPC (CODENAME) - -default=install -message=/install/boot.msg - -# 64-bit PowerPC subarch - -image=/install/powerpc64/vmlinux - label=install - initrd=/install/powerpc64/initrd.gz - append="---" - initrd-size=10240 - read-only - -image=/install/powerpc64/vmlinux - label=expert - initrd=/install/powerpc64/initrd.gz - append="priority=low ---" - initrd-size=10240 - read-only - -image=/install/powerpc64/vmlinux - label=rescue - initrd=/install/powerpc64/initrd.gz - append="rescue/enable=true ---" - initrd-size=10240 - read-only - -image=/install/powerpc64/vmlinux - label=auto - initrd=/install/powerpc64/initrd.gz - append="auto=true priority=critical ---" - initrd-size=10240 - read-only - - -# 32-bit PowerPC subarch - -image=/install/powerpc/vmlinux - label=install32 - initrd=/install/powerpc/initrd.gz - append="---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=expert32 - initrd=/install/powerpc/initrd.gz - append="priority=low ---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=rescue32 - initrd=/install/powerpc/initrd.gz - append="rescue/enable=true ---" - initrd-size=10240 - read-only - -image=/install/powerpc/vmlinux - label=auto32 - initrd=/install/powerpc/initrd.gz - append="auto=true priority=critical ---" - initrd-size=10240 - read-only diff --git a/debian/changelog b/debian/changelog index d3457aa7..f7cfc046 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ debian-cd (3.1.29) UNRELEASED; urgency=medium * Enable graphical installer for arm64 too, now that d-i builds should include it too. + [ John Paul Adrian Glaubitz ] + * Remove leftover yaboot directory for buster and bullseye. + -- Raphaël Hertzog Thu, 13 Feb 2020 15:07:42 +0100 debian-cd (3.1.28) unstable; urgency=medium