From f673968106dbc04f283fddea3c2d03cad9de5a29 Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Tue, 31 Oct 2023 22:05:26 +0400 Subject: [PATCH] Remove obsolete patches --- debootstrap-backport-zstd-support.patch | 18 ------------------ live-build-fix-shim-remove.patch | 16 ---------------- 2 files changed, 34 deletions(-) delete mode 100644 debootstrap-backport-zstd-support.patch delete mode 100644 live-build-fix-shim-remove.patch diff --git a/debootstrap-backport-zstd-support.patch b/debootstrap-backport-zstd-support.patch deleted file mode 100644 index 16d8765..0000000 --- a/debootstrap-backport-zstd-support.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- /usr/share/debootstrap/functions.orig 2021-10-23 23:13:10.576805331 +0000 -+++ /usr/share/debootstrap/functions 2021-10-23 23:14:05.465350379 +0000 -@@ -974,6 +974,7 @@ - case "$tarball" in - control.tar.gz) cat_cmd=zcat ;; - control.tar.xz) cat_cmd=xzcat ;; -+ control.tar.zst) cat_cmd=zstdcat ;; - control.tar) cat_cmd=cat ;; - *) error 1 UNKNOWNCONTROLCOMP "Unknown compression type for %s in %s" "$tarball" "$pkg" ;; - esac -@@ -996,6 +997,7 @@ - data.tar.gz) cat_cmd=zcat ;; - data.tar.bz2) cat_cmd=bzcat ;; - data.tar.xz) cat_cmd=xzcat ;; -+ data.tar.zst) cat_cmd=zstdcat ;; - data.tar) cat_cmd=cat ;; - *) error 1 UNKNOWNDATACOMP "Unknown compression type for %s in %s" "$tarball" "$pkg" ;; - esac diff --git a/live-build-fix-shim-remove.patch b/live-build-fix-shim-remove.patch deleted file mode 100644 index 7ec099e..0000000 --- a/live-build-fix-shim-remove.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- binary_grub-efi 2021-04-02 15:43:54.000000000 +0000 -+++ binary_grub-efi_v2 2021-10-23 22:43:57.314540341 +0000 -@@ -280,8 +280,12 @@ - # Saving cache - Save_package_cache binary - -- # Removing depends -+ # Removing depends, some bootloader packages are marked as Protected/Important -+ # in Ubuntu, so temporarily add an apt flag to allow them to be removed -+ PRE_APT_OPTIONS="${APT_OPTIONS}" -+ APT_OPTIONS="${APT_OPTIONS} --allow-remove-essential" - Remove_packages -+ APT_OPTIONS="${PRE_APT_OPTIONS}" - ;; - - false)