* [PATCH 1/6] debian: Update debhelper-compat level
2024-09-12 7:20 [PATCH 0/6] debian: Debian and Ubuntu archive changes Bastian Germann
@ 2024-09-12 7:20 ` Bastian Germann
2024-09-12 7:20 ` [PATCH 2/6] debian: Update public release key Bastian Germann
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Bastian Germann @ 2024-09-12 7:20 UTC (permalink / raw)
To: linux-xfs; +Cc: Bastian Germann
debhelper-compat-upgrade-checklist.7 discourages using level 11.
Update to compat level 12, which is supported back to buster.
Signed-off-by: Bastian Germann <bage@debian.org>
---
debian/compat | 2 +-
debian/control | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/compat b/debian/compat
index b4de3947..48082f72 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-11
+12
diff --git a/debian/control b/debian/control
index 31773e53..369d11a4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>, Bastian Germann <bage@debian.org>
-Build-Depends: libinih-dev (>= 53), uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config, liburcu-dev
+Build-Depends: libinih-dev (>= 53), uuid-dev, debhelper (>= 12), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config, liburcu-dev
Standards-Version: 4.0.0
Homepage: https://xfs.wiki.kernel.org/
--
2.45.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/6] debian: Update public release key
2024-09-12 7:20 [PATCH 0/6] debian: Debian and Ubuntu archive changes Bastian Germann
2024-09-12 7:20 ` [PATCH 1/6] debian: Update debhelper-compat level Bastian Germann
@ 2024-09-12 7:20 ` Bastian Germann
2024-09-12 7:20 ` [PATCH 3/6] debian: Prevent recreating the orig tarball Bastian Germann
` (4 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Bastian Germann @ 2024-09-12 7:20 UTC (permalink / raw)
To: linux-xfs; +Cc: Bastian Germann
New key material, used for some releases in the Debian archive:
pub ed25519 2022-05-27 [C]
4020459E58C1A52511F5399113F703E6C11CF6F0
uid Carlos Eduardo Maiolino <carlos@maiolino.me>
uid Carlos Eduardo Maiolino <cem@kernel.org>
uid Carlos Eduardo Maiolino <cmaiolino@redhat.com>
sub ed25519 2022-05-27 [A]
sub ed25519 2022-05-27 [S]
sub nistp384 2024-02-15 [A]
sub nistp384 2024-02-15 [S]
sub nistp384 2024-02-15 [E]
sub cv25519 2022-05-27 [E]
Signed-off-by: Bastian Germann <bage@debian.org>
---
debian/upstream/signing-key.asc | 106 ++++++++++++++------------------
1 file changed, 46 insertions(+), 60 deletions(-)
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 5a9ec9b8..21b193a5 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -1,63 +1,49 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-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
-=El1H
+mDMEYpDWzRYJKwYBBAHaRw8BAQdALRUYJSJQyHn8o9318h7Pj4KYIOPF6a+6Z13A
+bBReh6C0LENhcmxvcyBFZHVhcmRvIE1haW9saW5vIDxjYXJsb3NAbWFpb2xpbm8u
+bWU+iJYEExYKAD4FCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4ACGQEWIQRAIEWe
+WMGlJRH1OZET9wPmwRz28AUCYpERyAIbAQAKCRAT9wPmwRz28PBCAQDsBVWWrXVJ
+CUVfRDPkjN3zIGqDI4lZO9gXztG88NODvAD/bicVG0GsxDsq1VOzSXz0NbwnrVmO
+Z92IQcuqQcB3rAG0KENhcmxvcyBFZHVhcmRvIE1haW9saW5vIDxjZW1Aa2VybmVs
+Lm9yZz6IkwQTFgoAOxYhBEAgRZ5YwaUlEfU5kRP3A+bBHPbwBQJiqHtFAhsBBQsJ
+CAcCAiICBhUKCQgLAgQWAgMBAh4HAheAAAoJEBP3A+bBHPbwgUcA/1UvHEU2farI
+RuWL2V+86kAJE+3mXwaj4RKNxj3k1LH7AQDtZJ4iZvfPF1u5jv9HAe2m9sj2KtGR
+G5qCTM1kdGvWCbQuQ2FybG9zIEVkdWFyZG8gTWFpb2xpbm8gPGNtYWlvbGlub0By
+ZWRoYXQuY29tPoiTBBMWCgA7AhsDBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4HAheA
+FiEEQCBFnljBpSUR9TmRE/cD5sEc9vAFAmKREHMACgkQE/cD5sEc9vDMcwD+PAZz
+J5LR8RXDuCjHupo48DbhldDX89sOarOSlM3NIswA/3Nc1tcDiHrPOpmWVPKD7Qnk
+UY7XDyqjkNnetbgDOeQAuDMEYpDlmxYJKwYBBAHaRw8BAQdAUo8FDT3qwJVb00K1
+sgqYszeazP13DnY2yUPd6BjDq/KIeAQYFgoAIBYhBEAgRZ5YwaUlEfU5kRP3A+bB
+HPbwBQJikOWbAhsgAAoJEBP3A+bBHPbwGmQBAJJo3csKUuPjbpiIHpVsNve6QSLN
+3dgPc89bzEAF+pTbAP42oeQezPHlac3uMHk7qA6eW2oDPjwk4hmdURD0JWfqCbgz
+BGKQ5aMWCSsGAQQB2kcPAQEHQM4qGA9zcl9U6XXd971xCPhvCkFq8Van5AICigf2
+gCjyiO8EGBYKACAWIQRAIEWeWMGlJRH1OZET9wPmwRz28AUCYpDlowIbAgCBCRAT
+9wPmwRz28HYgBBkWCgAdFiEE+kBuIGr/eHOJfGhktFYYw2ok/SMFAmKQ5aMACgkQ
+tFYYw2ok/SPQpAEA2lHK9gQ5u8IXll/GyffBK/dsya9N/4t8ZiVv/O7YdfIBAL7D
+tDoStw9qfiqtINr1dpoMkcSvJaGLPKP9NDWEm7EJWuoBAOK55BkUEd7+DAcooxoa
+tZY2jzE0GyC4kz21KgN5NbbLAQCA81Au6Q1iWloidsg01YQQbzPsvjJ6CVeQ6k7f
+y/ijB7hvBGXOGm8TBSuBBAAiAwMEIioVSfoxda04vWBNR8rTTgtTN5J6ij0aelSv
+kvLGN7AX8dtTxsm9TyEzdvtmwyM4H9DHwPde2GyTTRBIJbvAeTtq2JbAok6xLdfm
+OcinFnO8hFrFQ2o46n6WqFqth/wyiHgEGBYKACAWIQRAIEWeWMGlJRH1OZET9wPm
+wRz28AUCZc4abwIbIAAKCRAT9wPmwRz28GItAQC0xQluEL7p4THLhTgWXcrf4wQ/
+bWdXxU4JwUuPoic1+AEA3Swlkhn8LbNnXiIwAsIg1uus2WzyL3yJEhE54pd8bQm4
+bwRlzhMWEwUrgQQAIgMDBKZ4OlpocCPFvYoqDAhwAJqJsNC7PAFcVY3VnrAJXLet
+hFrZfh5LBzR1ukZAQhYPn1A3gGZ6PizRI91imJ6nkvywxIeVpf75qQf10RnZ6Z4k
+NzP1z0WFXu/vrbKoL9CWAYkBDwQYFgoAIBYhBEAgRZ5YwaUlEfU5kRP3A+bBHPbw
+BQJlzhMWAhsCAKEJEBP3A+bBHPbwliAEGRMJAB0WIQQMHYkcUKcy4GgPe2RGdaER
+5QtfpgUCZc4TFgAKCRBGdaER5QtfpokjAXwIsSWrL3eax+z/3cVL0Q1AZ4/ZMKmM
+wnvrz50DRePaICWT2xVVQXMY/e8kAGhZxWoBf1/BBUdPioXmC+B8Go35oSMEVOBI
+HOYPmgzA5f1eszBSki06pDXcS3aJIiawfK1EcQRPAQCTybdoRNsPltL8cD4J3hou
+8RuBeErKy8BKFqp6O5sCBAEA1apBNKyFIapH+ZwDBNq5CSiFe/G55EIh5hFdQJMU
+OAe4cwRlzhRcEgUrgQQAIgMDBNj1uGqGJ8a0sqN8kBicGNkFAtoyvfEFTH+KUSNn
+GP34wya2HnMUB7t0LU8d+lt5M3pH1bv6Tg3GSfGQ530R9FjU2Qz5QFcajA5inBTV
+qYY+Dk/ZCYE3/qtPspuryGRiIQMBCQmIeAQYFgoAIBYhBEAgRZ5YwaUlEfU5kRP3
+A+bBHPbwBQJlzhRcAhsMAAoJEBP3A+bBHPbwExUBAMuOSJrrxg2Y3S23/sXr6uB8
+GHgFdcBGp6G4jx+0QeOsAP0ZfWgHg40YqRFhwmTAE9j3FE1j9u7kiuHn6iAJS4Qf
+Brg4BGKQ5mASCisGAQQBl1UBBQEBB0DaAZhs0bB5OqligT7Z6+r5TuwAaPx75HqC
+1FGVNq/0PQMBCAeIeAQYFgoAIBYhBEAgRZ5YwaUlEfU5kRP3A+bBHPbwBQJikOZg
+AhsMAAoJEBP3A+bBHPbwvsQA/34JP7FUK5H4Lq+2b47KL364x2xwuLVnoN1fGFRy
+DnXKAP9ULaEyzGc8LewpHfrxRn6kkrOQ9RTJsGhOGf1laKj5Aw==
+=apYB
-----END PGP PUBLIC KEY BLOCK-----
--
2.45.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/6] debian: Prevent recreating the orig tarball
2024-09-12 7:20 [PATCH 0/6] debian: Debian and Ubuntu archive changes Bastian Germann
2024-09-12 7:20 ` [PATCH 1/6] debian: Update debhelper-compat level Bastian Germann
2024-09-12 7:20 ` [PATCH 2/6] debian: Update public release key Bastian Germann
@ 2024-09-12 7:20 ` Bastian Germann
2024-09-12 7:20 ` [PATCH 4/6] debian: Add Build-Depends: systemd-dev Bastian Germann
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Bastian Germann @ 2024-09-12 7:20 UTC (permalink / raw)
To: linux-xfs; +Cc: Bastian Germann
Signed-off-by: Bastian Germann <bage@debian.org>
---
debian/rules | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index c3fbcd26..98dafcab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,7 +103,6 @@ binary-arch: checkroot built
$(pkgme) $(MAKE) -C . install
$(pkgdev) $(MAKE) -C . install-dev
$(pkgdi) $(MAKE) -C debian install-d-i
- $(pkgme) $(MAKE) dist
install -D -m 0755 debian/local/initramfs.hook debian/xfsprogs/usr/share/initramfs-tools/hooks/xfs
rmdir debian/xfslibs-dev/usr/share/doc/xfsprogs
rm -f debian/xfslibs-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libhandle.la
--
2.45.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/6] debian: Add Build-Depends: systemd-dev
2024-09-12 7:20 [PATCH 0/6] debian: Debian and Ubuntu archive changes Bastian Germann
` (2 preceding siblings ...)
2024-09-12 7:20 ` [PATCH 3/6] debian: Prevent recreating the orig tarball Bastian Germann
@ 2024-09-12 7:20 ` Bastian Germann
2024-09-16 22:35 ` Darrick J. Wong
2024-09-12 7:20 ` [PATCH 5/6] debian: Modernize build script Bastian Germann
` (2 subsequent siblings)
6 siblings, 1 reply; 11+ messages in thread
From: Bastian Germann @ 2024-09-12 7:20 UTC (permalink / raw)
To: linux-xfs; +Cc: Bastian Germann
Signed-off-by: Bastian Germann <bage@debian.org>
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 369d11a4..c3c6b263 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>, Bastian Germann <bage@debian.org>
-Build-Depends: libinih-dev (>= 53), uuid-dev, debhelper (>= 12), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config, liburcu-dev
+Build-Depends: libinih-dev (>= 53), uuid-dev, debhelper (>= 12), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config, liburcu-dev, systemd-dev
Standards-Version: 4.0.0
Homepage: https://xfs.wiki.kernel.org/
--
2.45.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 4/6] debian: Add Build-Depends: systemd-dev
2024-09-12 7:20 ` [PATCH 4/6] debian: Add Build-Depends: systemd-dev Bastian Germann
@ 2024-09-16 22:35 ` Darrick J. Wong
0 siblings, 0 replies; 11+ messages in thread
From: Darrick J. Wong @ 2024-09-16 22:35 UTC (permalink / raw)
To: Bastian Germann; +Cc: linux-xfs
On Thu, Sep 12, 2024 at 09:20:51AM +0200, Bastian Germann wrote:
> Signed-off-by: Bastian Germann <bage@debian.org>
> ---
> debian/control | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/debian/control b/debian/control
> index 369d11a4..c3c6b263 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -3,7 +3,7 @@ Section: admin
> Priority: optional
> Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
> Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>, Bastian Germann <bage@debian.org>
> -Build-Depends: libinih-dev (>= 53), uuid-dev, debhelper (>= 12), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config, liburcu-dev
> +Build-Depends: libinih-dev (>= 53), uuid-dev, debhelper (>= 12), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config, liburcu-dev, systemd-dev
/me notices that on a bookworm system, systemd-dev only exists in
bookworm-backports as version 254.16. This is newer than the systemd
252.30 package, which causes a fair amount of mayhem here.
Is there a compelling reason to upgrade systemd on a stable debian
system?
I don't mind patching this back out for my own purposes, but thought I'd
make a note of this publicly.
--D
> Standards-Version: 4.0.0
> Homepage: https://xfs.wiki.kernel.org/
>
> --
> 2.45.2
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 5/6] debian: Modernize build script
2024-09-12 7:20 [PATCH 0/6] debian: Debian and Ubuntu archive changes Bastian Germann
` (3 preceding siblings ...)
2024-09-12 7:20 ` [PATCH 4/6] debian: Add Build-Depends: systemd-dev Bastian Germann
@ 2024-09-12 7:20 ` Bastian Germann
2024-09-12 7:20 ` [PATCH 6/6] debian: Correct the day-of-week on 2024-09-04 Bastian Germann
2024-09-13 5:42 ` [PATCH 0/6] debian: Debian and Ubuntu archive changes Carlos Maiolino
6 siblings, 0 replies; 11+ messages in thread
From: Bastian Germann @ 2024-09-12 7:20 UTC (permalink / raw)
To: linux-xfs; +Cc: Bastian Germann, Zixing Liu
- Use autoreconf template, this will now properly installs the
translation files
- Use $(CURDIR) to replace `pwd` syntax
Link: https://bugs.launchpad.net/ubuntu/+source/xfsprogs/+bug/2076309
Suggested-by: Zixing Liu <zixing.liu@canonical.com>
Signed-off-by: Bastian Germann <bage@debian.org>
---
debian/rules | 80 +++++++++++++++++-----------------------------------
1 file changed, 26 insertions(+), 54 deletions(-)
diff --git a/debian/rules b/debian/rules
index 98dafcab..7c9f90e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
export DH_VERBOSE=1
+export AUTOHEADER=true
+
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
PMAKEFLAGS += -j$(NUMJOBS)
@@ -15,9 +17,7 @@ package = xfsprogs
develop = xfslibs-dev
bootpkg = xfsprogs-udeb
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
version = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
target ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -26,9 +26,9 @@ udebpkg = $(bootpkg)_$(version)_$(target).udeb
dirme = debian/$(package)
dirdev = debian/$(develop)
dirdi = debian/$(bootpkg)
-pkgme = DIST_ROOT=`pwd`/$(dirme); export DIST_ROOT;
-pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT;
-pkgdi = DIST_ROOT=`pwd`/$(dirdi); export DIST_ROOT;
+pkgme = DIST_ROOT=$(CURDIR)/$(dirme); export DIST_ROOT;
+pkgdev = DIST_ROOT=$(CURDIR)/$(dirdev); export DIST_ROOT;
+pkgdi = DIST_ROOT=$(CURDIR)/$(dirdi); export DIST_ROOT;
stdenv = @GZIP=-q; export GZIP;
configure_options = \
@@ -42,35 +42,20 @@ configure_options = \
--localstatedir=/var
options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
- INSTALL_USER=root INSTALL_GROUP=root \
+ INSTALL_USER=root INSTALL_GROUP=root LDFLAGS='$(LDFLAGS)' \
LOCAL_CONFIGURE_OPTIONS="$(configure_options) --enable-editline=yes --enable-blkid=yes" ;
diopts = $(options) \
export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="$(configure_options) --enable-gettext=no" ;
-checkdir = test -f debian/rules
-build: build-arch build-indep
-build-arch: built
-build-indep: built
-built: dibuild config
- @echo "== dpkg-buildpackage: build" 1>&2
- $(MAKE) $(PMAKEFLAGS) default
- touch built
+%:
+ dh $@
-config: .gitcensus
-.gitcensus:
- @echo "== dpkg-buildpackage: configure" 1>&2
- $(checkdir)
- AUTOHEADER=/bin/true dh_autoreconf
- dh_update_autotools_config
- # runs configure with $(options)
- $(options) $(MAKE) $(PMAKEFLAGS) include/builddefs
- cp -f include/install-sh .
+override_dh_auto_configure:
+ dh_testdir
touch .gitcensus
-dibuild:
- $(checkdir)
+override_dh_auto_build:
@echo "== dpkg-buildpackage: installer" 1>&2
- # runs configure with $(options)
if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \
$(diopts) $(MAKE) include/builddefs; \
mkdir -p include/xfs; \
@@ -83,46 +68,33 @@ dibuild:
mv mkfs/mkfs.xfs mkfs/mkfs.xfs-$(bootpkg); \
$(MAKE) distclean; \
fi
+ @echo "== dpkg-buildpackage: configure" 1>&2
+ # runs configure with $(options)
+ $(options) $(MAKE) $(PMAKEFLAGS) include/builddefs
+ cp -f include/install-sh .
+ @echo "== dpkg-buildpackage: build" 1>&2
+ $(MAKE) $(PMAKEFLAGS) default
-clean:
+execute_before_dh_clean:
@echo "== dpkg-buildpackage: clean" 1>&2
- $(checkdir)
+ dh_testdir
-rm -f built .gitcensus mkfs/mkfs.xfs-$(bootpkg)
$(MAKE) distclean
-rm -rf $(dirme) $(dirdev) $(dirdi)
- -rm -f debian/*substvars debian/files* debian/*.debhelper
- dh_autoreconf_clean
- dh_clean
-
-binary-indep:
-binary-arch: checkroot built
+override_dh_auto_install:
@echo "== dpkg-buildpackage: binary-arch" 1>&2
- $(checkdir)
-rm -rf $(dirme) $(dirdev) $(dirdi)
+ dh_testdir
$(pkgme) $(MAKE) -C . install
$(pkgdev) $(MAKE) -C . install-dev
$(pkgdi) $(MAKE) -C debian install-d-i
install -D -m 0755 debian/local/initramfs.hook debian/xfsprogs/usr/share/initramfs-tools/hooks/xfs
- rmdir debian/xfslibs-dev/usr/share/doc/xfsprogs
rm -f debian/xfslibs-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libhandle.la
rm -f debian/xfslibs-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libhandle.a
- dh_installdocs -XCHANGES
- dh_installchangelogs
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installsystemd -p xfsprogs --no-restart-after-upgrade --no-stop-on-upgrade system-xfs_scrub.slice xfs_scrub_all.timer
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-checkroot:
- test 0 -eq `id -u`
+override_dh_installdocs:
+ dh_installdocs -XCHANGES
-.PHONY: binary binary-arch binary-indep clean checkroot
+override_dh_installsystemd:
+ dh_installsystemd -p xfsprogs --no-restart-after-upgrade --no-stop-on-upgrade system-xfs_scrub.slice xfs_scrub_all.timer
--
2.45.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 6/6] debian: Correct the day-of-week on 2024-09-04
2024-09-12 7:20 [PATCH 0/6] debian: Debian and Ubuntu archive changes Bastian Germann
` (4 preceding siblings ...)
2024-09-12 7:20 ` [PATCH 5/6] debian: Modernize build script Bastian Germann
@ 2024-09-12 7:20 ` Bastian Germann
2024-09-13 5:42 ` [PATCH 0/6] debian: Debian and Ubuntu archive changes Carlos Maiolino
6 siblings, 0 replies; 11+ messages in thread
From: Bastian Germann @ 2024-09-12 7:20 UTC (permalink / raw)
To: linux-xfs; +Cc: Bastian Germann
Signed-off-by: Bastian Germann <bage@debian.org>
---
debian/changelog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index cf7fcb4c..82d4a488 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ xfsprogs (6.10.1-1) unstable; urgency=low
* New upstream release
- -- Nathan Scott <nathans@debian.org> Mon, 04 Sep 2024 14:00:00 +0100
+ -- Nathan Scott <nathans@debian.org> Wed, 04 Sep 2024 14:00:00 +0100
xfsprogs (6.10.0-1) unstable; urgency=low
--
2.45.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 0/6] debian: Debian and Ubuntu archive changes
2024-09-12 7:20 [PATCH 0/6] debian: Debian and Ubuntu archive changes Bastian Germann
` (5 preceding siblings ...)
2024-09-12 7:20 ` [PATCH 6/6] debian: Correct the day-of-week on 2024-09-04 Bastian Germann
@ 2024-09-13 5:42 ` Carlos Maiolino
2024-09-16 22:38 ` Darrick J. Wong
6 siblings, 1 reply; 11+ messages in thread
From: Carlos Maiolino @ 2024-09-13 5:42 UTC (permalink / raw)
To: Bastian Germann; +Cc: linux-xfs
On Thu, Sep 12, 2024 at 09:20:47AM GMT, Bastian Germann wrote:
> Hi,
>
> I am forwarding all the changes that are in the Debian and Ubuntu
> archives with a major structural change in the debian/rules file,
> which gets the package to a more modern dh-based build flavor.
>
> Bastian Germann (6):
> debian: Update debhelper-compat level
> debian: Update public release key
> debian: Prevent recreating the orig tarball
> debian: Add Build-Depends: systemd-dev
> debian: Modernize build script
> debian: Correct the day-of-week on 2024-09-04
>
> debian/changelog | 2 +-
> debian/compat | 2 +-
> debian/control | 2 +-
> debian/rules | 81 ++++++++----------------
> debian/upstream/signing-key.asc | 106 ++++++++++++++------------------
> 5 files changed, 75 insertions(+), 118 deletions(-)
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Those changes look fine for me, but I'll wait Darrick's review too as he's more
familiar with Debian than I am.
Carlos
>
> --
> 2.45.2
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 0/6] debian: Debian and Ubuntu archive changes
2024-09-13 5:42 ` [PATCH 0/6] debian: Debian and Ubuntu archive changes Carlos Maiolino
@ 2024-09-16 22:38 ` Darrick J. Wong
0 siblings, 0 replies; 11+ messages in thread
From: Darrick J. Wong @ 2024-09-16 22:38 UTC (permalink / raw)
To: Carlos Maiolino; +Cc: Bastian Germann, linux-xfs
On Fri, Sep 13, 2024 at 07:42:22AM +0200, Carlos Maiolino wrote:
> On Thu, Sep 12, 2024 at 09:20:47AM GMT, Bastian Germann wrote:
> > Hi,
> >
> > I am forwarding all the changes that are in the Debian and Ubuntu
> > archives with a major structural change in the debian/rules file,
> > which gets the package to a more modern dh-based build flavor.
> >
> > Bastian Germann (6):
> > debian: Update debhelper-compat level
> > debian: Update public release key
> > debian: Prevent recreating the orig tarball
> > debian: Add Build-Depends: systemd-dev
> > debian: Modernize build script
Yeah!
> > debian: Correct the day-of-week on 2024-09-04
> >
> > debian/changelog | 2 +-
> > debian/compat | 2 +-
> > debian/control | 2 +-
> > debian/rules | 81 ++++++++----------------
> > debian/upstream/signing-key.asc | 106 ++++++++++++++------------------
> > 5 files changed, 75 insertions(+), 118 deletions(-)
>
> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
>
> Those changes look fine for me, but I'll wait Darrick's review too as he's more
> familiar with Debian than I am.
Looks fine to me too, modulo the thing that I noticed. I don't think
debian stable builds should hold up merging this series.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> Carlos
>
> >
> > --
> > 2.45.2
> >
> >
>
^ permalink raw reply [flat|nested] 11+ messages in thread