Skip to contentSkip to conversation

Opkg and distcc fix

PATCH In review Khem Raj 6 participants 17 messages May 20, 2011 – May 23, 2011

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

cover Opkg and distcc fix

These are remaining patches which needed rework.

The following changes since commit c26dadc799cd9c7df66c3bccfc9f21146c35625a:

  opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} (2011-05-20 16:15:29 -0700)

are available in the git repository at:
[email protected]:openembedded-core-contrib.git kraj/misc-fixes
http://cgit.openembedded.org/cgit.cgi//log/?h=kraj/misc-fixes

Khem Raj (2):
opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} distcc_2.18.3.bb: Fix compilation on uclibc

 meta/recipes-devtools/distcc/distcc_2.18.3.bb   |   17 ++++++++++++-----
 meta/recipes-devtools/opkg/opkg/headerfix.patch |   19 -------------------
 meta/recipes-devtools/opkg/opkg_svn.bb          |    3 +--
 3 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch
Signature · 1 line
1.7.4.1
author
#1 lore raw

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

Remove headerfix.patch, its already applied upstream

---
 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
meta/recipes-devtools/opkg/opkg/headerfix.patch deleted +0 -19
deleted file mode 100644
index b3515a0..0000000
@@ -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
- {
meta/recipes-devtools/opkg/opkg_svn.bb +1 -2
index 5964a47..3f2c22b 100644
@@ -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
Signature · 1 line
1.7.4.1
author
#2 lore raw

PATCH 2/2 distcc_2.18.3.bb: Fix compilation on uclibc

We enable gtk/gnome in distcc that code uses loadavg() a function unimplemented in uclibc. Therefore for uclibc we disable gnome and gtk+ features in distcc

---
 meta/recipes-devtools/distcc/distcc_2.18.3.bb |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
meta/recipes-devtools/distcc/distcc_2.18.3.bb +12 -5
index 1f5c2af..a15858c 100644
@@ -6,7 +6,10 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 PR = "r6"
 
-DEPENDS = "avahi gtk+"
+DEPENDS = "avahi ${GTKDEP}"
+GTKDEP-libc-uclibc = ""
+GTKDEP = "gtk+"
+
 RRECOMMENDS_${PN} = "avahi-daemon"
 
 # Upstream change this patch periodically so store locally
@@ -24,17 +27,21 @@ inherit autotools pkgconfig update-rc.d
 
 INITSCRIPT_NAME = "distcc"
 
-EXTRA_OECONF = " --with-gtk "
-
+EXTRA_OECONF_libc-glibc = " --with-gtk "
+EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome "
 do_install_append() {
     install -d ${D}${sysconfdir}/init.d/
     install -d ${D}${sysconfdir}/default
     install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
     install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
+    ${DESKTOPINSTALL}
+}
+DESKTOPINSTALL = ""
+DESKTOPINSTALL_libc-glibc () {
+    install -d ${D}${datadir}/distcc/
     install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/
 }
-
-PACKAGES += "distcc-distmon-gnome"
+PACKAGES_append_libc-glibc = " distcc-distmon-gnome"
 
 FILES_${PN} = " ${sysconfdir} \
 		${bindir}/distcc \
Signature · 1 line
1.7.4.1
#3 lore raw

Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc

Quoted 14 lines · Khem Raj

We enable gtk/gnome in distcc that code uses loadavg() a function unimplemented in uclibc. Therefore for uclibc we disable gnome and gtk+ features in distcc

---
 meta/recipes-devtools/distcc/distcc_2.18.3.bb |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
meta/recipes-devtools/distcc/distcc_2.18.3.bb +0 -0
index 1f5c2af..a15858c 100644

meta/recipes-devtools/distcc/distcc_2.18.3.bb LICENSE = "GPLv2" · line 11

Quoted 7 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +3 -1
@@ -6,7 +6,10 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 PR = "r6"
 
-DEPENDS = "avahi gtk+"
+DEPENDS = "avahi ${GTKDEP}"
+GTKDEP-libc-uclibc = ""
+GTKDEP = "gtk+"

return -ENOTTESTED;

;-)

Cheers,

Richard

author
#4 lore raw

Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc

Quoted 18 lines · Richard Purdie
Quoted 17 lines · Khem Raj

We enable gtk/gnome in distcc that code uses loadavg() a function unimplemented in uclibc. Therefore for uclibc we disable gnome and gtk+ features in distcc

---
 meta/recipes-devtools/distcc/distcc_2.18.3.bb |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
meta/recipes-devtools/distcc/distcc_2.18.3.bb +0 -0
index 1f5c2af..a15858c 100644
@@ -6,7 +6,10 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 PR = "r6"
 
Quoted 6 lines

meta/recipes-devtools/distcc/distcc_2.18.3.bb LICENSE = "GPLv2" · line 11

Quoted 4 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +3 -1
-DEPENDS = "avahi gtk+"
+DEPENDS = "avahi ${GTKDEP}"
+GTKDEP-libc-uclibc = ""
+GTKDEP = "gtk+"

return -ENOTTESTED;

heh, I did infact rebuild on uclibc and eglibc but I should have removed dependencies just rebuilding after bitbake -c cleanall is not enough

Quoted 12 lines

;-)

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line
-Khem
author
#5 lore raw

Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc

In reply to Richard Purdie
Quoted 18 lines · Richard Purdie
Quoted 17 lines · Khem Raj

We enable gtk/gnome in distcc that code uses loadavg() a function unimplemented in uclibc. Therefore for uclibc we disable gnome and gtk+ features in distcc

---
 meta/recipes-devtools/distcc/distcc_2.18.3.bb |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
meta/recipes-devtools/distcc/distcc_2.18.3.bb +0 -0
index 1f5c2af..a15858c 100644
@@ -6,7 +6,10 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 PR = "r6"
 
Quoted 6 lines

meta/recipes-devtools/distcc/distcc_2.18.3.bb LICENSE = "GPLv2" · line 11

Quoted 4 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +3 -1
-DEPENDS = "avahi gtk+"
+DEPENDS = "avahi ${GTKDEP}"
+GTKDEP-libc-uclibc = ""
+GTKDEP = "gtk+"

return -ENOTTESTED;

OK I have refreshed it with typo fix in the pull request

Quoted 12 lines

;-)

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line
-Khem
#6 lore raw

Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc

In reply to Khem Raj

Op 21 mei 2011, om 01:19 heeft Khem Raj het volgende geschreven:

Quoted 13 lines
do_install_append() {
    install -d ${D}${sysconfdir}/init.d/
    install -d ${D}${sysconfdir}/default
    install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
    install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
meta/recipes-devtools/distcc/distcc_2.18.3.bb +5 -0
+    ${DESKTOPINSTALL}
+}
+DESKTOPINSTALL = ""
+DESKTOPINSTALL_libc-glibc () {
+    install -d ${D}${datadir}/distcc/
    install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/

}

meta/recipes-devtools/distcc/distcc_2.18.3.bb inherit autotools pkgconfig update-rc.d · line 44

Quoted 3 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +1 -2
-
-PACKAGES += "distcc-distmon-gnome"
+PACKAGES_append_libc-glibc = " distcc-distmon-gnome"

Are these parts really needed?

#7 lore raw

Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc

In reply to Khem Raj

meta/recipes-devtools/distcc/distcc_2.18.3.bb LICENSE = "GPLv2" · line 11

Quoted 4 lines · Khem Raj
meta/recipes-devtools/distcc/distcc_2.18.3.bb +3 -1
-DEPENDS = "avahi gtk+"
+DEPENDS = "avahi ${GTKDEP}"
+GTKDEP-libc-uclibc = ""
+GTKDEP = "gtk+"

Does that really work? Surely it should be "GTKDEP_libc-uclibc".

meta/recipes-devtools/distcc/distcc_2.18.3.bb inherit autotools pkgconfig update-rc.d · line 31

Quoted 4 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +2 -2
-EXTRA_OECONF = " --with-gtk "
-
+EXTRA_OECONF_libc-glibc = " --with-gtk "
+EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome "

Can you make this use the same logic as above?

meta/recipes-devtools/distcc/distcc_2.18.3.bb inherit autotools pkgconfig update-rc.d · line 43

Quoted 5 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +3 -0
+DESKTOPINSTALL = ""
+DESKTOPINSTALL_libc-glibc () {
+    install -d ${D}${datadir}/distcc/
     install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/
 }

Likewise, or find some way to eliminate it entirely.

meta/recipes-devtools/distcc/distcc_2.18.3.bb inherit autotools pkgconfig update-rc.d · line 44

Quoted 3 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +1 -2
-
-PACKAGES += "distcc-distmon-gnome"
+PACKAGES_append_libc-glibc = " distcc-distmon-gnome"

Is that needed?

p.

author
#8 lore raw

Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc

-Khem

Quoted 8 lines · Phil Blundell

meta/recipes-devtools/distcc/distcc_2.18.3.bb LICENSE = "GPLv2" · line 11

Quoted 4 lines · Khem Raj
meta/recipes-devtools/distcc/distcc_2.18.3.bb +3 -1
-DEPENDS = "avahi gtk+"
+DEPENDS = "avahi ${GTKDEP}"
+GTKDEP-libc-uclibc = ""
+GTKDEP = "gtk+"

Does that really work? Surely it should be "GTKDEP_libc-uclibc".

No it does not RP pointed it out earlier and I have since fixed it

Quoted 7 lines

meta/recipes-devtools/distcc/distcc_2.18.3.bb inherit autotools pkgconfig update-rc.d · line 31

Quoted 4 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +2 -2
-EXTRA_OECONF = " --with-gtk "
-
+EXTRA_OECONF_libc-glibc = " --with-gtk "
+EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome "

Can you make this use the same logic as above?

Is there a problem with this logic ?

Quoted 8 lines
Quoted 5 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +3 -0
+DESKTOPINSTALL = ""
+DESKTOPINSTALL_libc-glibc () {
+    install -d ${D}${datadir}/distcc/
    install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/

}

Likewise, or find some way to eliminate it entirely.

Quoted 6 lines

meta/recipes-devtools/distcc/distcc_2.18.3.bb inherit autotools pkgconfig update-rc.d · line 44

Quoted 3 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +1 -2
-
-PACKAGES += "distcc-distmon-gnome"
+PACKAGES_append_libc-glibc = " distcc-distmon-gnome"

Is that needed?

May be not it will just be empty in uclibc case

Quoted 8 lines

p.

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#9 lore raw

Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc

Quoted 9 lines · Khem Raj
Quoted 7 lines

meta/recipes-devtools/distcc/distcc_2.18.3.bb inherit autotools pkgconfig update-rc.d · line 31

Quoted 4 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +2 -2
-EXTRA_OECONF = " --with-gtk "
-
+EXTRA_OECONF_libc-glibc = " --with-gtk "
+EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome "

Can you make this use the same logic as above?

Is there a problem with this logic ?

Not functionally but, if the DEPENDS are expressed in terms of a default and then an override for uclibc, it seems like it would be natural for the corresponding EXTRA_OECONF to be written the same way.

p.

#10 lore raw

Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc

In reply to Khem Raj

Op 21 mei 2011, om 09:19 heeft Khem Raj het volgende geschreven:

Quoted 35 lines

-Khem

Quoted 8 lines · Phil Blundell

meta/recipes-devtools/distcc/distcc_2.18.3.bb LICENSE = "GPLv2" · line 11

Quoted 4 lines · Khem Raj
meta/recipes-devtools/distcc/distcc_2.18.3.bb +3 -1
-DEPENDS = "avahi gtk+"
+DEPENDS = "avahi ${GTKDEP}"
+GTKDEP-libc-uclibc = ""
+GTKDEP = "gtk+"

Does that really work? Surely it should be "GTKDEP_libc-uclibc".

No it does not RP pointed it out earlier and I have since fixed it

Quoted 7 lines

meta/recipes-devtools/distcc/distcc_2.18.3.bb inherit autotools pkgconfig update-rc.d · line 31

Quoted 4 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +2 -2
-EXTRA_OECONF = " --with-gtk "
-
+EXTRA_OECONF_libc-glibc = " --with-gtk "
+EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome "

Can you make this use the same logic as above?

Is there a problem with this logic ?

Quoted 8 lines
Quoted 5 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +3 -0
+DESKTOPINSTALL = ""
+DESKTOPINSTALL_libc-glibc () {
+    install -d ${D}${datadir}/distcc/
  install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/

}

Likewise, or find some way to eliminate it entirely.

Quoted 8 lines
Quoted 6 lines

meta/recipes-devtools/distcc/distcc_2.18.3.bb inherit autotools pkgconfig update-rc.d · line 44

Quoted 3 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +1 -2
-
-PACKAGES += "distcc-distmon-gnome"
+PACKAGES_append_libc-glibc = " distcc-distmon-gnome"

Is that needed?

May be not it will just be empty in uclibc case

since ALLOW_EMPTY is not set, this change is unneeded.

author
#11 lore raw

Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc

Quoted 45 lines · Koen Kooi

Op 21 mei 2011, om 09:19 heeft Khem Raj het volgende geschreven:

Quoted 42 lines

-Khem

Quoted 8 lines · Phil Blundell

meta/recipes-devtools/distcc/distcc_2.18.3.bb LICENSE = "GPLv2" · line 11

Quoted 4 lines · Khem Raj
meta/recipes-devtools/distcc/distcc_2.18.3.bb +3 -1
-DEPENDS = "avahi gtk+"
+DEPENDS = "avahi ${GTKDEP}"
+GTKDEP-libc-uclibc = ""
+GTKDEP = "gtk+"

Does that really work?  Surely it should be "GTKDEP_libc-uclibc".

No it does not RP pointed it out earlier and I have since fixed it

Quoted 7 lines

meta/recipes-devtools/distcc/distcc_2.18.3.bb inherit autotools pkgconfig update-rc.d · line 31

Quoted 4 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +2 -2
-EXTRA_OECONF = " --with-gtk "
-
+EXTRA_OECONF_libc-glibc = " --with-gtk "
+EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome "

Can you make this use the same logic as above?

Is there a problem with this logic ?

Quoted 14 lines
Quoted 5 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +3 -0
+DESKTOPINSTALL = ""
+DESKTOPINSTALL_libc-glibc () {
+    install -d ${D}${datadir}/distcc/

  install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ }

Likewise, or find some way to eliminate it entirely.

meta/recipes-devtools/distcc/distcc_2.18.3.bb inherit autotools pkgconfig update-rc.d · line 44

Quoted 3 lines
meta/recipes-devtools/distcc/distcc_2.18.3.bb +1 -2
-
-PACKAGES += "distcc-distmon-gnome"
+PACKAGES_append_libc-glibc = " distcc-distmon-gnome"

Is that needed?

Quoted 3 lines
Quoted 1 line

May be not it will just be empty in uclibc case

since ALLOW_EMPTY is not set, this change is unneeded.

I have include these comments in the new version pushed to pull branch. Hopefully this time its ok.

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#12 lore raw

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

In reply to Khem Raj
Quoted 2 lines · Khem Raj

Remove headerfix.patch, its already applied upstream

Minor nit, should be $D in the subject line also right?

Sau!

Quoted 53 lines
---
  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

meta/recipes-devtools/opkg/opkg/headerfix.patch deleted +0 -19
deleted file mode 100644
index b3515a0..0000000
@@ -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
- {
meta/recipes-devtools/opkg/opkg_svn.bb +1 -2
index 5964a47..3f2c22b 100644
@@ -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
author
#13 lore raw

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

Quoted 4 lines · Saul Wold
Quoted 2 lines · Khem Raj

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

Quoted 57 lines

Sau!

Quoted 53 lines
---
 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
meta/recipes-devtools/opkg/opkg/headerfix.patch deleted +0 -19
deleted file mode 100644
index b3515a0..0000000
@@ -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
- {
meta/recipes-devtools/opkg/opkg_svn.bb +1 -2
index 5964a47..3f2c22b 100644
@@ -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
Signature · 1 line
-Khem
#14 lore raw

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

In reply to Khem Raj

meta/recipes-devtools/opkg/opkg_svn.bb do_install_append() { · line 36

Quoted 2 lines · Khem Raj
meta/recipes-devtools/opkg/opkg_svn.bb +1 -1
-	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.

author
#15 lore raw

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

Quoted 11 lines · Phil Blundell
Quoted 2 lines · Khem Raj

-     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

Quoted 10 lines

p.

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#16 lore raw
In reply to Khem Raj
Quoted 14 lines · Khem Raj

These are remaining patches which needed rework.

The following changes since commit c26dadc799cd9c7df66c3bccfc9f21146c35625a:

   opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} (2011-05-20 16:15:29 -0700)

are available in the git repository at:
[email protected]:openembedded-core-contrib.git kraj/misc-fixes
http://cgit.openembedded.org/cgit.cgi//log/?h=kraj/misc-fixes

Khem Raj (2):
opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} distcc_2.18.3.bb: Fix compilation on uclibc

Quoted 6 lines
  meta/recipes-devtools/distcc/distcc_2.18.3.bb   |   17 ++++++++++++-----
  meta/recipes-devtools/opkg/opkg/headerfix.patch |   19 -------------------
  meta/recipes-devtools/opkg/opkg_svn.bb          |    3 +--
  3 files changed, 13 insertions(+), 26 deletions(-)

delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch

Khem,

After all the churn, latest version has been merged.

Thank
Sau!