From aba5e978a3e0df44f62319ed3a920ed909b14478d8a1ec99b6a5b5e6f42aa6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Wed, 22 Dec 2021 13:58:08 +0000 Subject: [PATCH 1/5] Update OCaml requires/provides generators to ignore cmxs OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=593 --- ocaml-cmxs.diff | 46 ++++++++++++++++++++++++++++++++++++++++++++++ rpm.changes | 6 ++++++ rpm.spec | 2 ++ 3 files changed, 54 insertions(+) create mode 100644 ocaml-cmxs.diff diff --git a/ocaml-cmxs.diff b/ocaml-cmxs.diff new file mode 100644 index 0000000..eb8926d --- /dev/null +++ b/ocaml-cmxs.diff @@ -0,0 +1,46 @@ +Update OCaml requires/provides to ignore cmxs + +OCaml cmxs files are static libraries, which can be loaded at runtime +via the Dynlink module. They apparently do not provide any useful +runtime dependency information to be stored into the packages +Provides/Requires list. Therefore just skip them. + +Adjust attr, remove extension and ELF magic +Adjust ocamldeps, do nothing with cmxs files. + +Fixes: a6fe37c39b39acbcbd014dd1e6d5653ff84254a1 + +Signed-off-by: Olaf Hering + +--- ./fileattrs/ocaml.attr.orig 2021-06-21 12:00:44.587611741 +0000 ++++ ./fileattrs/ocaml.attr 2021-12-22 13:54:20.384959876 +0000 +@@ -1,5 +1,5 @@ + %__ocaml_provides %{_rpmconfigdir}/ocamldeps.sh --provides + %__ocaml_requires %{_rpmconfigdir}/ocamldeps.sh --requires +-%__ocaml_magic ^(ELF|Objective caml|OCaml) .*$ +-%__ocaml_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$ ++%__ocaml_magic ^(Objective caml|OCaml) .*$ ++%__ocaml_path .(cma|cmi|cmo|cmx|cmxa)$ + %__ocaml_flags magic_and_path +--- ./scripts/ocamldeps.sh.orig 2021-06-21 12:00:44.650612737 +0000 ++++ ./scripts/ocamldeps.sh 2021-12-22 13:54:20.384959876 +0000 +@@ -32,6 +32,10 @@ + # Implementations imported: + # HASH NAME_FROM_OTHER_MODULE + # ++# cmxs files are recoqnized, but need to be ignored. ++# They contain references of the interfaces and implementations ++# compiled into them. ++# + # The hash may contain just '-', in which case it is ignored. + # + # Output: +@@ -236,7 +240,7 @@ do + *.cmo) parse "${filename}" ;; + *.cmx) parse "${filename}" ;; + *.cmxa) parse "${filename}" ;; +- *.cmxs) parse "${filename}" ;; ++ *.cmxs) ;; + *) continue ;; + esac + done diff --git a/rpm.changes b/rpm.changes index 1b8734e..3c2d707 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 22 14:57:27 CET 2021 - olaf@aepfle.de + +- Update OCaml requires/provides generators to ignore cmxs + new patch: ocaml-cmxs.diff + ------------------------------------------------------------------- Thu Oct 14 18:16:22 CEST 2021 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 2d18fe5..8372ba5 100644 --- a/rpm.spec +++ b/rpm.spec @@ -117,6 +117,7 @@ Patch131: posttrans.diff Patch132: verbosearg.diff Patch133: zstdpool.diff Patch134: zstdthreaded.diff +Patch135: ocaml-cmxs.diff Patch200: finddebuginfo.diff Patch201: finddebuginfo-absolute-links.diff Patch202: debugsubpkg.diff @@ -245,6 +246,7 @@ rm -rf sqlite %patch -P 100 -P 102 -P 103 %patch -P 117 %patch -P 122 -P 123 -P 131 -P 132 -P 133 -P 134 +%patch -P 135 # debugedit patches pushd debugedit-5.0 From 6703aad3fab38e61de4ae0806ba205134b45e7075a08880efae4b10778e207e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Tue, 1 Feb 2022 11:12:53 +0000 Subject: [PATCH 2/5] Accepting request 949701 from home:dirkmueller:Factory - switch to glibc-locale-base to reduce system installation size by ~220MB OBS-URL: https://build.opensuse.org/request/show/949701 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=594 --- python-rpm.spec | 2 +- rpm.changes | 6 ++++++ rpm.spec | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/python-rpm.spec b/python-rpm.spec index 2f8a589..fca1f42 100644 --- a/python-rpm.spec +++ b/python-rpm.spec @@ -1,7 +1,7 @@ # # spec file for package python-rpm # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2017 Neal Gompa . # # All modifications and additions to the file contributed by third parties diff --git a/rpm.changes b/rpm.changes index 3c2d707..a4ca96a 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 28 14:19:02 UTC 2022 - Dirk Müller + +- switch to glibc-locale-base to reduce system installation size + by ~220MB + ------------------------------------------------------------------- Wed Dec 22 14:57:27 CET 2021 - olaf@aepfle.de diff --git a/rpm.spec b/rpm.spec index 8372ba5..2baf4c3 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,7 +1,7 @@ # # spec file for package rpm # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -184,7 +184,7 @@ Requires: gcc #Requires: gcc-PIE Requires: gettext-tools Requires: glibc-devel -Requires: glibc-locale +Requires: glibc-locale-base Requires: grep Requires: gzip Requires: make @@ -238,7 +238,7 @@ rm -rf sqlite %patch -P 24 -P 25 -P 26 -P 29 %patch -P 30 -P 32 -P 33 -P 34 -P 36 -P 38 %patch -P 43 -P 45 -P 46 -P 47 -%patch -P 51 +%patch -P 51 %patch -P 60 -P 61 -P 66 -P 67 -P 69 %patch -P 70 -P 71 -P 73 -P 75 -P 77 -P 78 %patch -P 85 From fd51674578afa18494af43e8bff716ec749197790efecaa045c43f85de19ebbe Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 1 Feb 2022 12:47:44 +0000 Subject: [PATCH 3/5] - invoke find-lang.sh with bash, it is a bash script (bsc#1195391) by ~220MB (bsc#1195390) OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=595 --- rpm.changes | 7 ++++++- rpm.spec | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rpm.changes b/rpm.changes index a4ca96a..ae5c0ec 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,8 +1,13 @@ +------------------------------------------------------------------- +Tue Feb 1 12:47:02 UTC 2022 - Dirk Müller + +- invoke find-lang.sh with bash, it is a bash script (bsc#1195391) + ------------------------------------------------------------------- Fri Jan 28 14:19:02 UTC 2022 - Dirk Müller - switch to glibc-locale-base to reduce system installation size - by ~220MB + by ~220MB (bsc#1195390) ------------------------------------------------------------------- Wed Dec 22 14:57:27 CET 2021 - olaf@aepfle.de diff --git a/rpm.spec b/rpm.spec index 2baf4c3..ae0890d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -378,7 +378,7 @@ install -m 755 build-aux/config.sub %{buildroot}/usr/lib/rpm rm -rf %{buildroot}/%{_libdir}/python%{py_ver} rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la -sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm +bash %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm # On arm the kernel architecture is ignored. Not the best idea, but lets stay compatible with other distros %ifarch armv7hl armv6hl # rpm is using the host_cpu as default for the platform, but armv6/7hl is not known by the kernel. From aef291d1bb603520972157145c3875a419fa6c806ec9b50090186c57a11fac1b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 1 Feb 2022 12:48:39 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=596 --- ocaml-cmxs.diff | 46 ---------------------------------------------- python-rpm.spec | 2 +- rpm.changes | 17 ----------------- rpm.spec | 10 ++++------ 4 files changed, 5 insertions(+), 70 deletions(-) delete mode 100644 ocaml-cmxs.diff diff --git a/ocaml-cmxs.diff b/ocaml-cmxs.diff deleted file mode 100644 index eb8926d..0000000 --- a/ocaml-cmxs.diff +++ /dev/null @@ -1,46 +0,0 @@ -Update OCaml requires/provides to ignore cmxs - -OCaml cmxs files are static libraries, which can be loaded at runtime -via the Dynlink module. They apparently do not provide any useful -runtime dependency information to be stored into the packages -Provides/Requires list. Therefore just skip them. - -Adjust attr, remove extension and ELF magic -Adjust ocamldeps, do nothing with cmxs files. - -Fixes: a6fe37c39b39acbcbd014dd1e6d5653ff84254a1 - -Signed-off-by: Olaf Hering - ---- ./fileattrs/ocaml.attr.orig 2021-06-21 12:00:44.587611741 +0000 -+++ ./fileattrs/ocaml.attr 2021-12-22 13:54:20.384959876 +0000 -@@ -1,5 +1,5 @@ - %__ocaml_provides %{_rpmconfigdir}/ocamldeps.sh --provides - %__ocaml_requires %{_rpmconfigdir}/ocamldeps.sh --requires --%__ocaml_magic ^(ELF|Objective caml|OCaml) .*$ --%__ocaml_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$ -+%__ocaml_magic ^(Objective caml|OCaml) .*$ -+%__ocaml_path .(cma|cmi|cmo|cmx|cmxa)$ - %__ocaml_flags magic_and_path ---- ./scripts/ocamldeps.sh.orig 2021-06-21 12:00:44.650612737 +0000 -+++ ./scripts/ocamldeps.sh 2021-12-22 13:54:20.384959876 +0000 -@@ -32,6 +32,10 @@ - # Implementations imported: - # HASH NAME_FROM_OTHER_MODULE - # -+# cmxs files are recoqnized, but need to be ignored. -+# They contain references of the interfaces and implementations -+# compiled into them. -+# - # The hash may contain just '-', in which case it is ignored. - # - # Output: -@@ -236,7 +240,7 @@ do - *.cmo) parse "${filename}" ;; - *.cmx) parse "${filename}" ;; - *.cmxa) parse "${filename}" ;; -- *.cmxs) parse "${filename}" ;; -+ *.cmxs) ;; - *) continue ;; - esac - done diff --git a/python-rpm.spec b/python-rpm.spec index fca1f42..2f8a589 100644 --- a/python-rpm.spec +++ b/python-rpm.spec @@ -1,7 +1,7 @@ # # spec file for package python-rpm # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2017 Neal Gompa . # # All modifications and additions to the file contributed by third parties diff --git a/rpm.changes b/rpm.changes index ae5c0ec..1b8734e 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,20 +1,3 @@ -------------------------------------------------------------------- -Tue Feb 1 12:47:02 UTC 2022 - Dirk Müller - -- invoke find-lang.sh with bash, it is a bash script (bsc#1195391) - -------------------------------------------------------------------- -Fri Jan 28 14:19:02 UTC 2022 - Dirk Müller - -- switch to glibc-locale-base to reduce system installation size - by ~220MB (bsc#1195390) - -------------------------------------------------------------------- -Wed Dec 22 14:57:27 CET 2021 - olaf@aepfle.de - -- Update OCaml requires/provides generators to ignore cmxs - new patch: ocaml-cmxs.diff - ------------------------------------------------------------------- Thu Oct 14 18:16:22 CEST 2021 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index ae0890d..2d18fe5 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,7 +1,7 @@ # # spec file for package rpm # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -117,7 +117,6 @@ Patch131: posttrans.diff Patch132: verbosearg.diff Patch133: zstdpool.diff Patch134: zstdthreaded.diff -Patch135: ocaml-cmxs.diff Patch200: finddebuginfo.diff Patch201: finddebuginfo-absolute-links.diff Patch202: debugsubpkg.diff @@ -184,7 +183,7 @@ Requires: gcc #Requires: gcc-PIE Requires: gettext-tools Requires: glibc-devel -Requires: glibc-locale-base +Requires: glibc-locale Requires: grep Requires: gzip Requires: make @@ -238,7 +237,7 @@ rm -rf sqlite %patch -P 24 -P 25 -P 26 -P 29 %patch -P 30 -P 32 -P 33 -P 34 -P 36 -P 38 %patch -P 43 -P 45 -P 46 -P 47 -%patch -P 51 +%patch -P 51 %patch -P 60 -P 61 -P 66 -P 67 -P 69 %patch -P 70 -P 71 -P 73 -P 75 -P 77 -P 78 %patch -P 85 @@ -246,7 +245,6 @@ rm -rf sqlite %patch -P 100 -P 102 -P 103 %patch -P 117 %patch -P 122 -P 123 -P 131 -P 132 -P 133 -P 134 -%patch -P 135 # debugedit patches pushd debugedit-5.0 @@ -378,7 +376,7 @@ install -m 755 build-aux/config.sub %{buildroot}/usr/lib/rpm rm -rf %{buildroot}/%{_libdir}/python%{py_ver} rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la -bash %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm +sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm # On arm the kernel architecture is ignored. Not the best idea, but lets stay compatible with other distros %ifarch armv7hl armv6hl # rpm is using the host_cpu as default for the platform, but armv6/7hl is not known by the kernel. From 257b5b1ec66025efe04100b37a11a8a621551cca11371802e164ee260d8ab9bc Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 1 Feb 2022 12:49:10 +0000 Subject: [PATCH 5/5] - invoke find-lang.sh with bash, it is a bash script (bsc#1195391) - switch to glibc-locale-base to reduce system installation size by ~220MB (bsc#1195390) - Update OCaml requires/provides generators to ignore cmxs new patch: ocaml-cmxs.diff OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=597 --- ocaml-cmxs.diff | 46 ++++++++++++++++++++++++++++++++++++++++++++++ python-rpm.spec | 2 +- rpm.changes | 17 +++++++++++++++++ rpm.spec | 10 ++++++---- 4 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 ocaml-cmxs.diff diff --git a/ocaml-cmxs.diff b/ocaml-cmxs.diff new file mode 100644 index 0000000..eb8926d --- /dev/null +++ b/ocaml-cmxs.diff @@ -0,0 +1,46 @@ +Update OCaml requires/provides to ignore cmxs + +OCaml cmxs files are static libraries, which can be loaded at runtime +via the Dynlink module. They apparently do not provide any useful +runtime dependency information to be stored into the packages +Provides/Requires list. Therefore just skip them. + +Adjust attr, remove extension and ELF magic +Adjust ocamldeps, do nothing with cmxs files. + +Fixes: a6fe37c39b39acbcbd014dd1e6d5653ff84254a1 + +Signed-off-by: Olaf Hering + +--- ./fileattrs/ocaml.attr.orig 2021-06-21 12:00:44.587611741 +0000 ++++ ./fileattrs/ocaml.attr 2021-12-22 13:54:20.384959876 +0000 +@@ -1,5 +1,5 @@ + %__ocaml_provides %{_rpmconfigdir}/ocamldeps.sh --provides + %__ocaml_requires %{_rpmconfigdir}/ocamldeps.sh --requires +-%__ocaml_magic ^(ELF|Objective caml|OCaml) .*$ +-%__ocaml_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$ ++%__ocaml_magic ^(Objective caml|OCaml) .*$ ++%__ocaml_path .(cma|cmi|cmo|cmx|cmxa)$ + %__ocaml_flags magic_and_path +--- ./scripts/ocamldeps.sh.orig 2021-06-21 12:00:44.650612737 +0000 ++++ ./scripts/ocamldeps.sh 2021-12-22 13:54:20.384959876 +0000 +@@ -32,6 +32,10 @@ + # Implementations imported: + # HASH NAME_FROM_OTHER_MODULE + # ++# cmxs files are recoqnized, but need to be ignored. ++# They contain references of the interfaces and implementations ++# compiled into them. ++# + # The hash may contain just '-', in which case it is ignored. + # + # Output: +@@ -236,7 +240,7 @@ do + *.cmo) parse "${filename}" ;; + *.cmx) parse "${filename}" ;; + *.cmxa) parse "${filename}" ;; +- *.cmxs) parse "${filename}" ;; ++ *.cmxs) ;; + *) continue ;; + esac + done diff --git a/python-rpm.spec b/python-rpm.spec index 2f8a589..fca1f42 100644 --- a/python-rpm.spec +++ b/python-rpm.spec @@ -1,7 +1,7 @@ # # spec file for package python-rpm # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2017 Neal Gompa . # # All modifications and additions to the file contributed by third parties diff --git a/rpm.changes b/rpm.changes index 1b8734e..ae5c0ec 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Feb 1 12:47:02 UTC 2022 - Dirk Müller + +- invoke find-lang.sh with bash, it is a bash script (bsc#1195391) + +------------------------------------------------------------------- +Fri Jan 28 14:19:02 UTC 2022 - Dirk Müller + +- switch to glibc-locale-base to reduce system installation size + by ~220MB (bsc#1195390) + +------------------------------------------------------------------- +Wed Dec 22 14:57:27 CET 2021 - olaf@aepfle.de + +- Update OCaml requires/provides generators to ignore cmxs + new patch: ocaml-cmxs.diff + ------------------------------------------------------------------- Thu Oct 14 18:16:22 CEST 2021 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 2d18fe5..ae0890d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,7 +1,7 @@ # # spec file for package rpm # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -117,6 +117,7 @@ Patch131: posttrans.diff Patch132: verbosearg.diff Patch133: zstdpool.diff Patch134: zstdthreaded.diff +Patch135: ocaml-cmxs.diff Patch200: finddebuginfo.diff Patch201: finddebuginfo-absolute-links.diff Patch202: debugsubpkg.diff @@ -183,7 +184,7 @@ Requires: gcc #Requires: gcc-PIE Requires: gettext-tools Requires: glibc-devel -Requires: glibc-locale +Requires: glibc-locale-base Requires: grep Requires: gzip Requires: make @@ -237,7 +238,7 @@ rm -rf sqlite %patch -P 24 -P 25 -P 26 -P 29 %patch -P 30 -P 32 -P 33 -P 34 -P 36 -P 38 %patch -P 43 -P 45 -P 46 -P 47 -%patch -P 51 +%patch -P 51 %patch -P 60 -P 61 -P 66 -P 67 -P 69 %patch -P 70 -P 71 -P 73 -P 75 -P 77 -P 78 %patch -P 85 @@ -245,6 +246,7 @@ rm -rf sqlite %patch -P 100 -P 102 -P 103 %patch -P 117 %patch -P 122 -P 123 -P 131 -P 132 -P 133 -P 134 +%patch -P 135 # debugedit patches pushd debugedit-5.0 @@ -376,7 +378,7 @@ install -m 755 build-aux/config.sub %{buildroot}/usr/lib/rpm rm -rf %{buildroot}/%{_libdir}/python%{py_ver} rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la -sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm +bash %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm # On arm the kernel architecture is ignored. Not the best idea, but lets stay compatible with other distros %ifarch armv7hl armv6hl # rpm is using the host_cpu as default for the platform, but armv6/7hl is not known by the kernel.