From patchwork Sat May 21 18:38:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [7/8] opkg_svn.bb: Install rcS.d into $D instead of $IMAGE_ROOTFS Date: Sat, 21 May 2011 18:38:03 -0000 From: Saul Wold X-Patchwork-Id: 4581 Message-Id: <353951f9ba342f8caabe1600d7b66658dc925223.1306002889.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Khem Raj Remove headerfix.patch, its already applied upstream Signed-off-by: Khem Raj --- 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 -+ - 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