[OS-BUILD PATCH] Remove filterdiff and use native git instead

[GitLab Bridge on behalf of dzickusrh]

From: Don Zickus <dzickus(a)redhat.com&gt;

Long ago, we needed the ability to filter out files and directories
from patches.  Now that ability is built into git a few years ago,
let's use that instead of filterdiff.

One less tool to depend on and require.

Cc: Bastien Nocera <bnocera(a)redhat.com&gt;
Cc: Herton Krzesinski <hkrzesin(a)redhat.com&gt;
Signed-off-by: Don Zickus <dzickus(a)redhat.com&gt;
---
 redhat/Makefile        | 23 ++++++++++-------------
 redhat/Makefile.common |  1 -
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/redhat/Makefile b/redhat/Makefile
index 7130f4e25c8c..3fba4e7817ac 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -216,18 +216,17 @@ setup-source: dist-git-version-check dist-clean-sources
 	@$(REDHAT)/genspec.sh $(SOURCES) $(SOURCES)/$(SPECFILE) $(SOURCES)/$(CHANGELOG)
$(PKGRELEASE) $(RPMKVERSION) $(RPMKPATCHLEVEL) $(RPMKSUBLEVEL) $(DISTRO_BUILD)
$(RELEASED_KERNEL) $(SPECRELEASE) $(__ZSTREAM) "$(BUILDOPTS)" $(MARKER) `cat
$(REDHAT)/marker` $(SINGLE_TARBALL) $(TARFILE_RELEASE) $(SNAPSHOT) $(BUILDID)
 	@cp $(SOURCES)/$(SPECFILE) $(SOURCES)/../SPECS/
 
-sources-rh: $(TARBALL)
+generate-testpatch-tmp:
+	@git diff --no-renames HEAD ":(exclude,top).get_maintainer.conf" \
+		":(exclude,top).gitattributes" \
+		":(exclude,top).gitignore" \
+		":(exclude,top)makefile" \
+		":(exclude,top)Makefile.rhelver" \
+		":(exclude,top)redhat" > $(TESTPATCH).tmp
+
+sources-rh: $(TARBALL) generate-testpatch-tmp
 	@cp -l $(TARBALL) $(SOURCES)/ || cp $(TARBALL) $(SOURCES)/
 	@touch $(TESTPATCH)
-	@git diff --no-renames HEAD > $(TESTPATCH).tmp
-	@# 1) filterdiff will return crap from the patches it just filtered,
-	@#    that's why egrep is needed so if there're changes under redhat/
-	@#    but not everywhere else, it will be empty just like
-	@#    linux-kernel-test.patch
-	@# 2) egrep -v will return "1" if it sucessfully removed index and diff
-	@#    lines, which will be considered an error
-	@($(FILTERDIFF) $(TESTPATCH).tmp | egrep -v "^index|^diff"
>$(TESTPATCH).tmp2; true)
-	@mv $(TESTPATCH).tmp2 $(TESTPATCH).tmp
 	@diff $(TESTPATCH).tmp $(TESTPATCH) > /dev/null || \
 		echo "WARNING: There are uncommitted changes in your tree or the changes are not
in sync with linux-kernel-test.patch.  Either commit the changes or run 'make
dist-test-patch'"
 	@rm $(TESTPATCH).tmp
@@ -264,9 +263,7 @@ sources-rh: $(TARBALL)
 
 dist-sources: setup-source dist-configs-check dist-kabi dist-kabi-dup sources-rh
 
-dist-test-patch:
-	@git diff --no-renames HEAD > $(TESTPATCH);
-	@($(FILTERDIFF) $(TESTPATCH) | egrep -v "^index|^diff" >$(TESTPATCH).tmp;
true)
+dist-test-patch: generate-testpatch-tmp
 	@mv $(TESTPATCH).tmp $(TESTPATCH);
 
 dist-all-rpms: dist-sources
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index b335f3c77c7d..fc3189b6948e 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -81,7 +81,6 @@ RPM:=$(REDHAT)/rpm
 SRPMS:=$(RPM)/SRPMS
 SOURCES:=$(RPM)/SOURCES
 TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
-FILTERDIFF:=/usr/bin/filterdiff -x '*redhat/*' -x '*/.gitignore' -x
'*/makefile' -x '*/Makefile'
 ARCH_LIST=aarch64 ppc64le s390x x86_64
 # Make can't match on a regex to match fc31, fc32 so add another check here
 # A unified tarball means that the tarball in the srpm contains both the
-- 
GitLab

[Herton R. Krzesinski]

On Wed, Dec 02, 2020 at 09:49:26PM -0000, GitLab Bridge on behalf of dzickusrh wrote:
>  From: Don Zickus <dzickus(a)redhat.com&gt;
>  
>  Long ago, we needed the ability to filter out files and directories
>  from patches.  Now that ability is built into git a few years ago,
>  let's use that instead of filterdiff.
>  
>  One less tool to depend on and require.
>  
>  Cc: Bastien Nocera <bnocera(a)redhat.com&gt;
>  Cc: Herton Krzesinski <hkrzesin(a)redhat.com&gt;
>  Signed-off-by: Don Zickus <dzickus(a)redhat.com&gt;
>  ---
>   redhat/Makefile        | 23 ++++++++++-------------
>   redhat/Makefile.common |  1 -
>   2 files changed, 10 insertions(+), 14 deletions(-) 
Acked-by: Herton R. Krzesinski <herton(a)redhat.com&gt;

>  
>  diff --git a/redhat/Makefile b/redhat/Makefile
>  index 7130f4e25c8c..3fba4e7817ac 100644
>  --- a/redhat/Makefile
>  +++ b/redhat/Makefile
>  @@ -216,18 +216,17 @@ setup-source: dist-git-version-check dist-clean-sources
>   	@$(REDHAT)/genspec.sh $(SOURCES) $(SOURCES)/$(SPECFILE) $(SOURCES)/$(CHANGELOG)
> $(PKGRELEASE) $(RPMKVERSION) $(RPMKPATCHLEVEL) $(RPMKSUBLEVEL) $(DISTRO_BUILD)
> $(RELEASED_KERNEL) $(SPECRELEASE) $(__ZSTREAM) "$(BUILDOPTS)" $(MARKER) `cat
> $(REDHAT)/marker` $(SINGLE_TARBALL) $(TARFILE_RELEASE) $(SNAPSHOT) $(BUILDID)
>   	@cp $(SOURCES)/$(SPECFILE) $(SOURCES)/../SPECS/
>   
>  -sources-rh: $(TARBALL)
>  +generate-testpatch-tmp:
>  +	@git diff --no-renames HEAD ":(exclude,top).get_maintainer.conf" \
>  +		":(exclude,top).gitattributes" \
>  +		":(exclude,top).gitignore" \
>  +		":(exclude,top)makefile" \
>  +		":(exclude,top)Makefile.rhelver" \
>  +		":(exclude,top)redhat" > $(TESTPATCH).tmp
>  +
>  +sources-rh: $(TARBALL) generate-testpatch-tmp
>   	@cp -l $(TARBALL) $(SOURCES)/ || cp $(TARBALL) $(SOURCES)/
>   	@touch $(TESTPATCH)
>  -	@git diff --no-renames HEAD > $(TESTPATCH).tmp
>  -	@# 1) filterdiff will return crap from the patches it just filtered,
>  -	@#    that's why egrep is needed so if there're changes under redhat/
>  -	@#    but not everywhere else, it will be empty just like
>  -	@#    linux-kernel-test.patch
>  -	@# 2) egrep -v will return "1" if it sucessfully removed index and diff
>  -	@#    lines, which will be considered an error
>  -	@($(FILTERDIFF) $(TESTPATCH).tmp | egrep -v "^index|^diff"
> >$(TESTPATCH).tmp2; true)
>  -	@mv $(TESTPATCH).tmp2 $(TESTPATCH).tmp
>   	@diff $(TESTPATCH).tmp $(TESTPATCH) > /dev/null || \
>   		echo "WARNING: There are uncommitted changes in your tree or the changes are not
> in sync with linux-kernel-test.patch.  Either commit the changes or run 'make
> dist-test-patch'"
>   	@rm $(TESTPATCH).tmp
>  @@ -264,9 +263,7 @@ sources-rh: $(TARBALL)
>   
>   dist-sources: setup-source dist-configs-check dist-kabi dist-kabi-dup sources-rh
>   
>  -dist-test-patch:
>  -	@git diff --no-renames HEAD > $(TESTPATCH);
>  -	@($(FILTERDIFF) $(TESTPATCH) | egrep -v "^index|^diff" >$(TESTPATCH).tmp;
> true)
>  +dist-test-patch: generate-testpatch-tmp
>   	@mv $(TESTPATCH).tmp $(TESTPATCH);
>   
>   dist-all-rpms: dist-sources
>  diff --git a/redhat/Makefile.common b/redhat/Makefile.common
>  index b335f3c77c7d..fc3189b6948e 100644
>  --- a/redhat/Makefile.common
>  +++ b/redhat/Makefile.common
>  @@ -81,7 +81,6 @@ RPM:=$(REDHAT)/rpm
>   SRPMS:=$(RPM)/SRPMS
>   SOURCES:=$(RPM)/SOURCES
>   TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
>  -FILTERDIFF:=/usr/bin/filterdiff -x '*redhat/*' -x '*/.gitignore' -x
> '*/makefile' -x '*/Makefile'
>   ARCH_LIST=aarch64 ppc64le s390x x86_64
>   # Make can't match on a regex to match fc31, fc32 so add another check here
>   # A unified tarball means that the tarball in the srpm contains both the
>  -- 
>  GitLab
>   
-- 
[]'s
Herton

[Prarit Bhargava]

On 12/2/20 4:49 PM, GitLab Bridge on behalf of dzickusrh wrote:
>  From: Don Zickus <dzickus(a)redhat.com&gt;
>
>  Long ago, we needed the ability to filter out files and directories
>  from patches.  Now that ability is built into git a few years ago,
>  let's use that instead of filterdiff.
>
>  One less tool to depend on and require.
>  
Acked-by: Prarit Bhargava <prarit(a)redhat.com&gt;

P.

[GitLab Bridge on behalf of Bastien Nocera]

From: Bastien Nocera on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/780#note_46052...

Can you add a "Closes: #34" ?

Looks good to me.

[GitLab Bridge on behalf of Patrick Talbert]

From: Patrick Talbert on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/780#note_46396...

Can this be updated to conform with !670?

[OS-BUILD PATCHv2] Remove filterdiff and use native git instead

[GitLab Bridge on behalf of dzickusrh]

From: Don Zickus <dzickus(a)redhat.com&gt;

Closes: #34

Long ago, we needed the ability to filter out files and directories
from patches.  Now that ability is built into git a few years ago,
let's use that instead of filterdiff.

One less tool to depend on and require.

V2: rebase and fix conflicts

Cc: Bastien Nocera <bnocera(a)redhat.com&gt;
Cc: Herton Krzesinski <hkrzesin(a)redhat.com&gt;
Signed-off-by: Don Zickus <dzickus(a)redhat.com&gt;
---
 redhat/Makefile        | 23 ++++++++++-------------
 redhat/Makefile.common |  1 -
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/redhat/Makefile b/redhat/Makefile
index c807609fbf21..f6bc167c163f 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -220,18 +220,17 @@ setup-source: dist-git-version-check dist-clean-sources
 	@$(REDHAT)/genspec.sh $(SOURCES) $(SOURCES)/$(SPECFILE) $(SOURCES)/$(CHANGELOG)
$(PKGRELEASE) $(RPMKVERSION) $(RPMKPATCHLEVEL) $(RPMKSUBLEVEL) $(DISTRO_BUILD)
$(RELEASED_KERNEL) $(SPECRELEASE) $(__ZSTREAM) "$(BUILDOPTS)" $(MARKER) `cat
$(REDHAT)/marker` $(SINGLE_TARBALL) $(TARFILE_RELEASE) $(SNAPSHOT) $(BUILDID)
 	@cp $(SOURCES)/$(SPECFILE) $(SOURCES)/../SPECS/
 
-sources-rh: $(TARBALL)
+generate-testpatch-tmp:
+	@(GIT) diff --no-renames HEAD ":(exclude,top).get_maintainer.conf" \
+		":(exclude,top).gitattributes" \
+		":(exclude,top).gitignore" \
+		":(exclude,top)makefile" \
+		":(exclude,top)Makefile.rhelver" \
+		":(exclude,top)redhat" > $(TESTPATCH).tmp
+
+sources-rh: $(TARBALL) generate-testpatch-tmp
 	@cp -l $(TARBALL) $(SOURCES)/ || cp $(TARBALL) $(SOURCES)/
 	@touch $(TESTPATCH)
-	@$(GIT) diff --no-renames HEAD > $(TESTPATCH).tmp
-	@# 1) filterdiff will return crap from the patches it just filtered,
-	@#    that's why egrep is needed so if there're changes under redhat/
-	@#    but not everywhere else, it will be empty just like
-	@#    linux-kernel-test.patch
-	@# 2) egrep -v will return "1" if it sucessfully removed index and diff
-	@#    lines, which will be considered an error
-	@($(FILTERDIFF) $(TESTPATCH).tmp | egrep -v "^index|^diff"
>$(TESTPATCH).tmp2; true)
-	@mv $(TESTPATCH).tmp2 $(TESTPATCH).tmp
 	@diff $(TESTPATCH).tmp $(TESTPATCH) > /dev/null || \
 		echo "WARNING: There are uncommitted changes in your tree or the changes are not
in sync with linux-kernel-test.patch.  Either commit the changes or run 'make
dist-test-patch'"
 	@rm $(TESTPATCH).tmp
@@ -268,9 +267,7 @@ sources-rh: $(TARBALL)
 
 dist-sources: setup-source dist-configs-check dist-kabi dist-kabi-dup sources-rh
 
-dist-test-patch:
-	@$(GIT) diff --no-renames HEAD > $(TESTPATCH);
-	@($(FILTERDIFF) $(TESTPATCH) | egrep -v "^index|^diff" >$(TESTPATCH).tmp;
true)
+dist-test-patch: generate-testpatch-tmp
 	@mv $(TESTPATCH).tmp $(TESTPATCH);
 
 dist-all-rpms: dist-sources
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index cdffa9fb3d3d..5e6fcd999e58 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -82,7 +82,6 @@ RPM:=$(REDHAT)/rpm
 SRPMS:=$(RPM)/SRPMS
 SOURCES:=$(RPM)/SOURCES
 TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
-FILTERDIFF:=/usr/bin/filterdiff -x '*redhat/*' -x '*/.gitignore' -x
'*/makefile' -x '*/Makefile'
 ARCH_LIST=aarch64 ppc64le s390x x86_64
 # Make can't match on a regex to match fc31, fc32 so add another check here
 # A unified tarball means that the tarball in the srpm contains both the
-- 
GitLab

[OS-BUILD PATCHv2] Remove filterdiff and use native git instead

[Herton R. Krzesinski]

On Thu, Dec 10, 2020 at 06:31:25PM -0000, GitLab Bridge on behalf of dzickusrh wrote:
>  From: Don Zickus <dzickus(a)redhat.com&gt;
>  
>  Closes: #34
>  
>  Long ago, we needed the ability to filter out files and directories
>  from patches.  Now that ability is built into git a few years ago,
>  let's use that instead of filterdiff.
>  
>  One less tool to depend on and require.
>  
>  V2: rebase and fix conflicts
>  
>  Cc: Bastien Nocera <bnocera(a)redhat.com&gt;
>  Cc: Herton Krzesinski <hkrzesin(a)redhat.com&gt;
>  Signed-off-by: Don Zickus <dzickus(a)redhat.com&gt;
>  ---
>   redhat/Makefile        | 23 ++++++++++-------------
>   redhat/Makefile.common |  1 -
>   2 files changed, 10 insertions(+), 14 deletions(-)
>  
>  diff --git a/redhat/Makefile b/redhat/Makefile
>  index c807609fbf21..f6bc167c163f 100644
>  --- a/redhat/Makefile
>  +++ b/redhat/Makefile
>  @@ -220,18 +220,17 @@ setup-source: dist-git-version-check dist-clean-sources
>   	@$(REDHAT)/genspec.sh $(SOURCES) $(SOURCES)/$(SPECFILE) $(SOURCES)/$(CHANGELOG)
> $(PKGRELEASE) $(RPMKVERSION) $(RPMKPATCHLEVEL) $(RPMKSUBLEVEL) $(DISTRO_BUILD)
> $(RELEASED_KERNEL) $(SPECRELEASE) $(__ZSTREAM) "$(BUILDOPTS)" $(MARKER) `cat
> $(REDHAT)/marker` $(SINGLE_TARBALL) $(TARFILE_RELEASE) $(SNAPSHOT) $(BUILDID)
>   	@cp $(SOURCES)/$(SPECFILE) $(SOURCES)/../SPECS/
>   
>  -sources-rh: $(TARBALL)
>  +generate-testpatch-tmp:
>  +	@(GIT) diff --no-renames HEAD ":(exclude,top).get_maintainer.conf" \
>  +		":(exclude,top).gitattributes" \
>  +		":(exclude,top).gitignore" \
>  +		":(exclude,top)makefile" \
>  +		":(exclude,top)Makefile.rhelver" \
>  +		":(exclude,top)redhat" > $(TESTPATCH).tmp
>  +
>  +sources-rh: $(TARBALL) generate-testpatch-tmp
>   	@cp -l $(TARBALL) $(SOURCES)/ || cp $(TARBALL) $(SOURCES)/
>   	@touch $(TESTPATCH)
>  -	@$(GIT) diff --no-renames HEAD > $(TESTPATCH).tmp
>  -	@# 1) filterdiff will return crap from the patches it just filtered,
>  -	@#    that's why egrep is needed so if there're changes under redhat/
>  -	@#    but not everywhere else, it will be empty just like
>  -	@#    linux-kernel-test.patch
>  -	@# 2) egrep -v will return "1" if it sucessfully removed index and diff
>  -	@#    lines, which will be considered an error
>  -	@($(FILTERDIFF) $(TESTPATCH).tmp | egrep -v "^index|^diff"
> >$(TESTPATCH).tmp2; true)
>  -	@mv $(TESTPATCH).tmp2 $(TESTPATCH).tmp
>   	@diff $(TESTPATCH).tmp $(TESTPATCH) > /dev/null || \
>   		echo "WARNING: There are uncommitted changes in your tree or the changes are not
> in sync with linux-kernel-test.patch.  Either commit the changes or run 'make
> dist-test-patch'"
>   	@rm $(TESTPATCH).tmp
>  @@ -268,9 +267,7 @@ sources-rh: $(TARBALL)
>   
>   dist-sources: setup-source dist-configs-check dist-kabi dist-kabi-dup sources-rh
>   
>  -dist-test-patch:
>  -	@$(GIT) diff --no-renames HEAD > $(TESTPATCH);
>  -	@($(FILTERDIFF) $(TESTPATCH) | egrep -v "^index|^diff" >$(TESTPATCH).tmp;
> true)
>  +dist-test-patch: generate-testpatch-tmp
>   	@mv $(TESTPATCH).tmp $(TESTPATCH);
>   
>   dist-all-rpms: dist-sources
>  diff --git a/redhat/Makefile.common b/redhat/Makefile.common
>  index cdffa9fb3d3d..5e6fcd999e58 100644
>  --- a/redhat/Makefile.common
>  +++ b/redhat/Makefile.common
>  @@ -82,7 +82,6 @@ RPM:=$(REDHAT)/rpm
>   SRPMS:=$(RPM)/SRPMS
>   SOURCES:=$(RPM)/SOURCES
>   TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
>  -FILTERDIFF:=/usr/bin/filterdiff -x '*redhat/*' -x '*/.gitignore' -x
> '*/makefile' -x '*/Makefile'
>   ARCH_LIST=aarch64 ppc64le s390x x86_64
>   # Make can't match on a regex to match fc31, fc32 so add another check here
>   # A unified tarball means that the tarball in the srpm contains both the
>  -- 
>  GitLab
>   
Acked-by: Herton R. Krzesinski <herton(a)redhat.com&gt;

-- 
[]'s
Herton

[OS-BUILD PATCHv2] Remove filterdiff and use native git instead

[GitLab Bridge on behalf of CKI Bot]

From: CKI Bot on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/780#note_46438...

ACK/NACK Summary: Missing - ACKed by Herton R. Krzesinski
<herton(a)redhat.com&gt;*, Prarit Bhargava <prarit(a)redhat.com&gt;. Requires at
least 1 ACK(s) from someone in the set jstancek(a)redhat.com*,
jlelli(a)redhat.com*, jforbes(a)redhat.com*, lgoncalv(a)redhat.com*,
fhrbata(a)redhat.com*, williams(a)redhat.com*, ptalbert(a)redhat.com*,
bmasney(a)redhat.com*, rvrbovsk(a)redhat.com*, bmeneg(a)redhat.com*,
trix(a)redhat.com*, dvlasenk(a)redhat.com*, acaringi(a)redhat.com*. Code
owners are marked with a *.

[OS-BUILD PATCHv2] Remove filterdiff and use native git instead

[GitLab Bridge on behalf of Brian Masney]

From: Brian Masney on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/780#note_46497...

Acked-by: Brian Masney <bmasney(a)redhat.com&gt;

[OS-BUILD PATCHv2] Remove filterdiff and use native git instead

[GitLab Bridge on behalf of Patrick Talbert]

From: Patrick Talbert on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/780#note_46506...

🙂

[OS-BUILD PATCHv2] Remove filterdiff and use native git instead

[GitLab Bridge on behalf of Patrick Talbert]

From: Patrick Talbert on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/780#note_46506...

request-evaluation

[OS-BUILD PATCHv2] Remove filterdiff and use native git instead

[GitLab Bridge on behalf of CKI Bot]

From: CKI Bot on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/780#note_46511...

ACK/NACK Summary: OK - ACKed by Prarit Bhargava <prarit(a)redhat.com&gt;,
Brian Masney <bmasney(a)redhat.com&gt;*, Herton R. Krzesinski
<herton(a)redhat.com&gt;*. Code owners are marked with a *.

[OS-BUILD PATCHv2] Remove filterdiff and use native git instead

[GitLab Bridge on behalf of CKI Bot]

From: CKI Bot on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/780#note_46511...

ACK/NACK Summary: OK - ACKed by Prarit Bhargava <prarit(a)redhat.com&gt;,
Brian Masney <bmasney(a)redhat.com&gt;*, Herton R. Krzesinski
<herton(a)redhat.com&gt;*. Code owners are marked with a *.

[OS-BUILD PATCHv2] Remove filterdiff and use native git instead

[GitLab Bridge on behalf of CKI Bot]

From: CKI Bot on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/780#note_46511...

ACK/NACK Summary: OK - ACKed by Prarit Bhargava <prarit(a)redhat.com&gt;,
Brian Masney <bmasney(a)redhat.com&gt;*, Herton R. Krzesinski
<herton(a)redhat.com&gt;*. Code owners are marked with a *.