[ptxdist] [PATCH] Add support for xz'd patches

[ptxdist] [PATCH] Add support for xz'd patches

[Bernhard Walle]

Since kernel.org provides their patches as .xz-compressed files, that's
quite useful.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 scripts/lib/ptxd_make_world_patchin.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh
index 8f9bd42..d9d1494 100644
--- a/scripts/lib/ptxd_make_world_patchin.sh
+++ b/scripts/lib/ptxd_make_world_patchin.sh
@@ -76,7 +76,7 @@ export -f ptxd_make_world_patchin_apply_git_init
 # create a directory containing the patches and the selected series
 # file. name that file "series".
 #
-# decompress "bz2" and "gz" patches on the fly
+# decompress "bz2", "gz" and "xz" patches on the fly
 #
 ptxd_make_world_patchin_apply_git_compat()
 {
@@ -106,6 +106,7 @@ ptxd_make_world_patchin_apply_git_compat()
 	    ""|"#"*) continue ;;	# skip empty lines and comments
 	    *.gz)  cat="zcat" ;;
 	    *.bz2) cat="bzcat" ;;
+	    *.xz)  cat="xzcat" ;;
 	    *)
 		ln -s "../patches/${patch}" "${pkg_patchin_dir}/.ptxdist/git-patches/${patch_file}" &&
 		echo "${patch_file}" "${para}" >> "${pkg_patchin_dir}/.ptxdist/git-patches/series" || return
@@ -180,6 +181,7 @@ ptxd_make_world_patchin_apply_patch()
 	    ""|"#"*) continue ;;	# skip empty lines and comments
 	    *.gz)    cat=zcat ;;
 	    *.bz2)   cat=bzcat ;;
+	    *.xz)    cat=xzcat ;;
 	    *)       cat=cat ;;
 	esac
 
@@ -259,6 +261,7 @@ ptxd_make_world_patchin_apply()
 	find \
 	    -name "*.diff" -o \
 	    -name "*.patch" -o \
+	    -name "*.xz" -o \
 	    -name "*.bz2" -o \
 	    -name "*.gz" | \
 	    sed -e "s:^[.]/::" | sort > \
-- 
1.8.2.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] Add support for xz'd patches

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 518 bytes --]

On 04/29/2013 01:27 PM, Bernhard Walle wrote:
> Since kernel.org provides their patches as .xz-compressed files, that's
> quite useful.
> 
> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>

Does quilt support .xz'ed patches?

Marc
-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

[-- Attachment #2: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] Add support for xz'd patches

[Bernhard Walle]

* Marc Kleine-Budde <mkl@pengutronix.de> [2013-04-29 13:29]:
> On 04/29/2013 01:27 PM, Bernhard Walle wrote:
> > Since kernel.org provides their patches as .xz-compressed files, that's
> > quite useful.
> > 
> > Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> 
> Does quilt support .xz'ed patches?

Yes (at least in version 0.60).

Regards,
Bernhard
-- 
_________________________________________________________________
Bernhard Walle              Tel.  +49 9131 6103836          (o_
Buckenhofer Weg 63          Fax   +49 9131 6103835          //\
D-91058 Erlangen            Mobil +49 176 45502793          V_/_

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] Add support for xz'd patches

[Bernhard Walle]

Am 2013-04-29 13:35, schrieb Bernhard Walle:

> _________________________________________________________________
> Bernhard Walle              Tel.  +49 XXXX XXXXXX          (o_
> Buckenhofer Weg 63          Fax   +49 XXXX XXXXXX          //\
> D-91058 Erlangen            Mobil +49 XXX XXXXXXX          V_/_

Arg, that comes from replying in my INBOX :(

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] Add support for xz'd patches

[Michael Olbrich]

On Mon, Apr 29, 2013 at 01:27:09PM +0200, Bernhard Walle wrote:
> Since kernel.org provides their patches as .xz-compressed files, that's
> quite useful.

Thanks, applied.

Michael

> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
>  scripts/lib/ptxd_make_world_patchin.sh | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh
> index 8f9bd42..d9d1494 100644
> --- a/scripts/lib/ptxd_make_world_patchin.sh
> +++ b/scripts/lib/ptxd_make_world_patchin.sh
> @@ -76,7 +76,7 @@ export -f ptxd_make_world_patchin_apply_git_init
>  # create a directory containing the patches and the selected series
>  # file. name that file "series".
>  #
> -# decompress "bz2" and "gz" patches on the fly
> +# decompress "bz2", "gz" and "xz" patches on the fly
>  #
>  ptxd_make_world_patchin_apply_git_compat()
>  {
> @@ -106,6 +106,7 @@ ptxd_make_world_patchin_apply_git_compat()
>  	    ""|"#"*) continue ;;	# skip empty lines and comments
>  	    *.gz)  cat="zcat" ;;
>  	    *.bz2) cat="bzcat" ;;
> +	    *.xz)  cat="xzcat" ;;
>  	    *)
>  		ln -s "../patches/${patch}" "${pkg_patchin_dir}/.ptxdist/git-patches/${patch_file}" &&
>  		echo "${patch_file}" "${para}" >> "${pkg_patchin_dir}/.ptxdist/git-patches/series" || return
> @@ -180,6 +181,7 @@ ptxd_make_world_patchin_apply_patch()
>  	    ""|"#"*) continue ;;	# skip empty lines and comments
>  	    *.gz)    cat=zcat ;;
>  	    *.bz2)   cat=bzcat ;;
> +	    *.xz)    cat=xzcat ;;
>  	    *)       cat=cat ;;
>  	esac
>  
> @@ -259,6 +261,7 @@ ptxd_make_world_patchin_apply()
>  	find \
>  	    -name "*.diff" -o \
>  	    -name "*.patch" -o \
> +	    -name "*.xz" -o \
>  	    -name "*.bz2" -o \
>  	    -name "*.gz" | \
>  	    sed -e "s:^[.]/::" | sort > \
> -- 
> 1.8.2.2
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de