mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-23 11:21:12 +00:00
fix: Remove .patch files and livecd-rootfs symlink committed in error as part of merge commit.
Apologies. Trying to do too many things at once This reverts changes added in error in commit 639f04b7
This commit is contained in:
parent
bfb829c64d
commit
d72ae0de70
@ -1,40 +0,0 @@
|
||||
diff --git a/live-build/auto/config b/live-build/auto/config
|
||||
index 20d28139..8f188b5d 100755
|
||||
--- a/live-build/auto/config
|
||||
+++ b/live-build/auto/config
|
||||
@@ -1048,12 +1048,13 @@ case $PROJECT in
|
||||
add_task install ubuntu-server-raspi
|
||||
;;
|
||||
armhf*)
|
||||
- add_package install flash-kernel
|
||||
+ if [ "${SUBPROJECT:-}" != minimized ]; then
|
||||
+ add_package install flash-kernel
|
||||
+ fi
|
||||
;;
|
||||
arm64*)
|
||||
- add_package install flash-kernel
|
||||
- if [ "${SUBARCH:-}" = "generic" ]; then
|
||||
- KERNEL_FLAVOURS=generic
|
||||
+ if [ "${SUBPROJECT:-}" != minimized ]; then
|
||||
+ add_package install flash-kernel
|
||||
fi
|
||||
;;
|
||||
amd64*)
|
||||
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
|
||||
index 3685e464..4602267c 100755
|
||||
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
|
||||
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
|
||||
@@ -112,11 +112,11 @@ install_grub() {
|
||||
# please file a bug against grub2 to include the affected module.
|
||||
case $ARCH in
|
||||
arm64)
|
||||
- chroot mountpoint apt-get -qqy install --no-install-recommends shim-signed grub-efi-arm64-signed
|
||||
+ chroot mountpoint apt-get install -qqy shim-signed
|
||||
efi_target=arm64-efi
|
||||
;;
|
||||
armhf)
|
||||
- chroot mountpoint apt-get -qqy install --no-install-recommends grub-efi-arm grub-efi-arm-bin
|
||||
+ chroot mountpoint apt-get -qqy install grub-efi-arm grub-efi-arm-bin
|
||||
efi_target=arm-efi
|
||||
;;
|
||||
amd64)
|
@ -1,63 +0,0 @@
|
||||
diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary
|
||||
index 44a7ff42..a90f19c7 100755
|
||||
--- a/live-build/buildd/hooks/02-disk-image-uefi.binary
|
||||
+++ b/live-build/buildd/hooks/02-disk-image-uefi.binary
|
||||
@@ -53,6 +53,26 @@ LABEL=UEFI /boot/efi vfat defaults 0 1
|
||||
EOF
|
||||
}
|
||||
|
||||
+
|
||||
+divert_lsb_release() {
|
||||
+ CHROOT_ROOT="$1"
|
||||
+ chroot "$CHROOT_ROOT" dpkg-divert --local \
|
||||
+ --divert /usr/bin/lsb_release.dpkg-divert \
|
||||
+ --rename /usr/bin/lsb_release
|
||||
+ echo "echo Ubuntu" > "$CHROOT_ROOT"/usr/bin/lsb_release
|
||||
+ chmod +x "$CHROOT_ROOT"/usr/bin/lsb_release
|
||||
+
|
||||
+}
|
||||
+
|
||||
+undivert_lsb_release() {
|
||||
+ CHROOT_ROOT="$1"
|
||||
+ if grep -q "^echo Ubuntu$" "$CHROOT_ROOT"/usr/bin/lsb_release; then
|
||||
+ rm "$CHROOT_ROOT"/usr/bin/lsb_release
|
||||
+ fi
|
||||
+ chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
|
||||
+ --rename /usr/bin/lsb_release
|
||||
+}
|
||||
+
|
||||
install_grub() {
|
||||
mkdir mountpoint
|
||||
mount_partition "${rootfs_dev_mapper}" mountpoint
|
||||
@@ -69,7 +89,8 @@ install_grub() {
|
||||
fi
|
||||
|
||||
chroot mountpoint apt-get -y update
|
||||
-
|
||||
+ divert_lsb_release mountpoint
|
||||
+ chroot mountpoint lsb_release
|
||||
# UEFI GRUB modules are meant to be used equally by Secure Boot and
|
||||
# non-Secure Boot systems. If you need an extra module not already
|
||||
# provided or run into "Secure Boot policy forbids loading X" problems,
|
||||
@@ -84,7 +105,7 @@ install_grub() {
|
||||
efi_target=arm-efi
|
||||
;;
|
||||
amd64)
|
||||
- chroot mountpoint apt-get install -qqy grub-pc shim-signed
|
||||
+ chroot mountpoint apt-get install -qqy grub-pc shim-signed python3-apt
|
||||
efi_target=x86_64-efi
|
||||
;;
|
||||
esac
|
||||
@@ -121,10 +142,12 @@ GRUB_RECORDFAIL_TIMEOUT=0
|
||||
GRUB_TERMINAL=console
|
||||
EOF
|
||||
|
||||
+
|
||||
divert_grub mountpoint
|
||||
chroot mountpoint update-grub
|
||||
replace_grub_root_with_label mountpoint
|
||||
undivert_grub mountpoint
|
||||
+ undivert_lsb_release mountpoint
|
||||
|
||||
chroot mountpoint apt-get -y clean
|
||||
|
@ -1 +0,0 @@
|
||||
/home/philroche/Working/livecd-rootfs
|
Loading…
x
Reference in New Issue
Block a user