Re: [PATCH] opkg: Ensure we use the uname/gname fields when extracting tarballs

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2783 bytes --]

On Fri, Nov 11, 2011 at 05:45:28PM +0000, Richard Purdie wrote:
> When extracting packages onto the target system in particular, we really
> want to ensure the name fields in the tarball are used over and above
> the numerical uid/gid values. This patch adds this functionality to opkg
> and ensures package upgrades work correctly permission wise
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

doesn't apply, seems like some parts are twice.. add_uname_support.patch
is somehow added twice and opkg_svn.bb change is there also twice (one
is empty).

OE @ ~/shr-core/openembedded-core $ pw-am.sh.oe-core 14859
2011-11-12 12:09:15
URL:http://patchwork.openembedded.org/patch/14859/mbox/ [7429] ->
"pw-am-14859.patch" [1]
Applying: opkg: Ensure we use the uname/gname fields when extracting
tarballs
fatal: git apply: bad git-diff - expected /dev/null on line 7
Patch failed at 0001 opkg: Ensure we use the uname/gname fields when
extracting tarballs
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


> diff --git a/meta/recipes-devtools/opkg/opkg/add_uname_support.patch b/meta/recipes-devtools/opkg/opkg/add_uname_support.patch
> new file mode 100644
> index 0000000..885f75f
> --- a/dev/null
> +++ b/meta/recipes-devtools/opkg/opkg/add_uname_support.patch
> @@ -0,0 +1,85 @@
> +When updating packages on the target device we ideally want to match 
...

> diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
> index 099a373..8f50f67 10From a781e059562e91c6467be7c4aac43561413b3703 Mon Sep 17 00:00:00 2001
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> Date: Fri, 11 Nov 2011 17:17:01 +0000
> Subject: opkg: Ensure we use the uname/gname fields when extracting tarballs
> 
> ---
> diff --git a/meta/recipes-devtools/opkg/opkg/add_uname_support.patch b/meta/recipes-devtools/opkg/opkg/add_uname_support.patch
> new file mode 100644
> index 0000000..885f75f
> --- a/dev/null
> +++ b/meta/recipes-devtools/opkg/opkg/add_uname_support.patch
> @@ -0,0 +1,85 @@
> +When updating packages on the target device we ideally want to match 
....
> diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
> index 099a373..8f50f67 100644
> --- a/meta/recipes-devtools/opkg/opkg_svn.bb
> +++ b/meta/recipes-devtools/opkg/opkg_svn.bb
> @@ -11,13 +11,14 @@ RREPLACES_${PN} = "opkg-nogpg"
>  
>  SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
>             file://add_vercmp.patch \
...

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]