Patchwork [PATCHv2,1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS}

login
register
mail settings
Submitter Khem Raj
Date May 19, 2011, 11:52 p.m.
Message ID <0a1ad440f372eec668b742c775188249c9609f11.1305848960.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/4513/
State New, archived
Headers show

Comments

Khem Raj - May 19, 2011, 11:52 p.m.
Remove headerfix.patch, its already applied upstream

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/opkg/opkg/headerfix.patch |   19 -------------------
 meta/recipes-devtools/opkg/opkg_svn.bb          |    3 +--
 2 files changed, 1 insertions(+), 21 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch
Richard Purdie - May 20, 2011, 11:49 a.m.
On Thu, 2011-05-19 at 16:52 -0700, Khem Raj wrote:
> Remove headerfix.patch, its already applied upstream
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-devtools/opkg/opkg/headerfix.patch |   19 -------------------
>  meta/recipes-devtools/opkg/opkg_svn.bb          |    3 +--
>  2 files changed, 1 insertions(+), 21 deletions(-)
>  delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch
[...]
> diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
> index 5964a47..dfe71e5 100644
> --- a/meta/recipes-devtools/opkg/opkg_svn.bb
> +++ b/meta/recipes-devtools/opkg/opkg_svn.bb
> @@ -34,7 +33,7 @@ do_install_append() {
>  pkg_postinst_${PN} () {
>  #!/bin/sh
>  if [ "x$D" != "x" ]; then
> -	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
> +	install -d ${D}/${sysconfdir}/rcS.d
>  	# this happens at S98 where our good 'ole packages script used to run
>  	echo "#!/bin/sh
>  opkg-cl configure

This needs to be $D, I didn't miss the brackets in my previous email :)

Cheers,

Richard
Khem Raj - May 20, 2011, 6:28 p.m.
On Fri, May 20, 2011 at 4:49 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> This needs to be $D, I didn't miss the brackets in my previous email :)
>
>

but that wont be relative right ? it will encode current builddir into
sstate isnt it ?
Richard Purdie - May 20, 2011, 10:57 p.m.
On Fri, 2011-05-20 at 11:28 -0700, Khem Raj wrote:
> On Fri, May 20, 2011 at 4:49 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >
> > This needs to be $D, I didn't miss the brackets in my previous email :)
> >
> >
> 
> but that wont be relative right ? it will encode current builddir into
> sstate isnt it ?

No, that is what the ${D} you used will do.

$D gets set when we run the postinstall to the path to the rootfs (see
the rootfs bbclass files). We use $D deliberately so bitbake doesn't
expand it (as used elsewhere in postinstalls).

Cheers,

Richard
Khem Raj - May 20, 2011, 11:13 p.m.
On Fri, May 20, 2011 at 3:57 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Fri, 2011-05-20 at 11:28 -0700, Khem Raj wrote:
>> On Fri, May 20, 2011 at 4:49 AM, Richard Purdie
>> <richard.purdie@linuxfoundation.org> wrote:
>> >
>> > This needs to be $D, I didn't miss the brackets in my previous email :)
>> >
>> >
>>
>> but that wont be relative right ? it will encode current builddir into
>> sstate isnt it ?
>
> No, that is what the ${D} you used will do.
>
> $D gets set when we run the postinstall to the path to the rootfs (see
> the rootfs bbclass files). We use $D deliberately so bitbake doesn't
> expand it (as used elsewhere in postinstalls).
>

hmmm ok I see yeah ${} will get expanded by bitbake. Will make the
change and resend

> Cheers,
>
> Richard
>
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-devtools/opkg/opkg/headerfix.patch b/meta/recipes-devtools/opkg/opkg/headerfix.patch
deleted file mode 100644
index b3515a0..0000000
--- a/meta/recipes-devtools/opkg/opkg/headerfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@ 
-Without this, the FILE reference in this header can cause compile issues.
-
-RP - 29/1/10
-
-Upstream-Status: Pending
-
-Index: trunk/libopkg/pkg_dest.h
-===================================================================
---- trunk.orig/libopkg/pkg_dest.h	2010-01-29 09:37:22.000000000 +0000
-+++ trunk/libopkg/pkg_dest.h	2010-01-29 09:37:33.000000000 +0000
-@@ -18,6 +18,8 @@
- #ifndef PKG_DEST_H
- #define PKG_DEST_H
- 
-+#include <stdio.h>
-+
- typedef struct pkg_dest pkg_dest_t;
- struct pkg_dest
- {
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 5964a47..dfe71e5 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -11,7 +11,6 @@  RREPLACES_${PN} = "opkg-nogpg"
 
 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
            file://add_vercmp.patch \
-           file://headerfix.patch \
 "
 
 S = "${WORKDIR}/trunk"
@@ -34,7 +33,7 @@  do_install_append() {
 pkg_postinst_${PN} () {
 #!/bin/sh
 if [ "x$D" != "x" ]; then
-	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+	install -d ${D}/${sysconfdir}/rcS.d
 	# this happens at S98 where our good 'ole packages script used to run
 	echo "#!/bin/sh
 opkg-cl configure