Accepting request 991663 from home:qzhao:branches:Base:System
Resort patch order to satisfy the SLE maintenance requirements. OBS-URL: https://build.opensuse.org/request/show/991663 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=337
This commit is contained in:
Git OBS Bridge
parent
c20cc11f6d
commit
b2feb11a91
@ -1,6 +1,6 @@
|
|||||||
diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply-splash-core/ply-keyboard.c plymouth-0.9.5~git20220412.e960111_new/src/libply-splash-core/ply-keyboard.c
|
diff -Nura plymouth-0.9.5~git20220719.9e72df3/src/libply-splash-core/ply-keyboard.c plymouth-0.9.5~git20220719.9e72df3_new/src/libply-splash-core/ply-keyboard.c
|
||||||
--- plymouth-0.9.5~git20220412.e960111/src/libply-splash-core/ply-keyboard.c 2022-04-15 16:39:24.000000000 +0800
|
--- plymouth-0.9.5~git20220719.9e72df3/src/libply-splash-core/ply-keyboard.c 2022-04-15 16:39:24.000000000 +0800
|
||||||
+++ plymouth-0.9.5~git20220412.e960111_new/src/libply-splash-core/ply-keyboard.c 2022-05-15 23:31:14.329149370 +0800
|
+++ plymouth-0.9.5~git20220719.9e72df3_new/src/libply-splash-core/ply-keyboard.c 2022-07-29 14:19:35.951346564 +0800
|
||||||
@@ -522,6 +522,8 @@
|
@@ -522,6 +522,8 @@
|
||||||
|
|
||||||
assert (keyboard != NULL);
|
assert (keyboard != NULL);
|
||||||
|
|||||||
@ -20,14 +20,14 @@ Wed Jun 29 08:52:34 UTC 2022 - Stefan Schubert <schubi@suse.com>
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun May 15 15:58:33 UTC 2022 - Cliff Zhao <qzhao@suse.com>
|
Sun May 15 15:58:33 UTC 2022 - Cliff Zhao <qzhao@suse.com>
|
||||||
|
|
||||||
- Add plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
|
- Add plymouth-crash-avoid-on-keyboard-remove-input-handler.patch:
|
||||||
Confirm keyboard handler list not NULL before release memory
|
Confirm keyboard handler list not NULL before release memory
|
||||||
to avoid crash(bsc#1193736).
|
to avoid crash(bsc#1193736).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun May 15 14:38:55 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
|
Sun May 15 14:38:55 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
|
||||||
|
|
||||||
- Add code to plymouth-watermark-config.patch in order to install
|
- Update plymouth-watermark-config.patch: in order to install
|
||||||
the Watermark image file to initrd
|
the Watermark image file to initrd
|
||||||
- Refresh patches to apply cleanly
|
- Refresh patches to apply cleanly
|
||||||
|
|
||||||
@ -391,7 +391,7 @@ Wed Aug 18 07:52:38 UTC 2021 - pandom79@gmail.com
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 14 14:19:22 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
Fri May 14 14:19:22 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
- Do not own /usr/share/locale (owned by filesystem):
|
- Update plymouth.spec: Do not own /usr/share/locale (owned by filesystem):
|
||||||
+ Split out -lang package
|
+ Split out -lang package
|
||||||
+ Use find_lang macro to create file list for -lang package
|
+ Use find_lang macro to create file list for -lang package
|
||||||
|
|
||||||
|
|||||||
@ -36,31 +36,31 @@ Patch0: plymouth-dracut-path.patch
|
|||||||
Patch1: plymouth-some-greenish-openSUSE-colors.patch
|
Patch1: plymouth-some-greenish-openSUSE-colors.patch
|
||||||
# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation
|
# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de -- Fix man page installation
|
||||||
Patch2: plymouth-manpages.patch
|
Patch2: plymouth-manpages.patch
|
||||||
# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE.
|
# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@suse.com -- Disable the fedora logo reference which is not in openSUSE.
|
||||||
Patch3: plymouth-disable-fedora-logo.patch
|
Patch3: plymouth-disable-fedora-logo.patch
|
||||||
# PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch.
|
# PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 fvogt@suse.com -- Force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch.
|
||||||
Patch4: plymouth-only_use_fb_for_cirrus_bochs.patch
|
Patch4: plymouth-only_use_fb_for_cirrus_bochs.patch
|
||||||
# PATCH-FIX-OPENSUSE plymouth-crash-avoid-on-keyboard-remove-input-handler.patch bsc#1193736 qzhao@suse.com -- Confirm keyboard handler list not NULL before release memory to avoid crash.
|
# PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao@suse.com -- Keep the plymouth-start.service KillMode=none.
|
||||||
Patch5: plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
|
Patch5: plymouth-keep-KillMode-none.patch
|
||||||
# PATCH-FIX-OPENSUSE plymouth-install-label-library-and-font-file-to-initrd.patch boo#1183425 boo#1184309 qzhao@suse.com -- Pack label plugin and font into initram to ensure notice info could successfully show when partition encrypted.
|
# PATCH-FIX-OPENSUSE plymouth-install-label-library-and-font-file-to-initrd.patch boo#1183425 boo#1184309 qzhao@suse.com -- Pack label plugin and font into initram to ensure notice info could successfully show when partition encrypted.
|
||||||
Patch6: plymouth-install-label-library-and-font-file-to-initrd.patch
|
Patch6: plymouth-install-label-library-and-font-file-to-initrd.patch
|
||||||
# PATCH-FIX-OPENSUSE plymouth-screen-twice-scale-on-160DPI-higher.patch boo#1183425 boo#1184309 qzhao@suse.com -- When DPI > 160, screen will scale output twice.
|
|
||||||
Patch7: plymouth-screen-twice-scale-on-160DPI-higher.patch
|
|
||||||
# PATCH-FIX-OPENSUSE plymouth-quiet-dracut-build-info.patch bsc#1189613 qzhao@suse.com -- Hide unuseful output when re-generate initrd.
|
# PATCH-FIX-OPENSUSE plymouth-quiet-dracut-build-info.patch bsc#1189613 qzhao@suse.com -- Hide unuseful output when re-generate initrd.
|
||||||
Patch8: plymouth-quiet-dracut-build-info.patch
|
Patch7: plymouth-quiet-dracut-build-info.patch
|
||||||
# PATCH-FIX-OPENSUSE plymouth-watermark-config.patch bsc#1189613 qzhao@suse.com -- Add two-step water mark config support.
|
# PATCH-FIX-OPENSUSE plymouth-watermark-config.patch bsc#1189613 qzhao@suse.com -- Add two-step water mark config support.
|
||||||
Patch9: plymouth-watermark-config.patch
|
Patch8: plymouth-watermark-config.patch
|
||||||
# PATCH-FIX-OPENSUSE plymouth-log-on-default.patch bsc#1193736 qzhao@suse.com -- Enable plymouth log by default, help to resolve random appear problems.
|
# PATCH-FIX-OPENSUSE plymouth-log-on-default.patch bsc#1193736 qzhao@suse.com -- Enable plymouth log by default, help to resolve random appear problems.
|
||||||
Patch10: plymouth-log-on-default.patch
|
Patch9: plymouth-log-on-default.patch
|
||||||
# PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao@suse.com -- Keep the plymouth-start.service KillMode=none.
|
# PATCH-FIX-OPENSUSE plymouth-screen-twice-scale-on-160DPI-higher.patch boo#1183425 boo#1184309 qzhao@suse.com -- When DPI > 160, screen will scale output twice.
|
||||||
Patch11: plymouth-keep-KillMode-none.patch
|
Patch10: plymouth-screen-twice-scale-on-160DPI-higher.patch
|
||||||
# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
# PATCH-FIX-OPENSUSE plymouth-crash-avoid-on-keyboard-remove-input-handler.patch bsc#1193736 qzhao@suse.com -- Confirm keyboard handler list not NULL before release memory to avoid crash.
|
||||||
|
Patch11: plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
|
||||||
|
# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- Add ability to output text in initrd needed for encryption.
|
||||||
Patch1001: 0001-Add-label-ft-plugin.patch
|
Patch1001: 0001-Add-label-ft-plugin.patch
|
||||||
# PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
# PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- Add ability to output text in initrd needed for encryption.
|
||||||
Patch1002: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
|
Patch1002: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
|
||||||
# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
|
# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- Add ability to output text in initrd needed for encryption.
|
||||||
Patch1003: 0003-fix_null_deref.patch
|
Patch1003: 0003-fix_null_deref.patch
|
||||||
# PATCH-FIX-UPSTREAM 0004-label-ft-fix-alignment.patch boo#959986 fvogt@suse.com -- fix alignment for label-ft
|
# PATCH-FIX-UPSTREAM 0004-label-ft-fix-alignment.patch boo#959986 fvogt@suse.com -- Fix alignment for label-ft
|
||||||
Patch1004: 0004-label-ft-fix-alignment.patch
|
Patch1004: 0004-label-ft-fix-alignment.patch
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: docbook-xsl-stylesheets
|
BuildRequires: docbook-xsl-stylesheets
|
||||||
@ -398,6 +398,7 @@ make %{?_smp_mflags}
|
|||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
|
|
||||||
|
# *.la are files generated during compilation, useless for final user.
|
||||||
find %{buildroot} -type f -name "*.la" -delete
|
find %{buildroot} -type f -name "*.la" -delete
|
||||||
|
|
||||||
# Glow isn't quite ready for primetime
|
# Glow isn't quite ready for primetime
|
||||||
@ -405,15 +406,14 @@ rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/
|
|||||||
|
|
||||||
# We will nolonger ship plymouthd.conf, Plymouthd will read /usr/share/plymouth/plymouthd.defaults if /etc/plymouth/plymouthd.conf doesn't exist(jsc#SLE-11637).
|
# We will nolonger ship plymouthd.conf, Plymouthd will read /usr/share/plymouth/plymouthd.defaults if /etc/plymouth/plymouthd.conf doesn't exist(jsc#SLE-11637).
|
||||||
rm -f %{buildroot}%{_sysconfdir}/plymouth/plymouthd.conf
|
rm -f %{buildroot}%{_sysconfdir}/plymouth/plymouthd.conf
|
||||||
rm -f %{buildroot}%{_datadir}/plymouth/plymouthd.conf
|
|
||||||
|
|
||||||
# Move logrotate files from user specific directory /etc/logrotate.d
|
# Move logrotate files from user specific directory /etc/logrotate.d to vendor specific directory /usr/etc/logrotate.d.
|
||||||
# to vendor specific directory /usr/etc/logrotate.d.
|
|
||||||
%if 0%{?suse_version} > 1500
|
%if 0%{?suse_version} > 1500
|
||||||
mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
|
mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
|
||||||
mv %{buildroot}%{_sysconfdir}/logrotate.d/bootlog %{buildroot}%{_distconfdir}/logrotate.d/bootlog
|
mv %{buildroot}%{_sysconfdir}/logrotate.d/bootlog %{buildroot}%{_distconfdir}/logrotate.d/bootlog
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# Split lang to seperate package.
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user