Skip to contentSkip to conversation

opkg updates

PATCH In review Khem Raj 3 participants 8 messages May 19, 2011 – May 20, 2011

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

v2 cover opkg updates

This incorporates the comments from RP

The following changes since commit b0cbb0f5a98e9406a5007aa5ce5091c1be8e82db:

  opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} (2011-05-19 16:45:03 -0700)

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

Khem Raj (2):
opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS}
opkg-utils: Synchronise with OE

 .../opkg-utils/opkg-utils/mtime-int.patch          |   29 ++++++++++++++++++++
 meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |    7 +++-
 meta/recipes-devtools/opkg/opkg/headerfix.patch    |   19 -------------
 meta/recipes-devtools/opkg/opkg_svn.bb             |    3 +-
 4 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
 delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch
Signature · 1 line
1.7.4.1
author
#1 lore raw

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

Remove headerfix.patch, its already applied upstream

Signed-off-by Khem Raj <[email protected]>
---
 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..dfe71e5 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 v2 2/2 opkg-utils: Synchronise with OE

Import mtime-int.patch from OE commit
c81990aecae3bdf70a7c924699776b248ab7a006

Pass LDFLAGS to linker to avoid missing GNU_HASH QA errors

Signed-off-by Khem Raj <[email protected]>
---
 .../opkg-utils/opkg-utils/mtime-int.patch          |   29 ++++++++++++++++++++
 meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |    7 +++-
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch
meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch new file +29 -0
new file mode 100644
index 0000000..fdbce21
@@ -0,0 +1,29 @@
+Convert mtime to int before comparing it
+
+The st_mtime attribute (which is a float) is compared against a value
+from the timestamp database, which was stored as an integer there.
+
+When working on a filesystem with precise timestamps the comparision
+will fail nearly everytime hence.
+
+Although it might be possible to enhance the database to store the
+fractional part too, this will complicate things more than we would
+gain by this change.
+
+Signed-off-by: Enrico Scholz <[email protected]>
+
+Upstream-Status: Pending
+
+Index: opkg-utils/opkg-make-index
+===================================================================
+--- opkg-utils.orig/opkg-make-index
++++ opkg-utils/opkg-make-index
+@@ -100,7 +100,7 @@ for filename in files:
+      pkg = None
+      fnameStat = os.stat(filename)
+      if old_pkg_hash.has_key(basename):
+-          if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]:
++          if pkgsStamps.has_key(basename) and int(fnameStat.st_mtime) == pkgsStamps[basename]:
+             if (verbose):
+                sys.stderr.write("Found %s in Packages\n" % (filename,))
+             pkg = old_pkg_hash[basename]
meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +5 -2
index 0db6f80..79cee2e 100644
@@ -9,10 +9,12 @@ RDEPENDS_${PN} = "python"
 RDEPENDS_${PN}_virtclass-native = ""
 SRCREV = "4747"
 PV = "0.1.8+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \
-           file://index-ignore-filenotfound.patch"
+           file://index-ignore-filenotfound.patch \
+           file://mtime-int.patch \
+           "
 
 S = "${WORKDIR}/opkg-utils"
 

@@ -24,3 +26,4 @@ do_install() {
 }
 
 BBCLASSEXTEND = "native"
+TARGET_CC_ARCH += "${LDFLAGS}"
Signature · 1 line
1.7.4.1
#3 lore raw

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

In reply to Khem Raj
Quoted 8 lines · Khem Raj

Remove headerfix.patch, its already applied upstream

Signed-off-by Khem Raj <[email protected]>
---
 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_svn.bb do_install_append() { · line 39

Quoted 13 lines
meta/recipes-devtools/opkg/opkg_svn.bb +1 -1
index 5964a47..dfe71e5 100644
@@ -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

This needs to be $D, I didn't miss the brackets in my previous email :)

Cheers,

Richard

author
#4 lore raw

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

Quoted 4 lines · Richard Purdie

This needs to be $D, I didn't miss the brackets in my previous email :)

but that wont be relative right ? it will encode current builddir into sstate isnt it ?

#5 lore raw

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

Quoted 9 lines · Khem Raj
Quoted 4 lines · Richard Purdie

This needs to be $D, I didn't miss the brackets in my previous email :)

but that wont be relative right ? it will encode current builddir into sstate isnt it ?

No, that is what the ${D} you used will do.

$D gets set when we run the postinstall to the path to the rootfs (see the rootfs bbclass files). We use $D deliberately so bitbake doesn't expand it (as used elsewhere in postinstalls).

Cheers,

Richard

author
#6 lore raw

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

Quoted 8 lines · Richard Purdie
Quoted 7 lines · Khem Raj
Quoted 4 lines · Richard Purdie

This needs to be $D, I didn't miss the brackets in my previous email :)

Quoted 9 lines
Quoted 2 lines

but that wont be relative right ? it will encode current builddir into sstate isnt it ?

No, that is what the ${D} you used will do.

$D gets set when we run the postinstall to the path to the rootfs (see the rootfs bbclass files). We use $D deliberately so bitbake doesn't expand it (as used elsewhere in postinstalls).

hmmm ok I see yeah ${} will get expanded by bitbake. Will make the change and resend

Quoted 12 lines

Cheers,

Richard

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

#7 lore raw
In reply to Khem Raj
Quoted 5 lines · Khem Raj

This incorporates the comments from RP

The following changes since commit b0cbb0f5a98e9406a5007aa5ce5091c1be8e82db:

Quoted 8 lines
   opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} (2011-05-19 16:45:03 -0700)

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

Khem Raj (2):

   opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS}

No pulled per RP's comment about $D vs ${D}

Quoted 2 lines

opkg-utils: Synchronise with OE

Pulled into oe-core

Thanks
Sau!

Quoted 8 lines
  .../opkg-utils/opkg-utils/mtime-int.patch          |   29 ++++++++++++++++++++
  meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |    7 +++-
  meta/recipes-devtools/opkg/opkg/headerfix.patch    |   19 -------------
  meta/recipes-devtools/opkg/opkg_svn.bb             |    3 +-
  4 files changed, 35 insertions(+), 23 deletions(-)

create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/mtime-int.patch delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch