| Submitter | Saul Wold |
|---|---|
| Date | May 21, 2011, 6:38 p.m. |
| Message ID | <353951f9ba342f8caabe1600d7b66658dc925223.1306002889.git.sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/4581/ |
| State | New, archived |
| Headers | show |
Comments
On Sat, May 21, 2011 at 11:38 AM, Saul Wold <sgw@linux.intel.com> wrote: > From: Khem Raj <raj.khem@gmail.com> > > Remove headerfix.patch, its already applied upstream > This patch had reviews to be addressed which I have done the patch is updated in pull branch. Use that one > 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 > -- > 1.7.3.4 > >
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