Accepting request 1103306 from Base:System
- add remove-awk-dependency.patch to be able to drop awk dependency from containers OBS-URL: https://build.opensuse.org/request/show/1103306 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=309
This commit is contained in:
commit
d0e4172a34
27
remove-awk-dependency.patch
Normal file
27
remove-awk-dependency.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From 224095542246e762617d38e2096fdeba13d266e3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dirk=20M=C3=BCller?= <dirk@dmllr.de>
|
||||
Date: Tue, 8 Aug 2023 13:53:38 +0200
|
||||
Subject: [PATCH] Rewrite --last to just use sed for formatting
|
||||
|
||||
This is the only dependency on awk in the runtime commandline part of
|
||||
rpm, which is bloating minimal container images a bit. We can rewrite
|
||||
that into a single sed statement. We love you anyway, awk.
|
||||
---
|
||||
rpmpopt.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/rpmpopt.in b/rpmpopt.in
|
||||
index 8022b0f54a..1223e1a862 100644
|
||||
--- ./rpmpopt.in
|
||||
+++ ./rpmpopt.in
|
||||
@@ -133,8 +133,8 @@ rpm alias --filetriggerscripts --qf '\
|
||||
rpm alias --filetriggers --filetriggerscripts \
|
||||
--POPTdesc=$"list filetrigger scriptlets from package(s)"
|
||||
|
||||
-rpm alias --last --qf '%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %{NVRA} %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n' \
|
||||
- --pipe "LC_NUMERIC=C sort -r -n | sed 's,^[0-9]\+ ,,' | awk '{printf(\"%-45s %-s\n\", $1, substr($0,length($1)+2))}' " \
|
||||
+rpm alias --last --qf '%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %-45{NVRA} %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n' \
|
||||
+ --pipe "LC_NUMERIC=C sort -r -n | sed 's,^[0-9]\+ ,,' " \
|
||||
--POPTdesc=$"list package(s) by install time, most recent first"
|
||||
|
||||
rpm alias --dupes --qf '%|SOURCERPM?{%{name}.%{arch}}:{%|ARCH?{%{name}}:{%{name}-%{version}}|}|\n' --pipe "sort | uniq -d" \
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 8 12:39:25 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- add remove-awk-dependency.patch to be able to drop awk dependency
|
||||
from containers
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 30 09:07:28 UTC 2023 - Jiri Srain <jsrain@suse.com>
|
||||
|
||||
|
6
rpm.spec
6
rpm.spec
@ -53,8 +53,6 @@ BuildRequires: pkgconfig(zlib)
|
||||
Provides: rpminst
|
||||
Requires(post): %fillup_prereq
|
||||
Requires: rpm-config-SUSE
|
||||
# awk is needed for rpm --last
|
||||
Requires: /usr/bin/awk
|
||||
Summary: The RPM Package Manager
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Packages
|
||||
@ -113,6 +111,7 @@ Patch135: selinux_transactional_update.patch
|
||||
Patch136: x86_64-microarchitectures.patch
|
||||
Patch137: cpuid_lzcnt.patch
|
||||
Patch138: libmagic-exceptions.patch
|
||||
Patch139: remove-awk-dependency.patch
|
||||
# touches a generated file
|
||||
Patch180: whatrequires-doc.diff
|
||||
Patch6464: auto-config-update-aarch64-ppc64le.diff
|
||||
@ -224,7 +223,8 @@ rm -rf sqlite
|
||||
%patch -P 100 -P 102 -P 103
|
||||
%patch -P 117
|
||||
%patch -P 122 -P 123
|
||||
%patch -P 131 -P 133 -P 134 -P 135 -P 136 -P 137 -P 138 -P 180
|
||||
%patch -P 131 -P 133 -P 134 -P 135 -P 136 -P 137 -P 138 -P 139
|
||||
%patch -P 180
|
||||
|
||||
%ifarch aarch64 ppc64le riscv64
|
||||
%patch6464
|
||||
|
Loading…
Reference in New Issue
Block a user