summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-05-19 16:45:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-23 15:36:32 +0100
commit806698aa08f0347fbec60887f4e0437ff3bb39db (patch)
treeffbbe1b3c8a9d398a3a7668b946a673239448ad1
parent5148a490fdc9f034f31827fd18cc96060fccecf0 (diff)
downloadpoky-806698aa08f0347fbec60887f4e0437ff3bb39db.tar.gz
opkg_svn.bb: Install rcS.d into $D instead of $IMAGE_ROOTFS
Remove headerfix.patch, its already applied upstream (From OE-Core rev: a0edaaa805fa2576092ca9d1248d8cef7b27d827) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg/headerfix.patch19
-rw-r--r--meta/recipes-devtools/opkg/opkg_svn.bb3
2 files changed, 1 insertions, 21 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/headerfix.patch b/meta/recipes-devtools/opkg/opkg/headerfix.patch
deleted file mode 100644
index b3515a0f8e..0000000000
--- a/meta/recipes-devtools/opkg/opkg/headerfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Without this, the FILE reference in this header can cause compile issues.
2
3RP - 29/1/10
4
5Upstream-Status: Pending
6
7Index: trunk/libopkg/pkg_dest.h
8===================================================================
9--- trunk.orig/libopkg/pkg_dest.h 2010-01-29 09:37:22.000000000 +0000
10+++ trunk/libopkg/pkg_dest.h 2010-01-29 09:37:33.000000000 +0000
11@@ -18,6 +18,8 @@
12 #ifndef PKG_DEST_H
13 #define PKG_DEST_H
14
15+#include <stdio.h>
16+
17 typedef struct pkg_dest pkg_dest_t;
18 struct pkg_dest
19 {
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 5964a474f1..5f07c17232 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"
11 11
12SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ 12SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
13 file://add_vercmp.patch \ 13 file://add_vercmp.patch \
14 file://headerfix.patch \
15" 14"
16 15
17S = "${WORKDIR}/trunk" 16S = "${WORKDIR}/trunk"
@@ -34,7 +33,7 @@ do_install_append() {
34pkg_postinst_${PN} () { 33pkg_postinst_${PN} () {
35#!/bin/sh 34#!/bin/sh
36if [ "x$D" != "x" ]; then 35if [ "x$D" != "x" ]; then
37 install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d 36 install -d $D${sysconfdir}/rcS.d
38 # this happens at S98 where our good 'ole packages script used to run 37 # this happens at S98 where our good 'ole packages script used to run
39 echo "#!/bin/sh 38 echo "#!/bin/sh
40opkg-cl configure 39opkg-cl configure