Drop merged patch files
This commit is contained in:
Brian C. Lane
parent
6d58144ab9
commit
a05a5b0c89
@ -1,42 +0,0 @@
|
|||||||
From b42349eada5674b84604592c2a32e749750fbf81 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adam Williamson <awilliam@redhat.com>
|
|
||||||
Date: Fri, 17 Feb 2023 08:55:02 -0800
|
|
||||||
Subject: [PATCH] Don't strip gtk4 binaries or libtiff (#2170716)
|
|
||||||
|
|
||||||
It turns out that, somehow, stripping the gtk4 binaries caused:
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=2170716
|
|
||||||
at least, I tested a scratch build with this change and that bug
|
|
||||||
didn't seem to happen any more. This puts the gtk4 binaries back,
|
|
||||||
and also stops stripping libtiff, because gtk4-launch depends on
|
|
||||||
it so we need to keep it in. This doesn't seem to cause too much
|
|
||||||
of a size difference; I see 723417088 bytes for the netinst with
|
|
||||||
this change, compared to 723197952 bytes for today's nightly.
|
|
||||||
|
|
||||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
|
||||||
---
|
|
||||||
share/templates.d/99-generic/runtime-cleanup.tmpl | 2 --
|
|
||||||
1 file changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl
|
|
||||||
index 6e0d8e88..6577a45c 100644
|
|
||||||
--- a/share/templates.d/99-generic/runtime-cleanup.tmpl
|
|
||||||
+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl
|
|
||||||
@@ -53,7 +53,6 @@ removepkg mtools glibc-gconv-extra
|
|
||||||
## various other things we remove to save space
|
|
||||||
removepkg diffutils file
|
|
||||||
removepkg libasyncns
|
|
||||||
-removepkg libtiff
|
|
||||||
removepkg lvm2-libs
|
|
||||||
removepkg mobile-broadband-provider-info
|
|
||||||
removepkg rmt rpcbind squashfs-tools
|
|
||||||
@@ -180,7 +179,6 @@ removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-It
|
|
||||||
removefrom grep /etc/* /usr/share/locale/*
|
|
||||||
removefrom gtk3 /usr/${libdir}/gtk-3.0/*
|
|
||||||
removefrom gtk4 /usr/${libdir}/gtk-4.0/*
|
|
||||||
-removefrom gtk4 /usr/bin/*
|
|
||||||
removefrom guile22 /usr/${libdir}/guile/2.2/ccache*
|
|
||||||
removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew}
|
|
||||||
removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids
|
|
||||||
--
|
|
||||||
2.39.1
|
|
||||||
|
|
||||||
@ -1,144 +0,0 @@
|
|||||||
From 55aabe2102263465e4ecb8274697bab22cae780c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adam Williamson <awilliam@redhat.com>
|
|
||||||
Date: Thu, 16 Feb 2023 09:53:05 -0800
|
|
||||||
Subject: [PATCH] Revert "templates.d/99-generic/live: Enable automatic
|
|
||||||
persistence for live media"
|
|
||||||
|
|
||||||
This reverts commit 7bedf613db8fbaf38747146775f00a2042f8424e.
|
|
||||||
Initial testing indicates it's busted:
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=2170544
|
|
||||||
---
|
|
||||||
.../live/config_files/aarch64/grub2-efi.cfg | 26 ++++---------------
|
|
||||||
.../live/config_files/x86/grub2-bios.cfg | 26 ++++---------------
|
|
||||||
.../live/config_files/x86/grub2-efi.cfg | 26 ++++---------------
|
|
||||||
3 files changed, 15 insertions(+), 63 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg
|
|
||||||
index d4f7bf5e..c874547f 100644
|
|
||||||
--- a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg
|
|
||||||
+++ b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg
|
|
||||||
@@ -26,32 +26,16 @@ set timeout=60
|
|
||||||
search --no-floppy --set=root -l '@ISOLABEL@'
|
|
||||||
|
|
||||||
### BEGIN /etc/grub.d/10_linux ###
|
|
||||||
-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb
|
|
||||||
+menuentry 'Start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
|
|
||||||
+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
|
||||||
initrd @INITRDPATH@
|
|
||||||
}
|
|
||||||
-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet
|
|
||||||
- initrd @INITRDPATH@
|
|
||||||
-}
|
|
||||||
-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb
|
|
||||||
+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
|
|
||||||
+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet
|
|
||||||
initrd @INITRDPATH@
|
|
||||||
}
|
|
||||||
submenu 'Troubleshooting -->' {
|
|
||||||
- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
|
||||||
- initrd @INITRDPATH@
|
|
||||||
- }
|
|
||||||
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb
|
|
||||||
- initrd @INITRDPATH@
|
|
||||||
- }
|
|
||||||
- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb
|
|
||||||
- initrd @INITRDPATH@
|
|
||||||
- }
|
|
||||||
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
+ menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os {
|
|
||||||
linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb
|
|
||||||
initrd @INITRDPATH@
|
|
||||||
}
|
|
||||||
diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg
|
|
||||||
index 486d8548..5987cf62 100644
|
|
||||||
--- a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg
|
|
||||||
+++ b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg
|
|
||||||
@@ -17,32 +17,16 @@ set timeout=60
|
|
||||||
search --no-floppy --set=root -l '@ISOLABEL@'
|
|
||||||
|
|
||||||
### BEGIN /etc/grub.d/10_linux ###
|
|
||||||
-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb
|
|
||||||
+menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
|
||||||
initrd @INITRDPATH@
|
|
||||||
}
|
|
||||||
-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet
|
|
||||||
- initrd @INITRDPATH@
|
|
||||||
-}
|
|
||||||
-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb
|
|
||||||
+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet
|
|
||||||
initrd @INITRDPATH@
|
|
||||||
}
|
|
||||||
submenu 'Troubleshooting -->' {
|
|
||||||
- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
|
||||||
- initrd @INITRDPATH@
|
|
||||||
- }
|
|
||||||
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb
|
|
||||||
- initrd @INITRDPATH@
|
|
||||||
- }
|
|
||||||
- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb
|
|
||||||
- initrd @INITRDPATH@
|
|
||||||
- }
|
|
||||||
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
+ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb
|
|
||||||
initrd @INITRDPATH@
|
|
||||||
}
|
|
||||||
diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg
|
|
||||||
index 7595571e..39069585 100644
|
|
||||||
--- a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg
|
|
||||||
+++ b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg
|
|
||||||
@@ -20,32 +20,16 @@ set timeout=60
|
|
||||||
search --no-floppy --set=root -l '@ISOLABEL@'
|
|
||||||
|
|
||||||
### BEGIN /etc/grub.d/10_linux ###
|
|
||||||
-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb
|
|
||||||
+menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
+ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
|
||||||
initrdefi @INITRDPATH@
|
|
||||||
}
|
|
||||||
-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet
|
|
||||||
- initrdefi @INITRDPATH@
|
|
||||||
-}
|
|
||||||
-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb
|
|
||||||
+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
+ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet
|
|
||||||
initrdefi @INITRDPATH@
|
|
||||||
}
|
|
||||||
submenu 'Troubleshooting -->' {
|
|
||||||
- menuentry 'Start @PRODUCT@ @VERSION@ without automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
|
||||||
- initrdefi @INITRDPATH@
|
|
||||||
- }
|
|
||||||
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb
|
|
||||||
- initrdefi @INITRDPATH@
|
|
||||||
- }
|
|
||||||
- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb
|
|
||||||
- initrdefi @INITRDPATH@
|
|
||||||
- }
|
|
||||||
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
+ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
|
|
||||||
linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb
|
|
||||||
initrdefi @INITRDPATH@
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.39.1
|
|
||||||
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
From 633af4499c1387692fbd5e5760d0a42bb5fb70a2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adam Williamson <awilliam@redhat.com>
|
|
||||||
Date: Wed, 15 Feb 2023 21:20:34 -0800
|
|
||||||
Subject: [PATCH] Strip some things from gtk4
|
|
||||||
|
|
||||||
gtk4 is now getting sucked into installer images because mutter
|
|
||||||
depends on it (since 44-beta). Strip some stuff the installer
|
|
||||||
env currently doesn't need. The /usr/bin/* removal may not be
|
|
||||||
safe long-term, but it should be OK for now.
|
|
||||||
|
|
||||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
|
||||||
---
|
|
||||||
share/templates.d/99-generic/runtime-cleanup.tmpl | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl
|
|
||||||
index 31dd44ee..6e0d8e88 100644
|
|
||||||
--- a/share/templates.d/99-generic/runtime-cleanup.tmpl
|
|
||||||
+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl
|
|
||||||
@@ -179,6 +179,8 @@ removefrom google-noto-sans-cjk-fonts /usr/share/fonts/google-noto-sans-cjk-font
|
|
||||||
removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-Italic-VF.ttf
|
|
||||||
removefrom grep /etc/* /usr/share/locale/*
|
|
||||||
removefrom gtk3 /usr/${libdir}/gtk-3.0/*
|
|
||||||
+removefrom gtk4 /usr/${libdir}/gtk-4.0/*
|
|
||||||
+removefrom gtk4 /usr/bin/*
|
|
||||||
removefrom guile22 /usr/${libdir}/guile/2.2/ccache*
|
|
||||||
removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew}
|
|
||||||
removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids
|
|
||||||
--
|
|
||||||
2.39.1
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user