[gentoo-commits] repo/gentoo:master commit in: dev-util/bootconfig/

[Sam James]

commit:     e1bfef38a962560d37781ca63dce6338f9c06dba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 23 14:47:09 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 14:47:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1bfef38

dev-util/bootconfig: fix filterdiff use

See 691f5d53899938ee921c032ee027e90c1f4a28e6.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/bootconfig/bootconfig-6.6.ebuild | 5 +++--
 dev-util/bootconfig/bootconfig-6.9.ebuild | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-util/bootconfig/bootconfig-6.6.ebuild 
b/dev-util/bootconfig/bootconfig-6.6.ebuild
index 487db83fc96d..7ac49d14eeda 100644
--- a/dev-util/bootconfig/bootconfig-6.6.ebuild
+++ b/dev-util/bootconfig/bootconfig-6.6.ebuild
@@ -61,9 +61,10 @@ src_unpack() {
        if [[ -n ${LINUX_PATCH} ]] ; then
                eshopts_push -o noglob
                ebegin "Filtering partial source patch"
-               filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-                       > ${P}.patch
+               xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 
${paths[@]/#/-i} > ${P}.patch
+               assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} 
failed"
                eend $? || die "filterdiff failed"
+               test -s ${P}.patch || die "patch is empty?!"
                eshopts_pop
        fi
 

diff --git a/dev-util/bootconfig/bootconfig-6.9.ebuild 
b/dev-util/bootconfig/bootconfig-6.9.ebuild
index 487db83fc96d..7ac49d14eeda 100644
--- a/dev-util/bootconfig/bootconfig-6.9.ebuild
+++ b/dev-util/bootconfig/bootconfig-6.9.ebuild
@@ -61,9 +61,10 @@ src_unpack() {
        if [[ -n ${LINUX_PATCH} ]] ; then
                eshopts_push -o noglob
                ebegin "Filtering partial source patch"
-               filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} 
\
-                       > ${P}.patch
+               xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 
${paths[@]/#/-i} > ${P}.patch
+               assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} 
failed"
                eend $? || die "filterdiff failed"
+               test -s ${P}.patch || die "patch is empty?!"
                eshopts_pop
        fi