Is there a standard for dist-git commit messages fixing a bug?
by Carlos O'Donell
Florian,
Is there a standard for dist-git commit messages fixing a bug
in Fedora dist-git?
I've been sticking with "Resolves: #XXXX", thinking that this
would help commit parsers understand what changes went in.
However, the Package Maintenance Guide is silent about this:
https://fedoraproject.org/wiki/Package_maintenance_guide
perhaps I've just been following RHEL standards for this
without thinking much about them.
For example:
commit 3bf693773b81fa257c0f6c6aaaf642a2a27e07be
Author: Carlos O'Donell <carlos(a)systemhalted.org>
Date: Wed Sep 5 03:27:31 2018 -0400
Resolves: #1625507
- Provide compatibility support for linking against libpthread_nonshared.a
(#1625507)
Versus the other forms:
commit fe0f540287f6254157d9e4b188caa9925e2d94f3
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Thu Nov 1 11:55:20 2018 +0100
Include Esperanto (eo) in glibc-all-langpacks (#1643756)
commit 070656dfa4641684272e10259571c911501366b8
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Fri Nov 9 12:19:50 2018 +0100
Auto-sync with upstream branch release/2.28/master
Upstream commit: 3e8d8dd5afba18a847ff7a80f473336f777cc329
- Disable CET for binaries created by older link editors (#1648297)
Is there a reason to choose a more structured Resolves: #XXX?
--
Cheers,
Carlos.
5 years, 4 months
[PATCH] Depend on libgcc%{_isa} (Bug 1352973)
by Carlos O'Donell
I'm cleaning out some old bugs and I came across this one
which I hadn't finished.
In bug 1352973 we discussed adding libgcc%{_isa} to glibc's
requires because the cancellation API requires it.
Given the current use of 'Requires: libgcc%{_isa}' for
glibc-devel, it seems sensible to add this to glibc also.
The question is, should it be added only for non-bootstrap
builds?
Or should we just fix it like this?
diff --git a/glibc.spec b/glibc.spec
index d553c5b..0e3b0d2 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.28.9000-319-gce035c6e90
%define glibcversion 2.28.9000
-%define glibcrelease 22%{?dist}
+%define glibcrelease 23%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@@ -167,6 +167,10 @@ Provides: ldconfig
# The dynamic linker supports DT_GNU_HASH
Provides: rtld(GNU_HASH)
+
+# We need libgcc for cancellation support in POSIX threads.
+Requires: libgcc%{_isa}
+
Requires: glibc-common = %{version}-%{release}
# Various components (regex, glob) have been imported from gnulib.
@@ -1902,6 +1906,9 @@ fi
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog
+* Tue Nov 27 2018 Carlos O'Donell <carlos(a)redhat.com> - 2.28.9000-23
+- Add requires on libgcc for glibc (#1352973)
+
* Tue Nov 27 2018 Carlos O'Donell <carlos(a)redhat.com> - 2.28.9000-22
- Add requires on explicit glibc version for glibc-nss-devel (#1651260)
---
--
Cheers,
Carlos.
5 years, 4 months
glibc: Do not use parallel make for building locales (#1652228)
by Florian Weimer
I would like to see a quick review for this.
I think have to do this, which is unfortunate. It increases build time
by about ten minutes on x86-64 (with lots of CPU cores).
Proposed patch:
diff --git a/glibc.spec b/glibc.spec
index 73ecd93..54c96b2 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -908,7 +908,9 @@ make -j1 install_root=%{glibc_sysroot} install -C build-%{target}
# locales.
%ifnarch %{auxarches}
pushd build-%{target}
-make %{?_smp_mflags} -O install_root=%{glibc_sysroot} \
+# Do not use a parallel make here because the hardlink optimization in
+# localedef is not fully reproducible when running concurrently.
+make install_root=%{glibc_sysroot} \
install-locales -C ../localedata objdir=`pwd`
popd
%endif
I think this could also explain the x86_64/i686 multilib differences for
the locale archive that we saw downstream occasionally.
Thanks,
Florian
5 years, 4 months
[PATCH] Make glibc-nss-devel depend on exact glibc version.
by Carlos O'Donell
Florian,
The rpm checking in downstream complains that glibc-nss-devel
has a dependency on glibc because the *.so links point to
the compat and files nss DSOs. It's probably simplest to just
make the glibc-nss-devel depend on the explicit version of
glibc they were built with.
OK with this change for rawhide and f29?
Signed-off-by: Carlos O'Donell <carlos(a)redhat.com>
diff --git a/glibc.spec b/glibc.spec
index 5529eda..bfe0bb2 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.28-44-gf44c2ca5ea
%define glibcversion 2.28
-%define glibcrelease 20%{?dist}
+%define glibcrelease 21%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@@ -579,6 +579,7 @@ the Hesiod convention of Project Athena.
%package nss-devel
Summary: Development files for directly linking NSS service modules
+Requires: %{name} = %{version}-%{release}
Requires: nss_db%{_isa} = %{version}-%{release}
Requires: nss_hesiod%{_isa} = %{version}-%{release}
@@ -1901,6 +1902,9 @@ fi
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog
+* Mon Nov 19 2018 Carlos O'Donell <carlos(a)redhat.com> - 2.28-21
+- Add dependency on glibc from glibc-nss-devel (#1651260)
+
* Mon Nov 19 2018 Florian Weimer <fweimer(a)redhat.com> - 2.28-20
- Auto-sync with upstream branch release/2.28/master,
commit f44c2ca5eacd2df76fc38be75f9ebb8f0ff555eb:
---
--
Cheers,
Carlos.
5 years, 4 months