[PATCH v2 0/1] debian: Resend .gitcensus change

[PATCH v2 0/1] debian: Resend .gitcensus change

[Bastian Germann]

This is a resend with the Reviewed-by tag collected.
I guess this was not integrated because the first version had one
more patchcthat ended being replaced by a different patch.

Changelog:
 v2: Drop 2nd patch that was reworked by Darrick.

Bastian Germann (1):
  debian: Generate .gitcensus instead of .census (Closes: #999743)

 debian/rules | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.34.1

[PATCH v2 1/1] debian: Generate .gitcensus instead of .census (Closes: #999743)

[Bastian Germann]

Fix the Debian build outside a git tree (e.g., Debian archive builds) by
creating an empty .gitcensus instead of .census file on config.

Signed-off-by: Bastian Germann <bage@debian.org>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
 debian/rules | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 615289b4..6d5b82a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,15 +43,15 @@ built: dibuild config
 	$(MAKE) $(PMAKEFLAGS) default
 	touch built
 
-config: .census
-.census:
+config: .gitcensus
+.gitcensus:
 	@echo "== dpkg-buildpackage: configure" 1>&2
 	$(checkdir)
 	AUTOHEADER=/bin/true dh_autoreconf
 	dh_update_autotools_config
 	$(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h
 	cp -f include/install-sh .
-	touch .census
+	touch .gitcensus
 
 dibuild:
 	$(checkdir)
@@ -72,7 +72,7 @@ dibuild:
 clean:
 	@echo "== dpkg-buildpackage: clean" 1>&2
 	$(checkdir)
-	-rm -f built .census mkfs/mkfs.xfs-$(bootpkg)
+	-rm -f built .gitcensus mkfs/mkfs.xfs-$(bootpkg)
 	$(MAKE) distclean
 	-rm -rf $(dirme) $(dirdev) $(dirdi)
 	-rm -f debian/*substvars debian/files* debian/*.debhelper
-- 
2.34.1

Re: [PATCH v2 1/1] debian: Generate .gitcensus instead of .census (Closes: #999743)

[Bastian Germann]

Hey,

I want to remind you of this patch before releasing xfsprogs 5.15.0.

Thanks,
Bastian

Am 07.12.21 um 13:21 schrieb Bastian Germann:
> Fix the Debian build outside a git tree (e.g., Debian archive builds) by
> creating an empty .gitcensus instead of .census file on config.
> 
> Signed-off-by: Bastian Germann <bage@debian.org>
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> ---
>   debian/rules | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/debian/rules b/debian/rules
> index 615289b4..6d5b82a8 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -43,15 +43,15 @@ built: dibuild config
>   	$(MAKE) $(PMAKEFLAGS) default
>   	touch built
>   
> -config: .census
> -.census:
> +config: .gitcensus
> +.gitcensus:
>   	@echo "== dpkg-buildpackage: configure" 1>&2
>   	$(checkdir)
>   	AUTOHEADER=/bin/true dh_autoreconf
>   	dh_update_autotools_config
>   	$(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h
>   	cp -f include/install-sh .
> -	touch .census
> +	touch .gitcensus
>   
>   dibuild:
>   	$(checkdir)
> @@ -72,7 +72,7 @@ dibuild:
>   clean:
>   	@echo "== dpkg-buildpackage: clean" 1>&2
>   	$(checkdir)
> -	-rm -f built .census mkfs/mkfs.xfs-$(bootpkg)
> +	-rm -f built .gitcensus mkfs/mkfs.xfs-$(bootpkg)
>   	$(MAKE) distclean
>   	-rm -rf $(dirme) $(dirdev) $(dirdi)
>   	-rm -f debian/*substvars debian/files* debian/*.debhelper

Re: [PATCH v2 1/1] debian: Generate .gitcensus instead of .census (Closes: #999743)

[Bastian Germann]

Hi!

Am 07.12.21 um 13:21 schrieb Bastian Germann:
> Fix the Debian build outside a git tree (e.g., Debian archive builds) by
> creating an empty .gitcensus instead of .census file on config.
> 
> Signed-off-by: Bastian Germann <bage@debian.org>
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>

2nd friendly ping on this.
For the last few Debian releases, I applied this.

> ---
>   debian/rules | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/debian/rules b/debian/rules
> index 615289b4..6d5b82a8 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -43,15 +43,15 @@ built: dibuild config
>   	$(MAKE) $(PMAKEFLAGS) default
>   	touch built
>   
> -config: .census
> -.census:
> +config: .gitcensus
> +.gitcensus:
>   	@echo "== dpkg-buildpackage: configure" 1>&2
>   	$(checkdir)
>   	AUTOHEADER=/bin/true dh_autoreconf
>   	dh_update_autotools_config
>   	$(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h
>   	cp -f include/install-sh .
> -	touch .census
> +	touch .gitcensus
>   
>   dibuild:
>   	$(checkdir)
> @@ -72,7 +72,7 @@ dibuild:
>   clean:
>   	@echo "== dpkg-buildpackage: clean" 1>&2
>   	$(checkdir)
> -	-rm -f built .census mkfs/mkfs.xfs-$(bootpkg)
> +	-rm -f built .gitcensus mkfs/mkfs.xfs-$(bootpkg)
>   	$(MAKE) distclean
>   	-rm -rf $(dirme) $(dirdev) $(dirdi)
>   	-rm -f debian/*substvars debian/files* debian/*.debhelper

Re: [PATCH v2 1/1] debian: Generate .gitcensus instead of .census (Closes: #999743)

[Eric Sandeen]

On 4/17/22 5:00 AM, Bastian Germann wrote:
> Hi!
> 
> Am 07.12.21 um 13:21 schrieb Bastian Germann:
>> Fix the Debian build outside a git tree (e.g., Debian archive builds) by
>> creating an empty .gitcensus instead of .census file on config.
>>
>> Signed-off-by: Bastian Germann <bage@debian.org>
>> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> 
> 2nd friendly ping on this.
> For the last few Debian releases, I applied this.

Very sorry for the delay. Does this need magic in debian/changelog
to auto-close the bug?

I have the change itself staged for 5.16.0 now.

-Eric

Re: [PATCH v2 1/1] debian: Generate .gitcensus instead of .census (Closes: #999743)

[Bastian Germann]

Am 03.05.22 um 01:25 schrieb Eric Sandeen:
> On 4/17/22 5:00 AM, Bastian Germann wrote:
>> Hi!
>>
>> Am 07.12.21 um 13:21 schrieb Bastian Germann:
>>> Fix the Debian build outside a git tree (e.g., Debian archive builds) by
>>> creating an empty .gitcensus instead of .census file on config.
>>>
>>> Signed-off-by: Bastian Germann <bage@debian.org>
>>> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
>>
>> 2nd friendly ping on this.
>> For the last few Debian releases, I applied this.
> 
> Very sorry for the delay. Does this need magic in debian/changelog
> to auto-close the bug?

When the "Closes: #999743" is contained in the changelog, it triggers an auto-close.
But I can also close it manually.

Thanks!