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

login
register
mail settings
Submitter Khem Raj
Date May 20, 2011, 11:19 p.m.
Message ID <43cfb965113150ea56c55c3880b67ba272b3c719.1305933509.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/4561/
State New, archived
Headers show

Comments

Khem Raj - May 20, 2011, 11:19 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
Saul Wold - May 20, 2011, 11:30 p.m.
On 05/20/2011 04:19 PM, Khem Raj wrote:
> Remove headerfix.patch, its already applied upstream
>
Minor nit, should be $D in the subject line also right?

Sau!

> 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/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..3f2c22b 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
Khem Raj - May 21, 2011, 12:41 a.m.
On (20/05/11 16:30), Saul Wold wrote:
> On 05/20/2011 04:19 PM, Khem Raj wrote:
> >Remove headerfix.patch, its already applied upstream
> >
> Minor nit, should be $D in the subject line also right?

OK it should. I have amended the commit and refreshed pull branch

> 
> Sau!
> 
> >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/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..3f2c22b 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
>
Phil Blundell - May 21, 2011, 8 a.m.
On Fri, 2011-05-20 at 16:19 -0700, Khem Raj wrote:
> -	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
> +	install -d $D/${sysconfdir}/rcS.d

Just as a note in passing, this sort of thing is best written as:

	install -d "${D}${sysconfdir}/rcS.d"

i.e. you don't need a slash after ${D}, and the whole argument should
ideally be quoted to protect against characters that are special to the
shell.

p.
Khem Raj - May 21, 2011, 11:04 p.m.
On Sat, May 21, 2011 at 1:00 AM, Phil Blundell <pb@pbcl.net> wrote:
> On Fri, 2011-05-20 at 16:19 -0700, Khem Raj wrote:
>> -     install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
>> +     install -d $D/${sysconfdir}/rcS.d
>
> Just as a note in passing, this sort of thing is best written as:
>
>        install -d "${D}${sysconfdir}/rcS.d"
>
> i.e. you don't need a slash after ${D}, and the whole argument should
> ideally be quoted to protect against characters that are special to the
> shell.

ok done and patch is in pull branch with this fixed
>
> p.
>
>
>
> _______________________________________________
> 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..3f2c22b 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