Skip to contentSkip to conversation

pull request 20120224

PATCH In review Steffen Sledz 2 participants 24 messages Feb 24, 2012 – Mar 16, 2012

lore
Share & tools
lore

Steffen Sledz

author
#0 lore raw

cover pull request 20120224

Hi Tom,

please pull these commits cherry-picked from oe.dev. The first one fixes a build problem with net-snmp and libnl. The others fix various fetch problems. All are well tested in our own environment.

Thx,
Steffen

The following changes since commit 89cb863234616620d172984ff173f1d84ce4caa9:

ntpclient: updated to 2010_365 version (2012-01-12 08:22:32 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded sledz/pull
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/pull

Steffen Sledz (6):
net-snmp-5.7.1: fix build error "too few arguments to function 'nl_geterror'"
fakeroot-native: update to 1.14.5
bluez4: fix checksums for bluez-4.95.tar.gz
jakarta-libs: fixed SRC_URI for avalon-framework-api-4.3
liblockfile: fix SRC_URI for version 1.06
ltrace: switch from 0.5.3-2 to 0.5.3-2.1

Vita Preskovsky (1):
bluez4: Add version 4.95

 recipes/bluez/bluez4_4.95.bb                       |   30 +++++++++
 recipes/fakeroot/fakeroot-native_1.14.5.bb         |   23 +++++++
 recipes/jakarta-libs/avalon-framework-api_4.3.bb   |    2 +-
 recipes/liblockfile/liblockfile_1.06.bb            |    2 +-
 recipes/ltrace/ltrace_0.5.3.bb                     |    6 +-
 .../net-snmp/net-snmp-5.7.1/net-snmp-libnl.patch   |   65 ++++++++++++++++++++
 recipes/net-snmp/net-snmp_5.7.1.bb                 |    3 +-
 7 files changed, 125 insertions(+), 6 deletions(-)
 create mode 100644 recipes/bluez/bluez4_4.95.bb
 create mode 100644 recipes/fakeroot/fakeroot-native_1.14.5.bb
 create mode 100644 recipes/net-snmp/net-snmp-5.7.1/net-snmp-libnl.patch
Signature · 1 line
1.7.7
author
#1 lore raw

PATCH 1/7 net-snmp-5.7.1: fix build error "too few arguments to function 'nl_geterror'"

Fixes compile errors with libnl-1_2.0:

| ...
| mibII/tcpTable.c:579: error: too few arguments to function 'nl_geterror'
| mibII/tcpTable.c:579: error: too few arguments to function 'nl_geterror'
| ...

The patch was imported from the net-snmp bug tracker: current libnl 3.0 not supported - ID: 3250304 [1]

[1] <http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694>

Signed-off-by Steffen Sledz <[email protected]>
---
 .../net-snmp/net-snmp-5.7.1/net-snmp-libnl.patch   |   65 ++++++++++++++++++++
 recipes/net-snmp/net-snmp_5.7.1.bb                 |    3 +-
 2 files changed, 67 insertions(+), 1 deletions(-)
 create mode 100644 recipes/net-snmp/net-snmp-5.7.1/net-snmp-libnl.patch
recipes/net-snmp/net-snmp-5.7.1/net-snmp-libnl.patch new file +65 -0
new file mode 100644
index 0000000..0879e45
@@ -0,0 +1,65 @@
+--- net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c.org	2011-03-27 22:39:13.428728506 +0200
++++ net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c	2011-03-27 22:39:47.606956561 +0200
+@@ -555,8 +555,9 @@
+ static int
+ tcpTable_load_netlink(void)
+ {
++	int err;
+ 	/*  TODO: perhaps use permanent nl handle? */
+-	struct nl_handle *nl = nl_handle_alloc();
++	struct nl_sock *nl = nl_socket_alloc();
+ 
+ 	if (nl == NULL) {
+ 		DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n"));
+@@ -564,10 +565,10 @@
+ 		return -1;
+ 	}
+ 
+-	if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
+-		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror()));
+-		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror());
+-		nl_handle_destroy(nl);
++	if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) {
++		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err)));
++		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err));
++		nl_socket_free(nl);
+ 		return -1;
+ 	}
+ 
+@@ -579,10 +580,10 @@
+ 	struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
+ 	nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
+ 
+-	if (nl_send_auto_complete(nl, nm) < 0) {
+-		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror()));
+-		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror());
+-		nl_handle_destroy(nl);
++	if ((err = nl_send_auto_complete(nl, nm)) < 0) {
++		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err)));
++		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err));
++		nl_socket_free(nl);
+ 		return -1;
+ 	}
+ 	nlmsg_free(nm);
+@@ -593,9 +594,9 @@
+ 
+ 	while (running) {
+ 		if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
+-			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror()));
+-			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror());
+-			nl_handle_destroy(nl);
++			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len)));
++			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len));
++			nl_socket_free(nl);
+ 			return -1;
+ 		}
+ 
+@@ -644,7 +645,7 @@
+ 		free(buf);
+ 	}
+ 
+-	nl_handle_destroy(nl);
++	nl_socket_free(nl);
+ 
+ 	if (tcp_head) {
+ 		DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n"));
recipes/net-snmp/net-snmp_5.7.1.bb +2 -1
index 08571e9..655d7be 100644
@@ -1,10 +1,11 @@
 require net-snmp.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 LIC_FILES_CHKSUM = "file://README;beginline=3;endline=8;md5=7f7f00ba639ac8e8deb5a622ea24634e"
 
 DEFAULT_PREFERENCE = "1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
+        file://net-snmp-libnl.patch \
         file://init \
         file://snmpd.conf \
         file://snmptrapd.conf"
Signature · 1 line
1.7.7
author
#2 lore raw

PATCH 2/7 fakeroot-native: update to 1.14.5

* version 1.9.6 is no longer fetchable
* recipe for version 1.9.6 is not removed yet because of pinnings in various distro configurations

Signed-off-by Steffen Sledz <[email protected]>
---
 recipes/fakeroot/fakeroot-native_1.14.5.bb |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)
 create mode 100644 recipes/fakeroot/fakeroot-native_1.14.5.bb
recipes/fakeroot/fakeroot-native_1.14.5.bb new file +23 -0
new file mode 100644
index 0000000..bb57d84
@@ -0,0 +1,23 @@
+require fakeroot_${PV}.bb
+
+RDEPENDS_${PN} = "util-linux-native"
+
+SRC_URI += "file://fix-prefix.patch "
+S = "${WORKDIR}/fakeroot-${PV}"
+
+inherit native
+
+EXTRA_OECONF = " --program-prefix="
+
+# Compatability for the rare systems not using or having SYSV
+python () {
+    if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0':
+        bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d)
+}
+
+do_stage_append () {
+    oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/
+}
+
+SRC_URI[md5sum] = "659a1f3a36554abfc2a3eaad2fdc0604"
+SRC_URI[sha256sum] = "b035c834944bf9482027f48c388de8492e96609825265ac03f05408d0b3aae68"
Signature · 1 line
1.7.7
#3 lore raw

Re: [2011.03-maintenance 2/7] fakeroot-native: update to 1.14.5

Quoted 1 line · Steffen Sledz

* version 1.9.6 is no longer fetchable

It _IS_ fetchable if you use a versioned string on snapshot.debian.org. Please use this instead (and we have an example or two already, possibly even for fakeroot I'd have sworn).

Signature · 1 line
Tom
author
#4 lore raw

Re: [2011.03-maintenance 2/7] fakeroot-native: update to 1.14.5

Quoted 7 lines · Tom Rini
Quoted 1 line · Steffen Sledz

* version 1.9.6 is no longer fetchable

It _IS_ fetchable if you use a versioned string on snapshot.debian.org. Please use this instead (and we have an example or two already, possibly even for fakeroot I'd have sworn).

Hmmmm?

It's a pity that these comments did not came up, when the commits were proposed to oe-classic master some weeks before. Now they made it their way to the master branch (and our application) as they are.

I would prefer if they make it to 2011.03-maintenance the same way to avoid confusions with master branch.

Regards,
Steffen

PS: Can you explain for a non-debian user what you exactly mean with "use a versioned string on snapshot.debian.org". Thx

Signature · 7 lines
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:[email protected]
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058
#5 lore raw

Re: [2011.03-maintenance 2/7] fakeroot-native: update to 1.14.5

Quoted 5 lines · Steffen Sledz
Quoted 4 lines · Tom Rini
Quoted 1 line · Steffen Sledz

* version 1.9.6 is no longer fetchable

Quoted 7 lines
Quoted 3 lines

It _IS_ fetchable if you use a versioned string on snapshot.debian.org. Please use this instead (and we have an example or two already, possibly even for fakeroot I'd have sworn).

Hmmmm?

It's a pity that these comments did not came up, when the commits were proposed to oe-classic master some weeks before. Now they made it their way to the master branch (and our application) as they are.

Or that oe-classic diverged here after someone else pointed out this change to me on this list a while ago.

Quoted 7 lines

I would prefer if they make it to 2011.03-maintenance the same way to avoid confusions with master branch.

Regards,
Steffen

PS: Can you explain for a non-debian user what you exactly mean with "use a versioned string on snapshot.debian.org". Thx

An example would be
http://git.openembedded.org/openembedded/commit/?h=2011.03-maintenance&id=8994c34bb3b50df579edbf5e085cada56846baa3

Signature · 1 line
Tom
author
#6 lore raw

Re: [2011.03-maintenance 2/7] fakeroot-native: update to 1.14.5

In reply to Tom Rini
Quoted 7 lines · Tom Rini
Quoted 1 line · Steffen Sledz

* version 1.9.6 is no longer fetchable

It _IS_ fetchable if you use a versioned string on snapshot.debian.org. Please use this instead (and we have an example or two already, possibly even for fakeroot I'd have sworn).

I tried to fetch from <http://snapshot.debian.org/archive/debian/20080803T000000Z/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz> but this resulted in an checksum mismatch error. :(

ERROR: The checksums for "/home/sledz/sources/fakeroot_1.9.6.tar.gz" did not match.
MD5: expected "9441c981bfd4e521abcd5d93385f71d8", got "2f1c02c186eb34f29a15cef8c33ac6e4"
SHA256: expected "06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da", got "55b727aa5c8bac0447504c1e7fd7308b80b8a193913b4bc604cf6c3bc6d042b0"

I'm not sure if we still should use this version?

Regards,
Steffen

Signature · 7 lines
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:[email protected]
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058
author
#7 lore raw

Re: [2011.03-maintenance 2/7] fakeroot-native: update to 1.14.5

Quoted 9 lines · Steffen Sledz
Quoted 7 lines · Tom Rini
Quoted 1 line · Steffen Sledz

* version 1.9.6 is no longer fetchable

It _IS_ fetchable if you use a versioned string on snapshot.debian.org. Please use this instead (and we have an example or two already, possibly even for fakeroot I'd have sworn).

Quoted 5 lines

I tried to fetch from <http://snapshot.debian.org/archive/debian/20080803T000000Z/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz> but this resulted in an checksum mismatch error. :(

ERROR: The checksums for "/home/sledz/sources/fakeroot_1.9.6.tar.gz" did not match.
MD5: expected "9441c981bfd4e521abcd5d93385f71d8", got "2f1c02c186eb34f29a15cef8c33ac6e4"
SHA256: expected "06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da", got "55b727aa5c8bac0447504c1e7fd7308b80b8a193913b4bc604cf6c3bc6d042b0"

Forget this!

There was an old file with the same name and some XML content in the sources dir. After cleaning up everything worked well.

Sorry for disturbing,
Steffem

Signature · 7 lines
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:[email protected]
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058
author
#8 lore raw

PATCH 3/7 bluez4: Add version 4.95

In reply to Steffen Sledz

From: Vita Preskovsky <[email protected]>

Signed-off-by Vita Preskovsky <[email protected]>
Signed-off-by Koen Kooi <[email protected]>
---
 recipes/bluez/bluez4_4.95.bb |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 recipes/bluez/bluez4_4.95.bb
recipes/bluez/bluez4_4.95.bb new file +30 -0
new file mode 100644
index 0000000..290dff6
@@ -0,0 +1,30 @@
+require bluez4.inc
+
+SRC_URI = "\
+  ${KERNELORG_MIRROR}/pub/linux/bluetooth/bluez-${PV}.tar.gz \
+  file://bluetooth.conf \
+"
+SRC_URI[md5sum] = "341294b2849a04a4afff5c96bfbf30b2"
+SRC_URI[sha256sum] = "d6ea9de410fc2bcd2620d709c2202893b218e2e6a55c3c0ce6bebd27fa4120f6"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
+
+DEPENDS += "libsndfile1"
+
+PR = "${INC_PR}.0"
+
+# Not all distros have a recent enough udev
+BTUDEV = " --disable-udevrules"
+BTUDEV_angstrom = " --enable-udevrules"
+BTUDEV_shr = " --enable-udevrules"
+
+EXTRA_OECONF += "${BTUDEV}"
+do_configure_append(){
+	echo "#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE" >> ${S}/config.h
+}
+
+FILES_${PN}-dbg += "\
+  ${base_libdir}/udev/.debug \
+  ${libdir}/*/.debug \
+"
Signature · 1 line
1.7.7
author
#9 lore raw

PATCH 4/7 bluez4: fix checksums for bluez-4.95.tar.gz

In reply to Steffen Sledz
Signed-off-by Steffen Sledz <[email protected]>
---
 recipes/bluez/bluez4_4.95.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/bluez/bluez4_4.95.bb +2 -2
index 290dff6..23275e4 100644
@@ -4,8 +4,8 @@ SRC_URI = "\
   ${KERNELORG_MIRROR}/pub/linux/bluetooth/bluez-${PV}.tar.gz \
   file://bluetooth.conf \
 "
-SRC_URI[md5sum] = "341294b2849a04a4afff5c96bfbf30b2"
-SRC_URI[sha256sum] = "d6ea9de410fc2bcd2620d709c2202893b218e2e6a55c3c0ce6bebd27fa4120f6"
+SRC_URI[md5sum] = "3e6e77ae06aad73bbedbabed3f0d508e"
+SRC_URI[sha256sum] = "795dc8eb45e07c7848c58e2f2d730a404179ecce3dd1cd7b822cdec5ea7b69c8"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
Signature · 1 line
1.7.7
author
#10 lore raw

PATCH 5/7 jakarta-libs: fixed SRC_URI for avalon-framework-api-4.3

In reply to Steffen Sledz
Signed-off-by Steffen Sledz <[email protected]>
---
 recipes/jakarta-libs/avalon-framework-api_4.3.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/jakarta-libs/avalon-framework-api_4.3.bb +1 -1
index 06fde62..3340f5b 100644
@@ -3,7 +3,7 @@ LICENSE = "AL2.0"
 AUTHOR = "Apache Software Foundation"
 
 SRC_URI = "\
-	http://www.apache.org/dist/excalibur/avalon-framework/source/${BP}-src.tar.gz;name=archive \
+	http://archive.apache.org/dist/excalibur/framework/source/${BP}-src.tar.gz;name=archive \
 	http://www.apache.org/dist/avalon/logkit/source/logkit-1.2.2-src.tar.gz;name=logkit \
 	"
Signature · 1 line
1.7.7
author
#11 lore raw

PATCH 6/7 liblockfile: fix SRC_URI for version 1.06

In reply to Steffen Sledz
Signed-off-by Steffen Sledz <[email protected]>
---
 recipes/liblockfile/liblockfile_1.06.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/liblockfile/liblockfile_1.06.bb +1 -1
index 0235dbd..5d540cb 100644
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PR ="r1"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_${PV}.tar.gz \
+SRC_URI = "http://archive.debian.org/debian/pool/main/libl/liblockfile/liblockfile_${PV}.tar.gz \
 	   file://install.patch \
 	   file://configure.patch \
 	   file://ldflags.patch \
Signature · 1 line
1.7.7
#12 lore raw

Re: [2011.03-maintenance 6/7] liblockfile: fix SRC_URI for version 1.06

Quoted 10 lines · Steffen Sledz
Signed-off-by Steffen Sledz <[email protected]>
---
 recipes/liblockfile/liblockfile_1.06.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/liblockfile/liblockfile_1.06.bb +0 -0
index 0235dbd..5d540cb 100644

recipes/liblockfile/liblockfile_1.06.bb SECTION = "libs" · line 6

Quoted 5 lines
recipes/liblockfile/liblockfile_1.06.bb +1 -1
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PR ="r1"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_${PV}.tar.gz \
+SRC_URI = "http://archive.debian.org/debian/pool/main/libl/liblockfile/liblockfile_${PV}.tar.gz \

This is because it's no longer on the main mirror, yes? If so, please also switch this to a date-stringed snapshot.debain.org URL so we won't have to deal with this yet again in the future. Thanks!

Signature · 1 line
Tom
author
#13 lore raw

PATCH 7/7 ltrace: switch from 0.5.3-2 to 0.5.3-2.1

In reply to Steffen Sledz

Version 0.5.3-2 is no longer fetchable.

Signed-off-by Steffen Sledz <[email protected]>
---
 recipes/ltrace/ltrace_0.5.3.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
recipes/ltrace/ltrace_0.5.3.bb +3 -3
index 53f4892..c9ff0ab 100644
@@ -11,7 +11,7 @@ COMPATIBLE_TARGET_SYS = (?!sh[34])
 
 SRC_URI = "\
   ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz;name=archive \
-  ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.diff.gz;name=patch \
+  ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.1.diff.gz;name=patch \
   file://add-sysdep.patch \
   file://ltrace-compile.patch \
   file://ltrace-mips-remove-CP.patch \

@@ -76,5 +76,5 @@ do_install() {
 
 SRC_URI[archive.md5sum] = "3fa7fe715ab879db08bd06d1d59fd90f"
 SRC_URI[archive.sha256sum] = "5c6627d6d5a98a92ca4661cfc16378b182cc46a9ec479ebf7e6121ee3fe2be32"
-SRC_URI[patch.md5sum] = "969baa0900646c0262b2d505b9fef154"
-SRC_URI[patch.sha256sum] = "f647d7c2f2b0d1dbddd632f3a17fef670aed3ebf5fbe6c1633337acac1eba8e3"
+SRC_URI[patch.md5sum] = "38bc944c53ab602a7854aa4fa71c1f46"
+SRC_URI[patch.sha256sum] = "4c57df94020f2bed90d948f757ca7786796ca9218274764b24f61c502d9ef4f6"
Signature · 1 line
1.7.7
#14 lore raw

Re: [2011.03-maintenance 7/7] ltrace: switch from 0.5.3-2 to 0.5.3-2.1

Quoted 1 line · Steffen Sledz

Version 0.5.3-2 is no longer fetchable.

Same comment about snapshot.debian.org, thanks!

Signature · 1 line
Tom
author
#15 lore raw

cover pull request 20120314

In reply to Steffen Sledz

Hi Tom,

please pull these commits cherry-picked from oe.dev.

The first one fixes a build problem with net-snmp and libnl. The others fix various fetch problems. All are well tested in our own environment.

This request replaces my pull request 20120224 which was rejected by you with the wish to use shapshot.debian.org for various SRC_URIs.

Thx,
Steffen

The following changes since commit 89cb863234616620d172984ff173f1d84ce4caa9:

ntpclient: updated to 2010_365 version (2012-01-12 08:22:32 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded sledz/pull2
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/pull2

Steffen Sledz (6):
net-snmp-5.7.1: fix build error "too few arguments to function 'nl_geterror'" fakeroot-1.9.6: Update URI to a functioning one
bluez4: fix checksums for bluez-4.95.tar.gz
jakarta-libs: fixed SRC_URI for avalon-framework-api-4.3 liblockfile-1.06: Update URI to a functioning one
ltrace-0.5.3: Update URI to a functioning one

Vita Preskovsky (1):
bluez4: Add version 4.95

 recipes/bluez/bluez4_4.95.bb                       |   30 +++++++++
 recipes/fakeroot/fakeroot_1.9.6.bb                 |    2 +-
 recipes/jakarta-libs/avalon-framework-api_4.3.bb   |    2 +-
 recipes/liblockfile/liblockfile_1.06.bb            |    2 +-
 recipes/ltrace/ltrace_0.5.3.bb                     |    4 +-
 .../net-snmp/net-snmp-5.7.1/net-snmp-libnl.patch   |   65 ++++++++++++++++++++
 recipes/net-snmp/net-snmp_5.7.1.bb                 |    3 +-
 7 files changed, 102 insertions(+), 6 deletions(-)
 create mode 100644 recipes/bluez/bluez4_4.95.bb
 create mode 100644 recipes/net-snmp/net-snmp-5.7.1/net-snmp-libnl.patch
Signature · 1 line
1.7.7
author
#16 lore raw

PATCH 1/7 net-snmp-5.7.1: fix build error "too few arguments to function 'nl_geterror'"

Fixes compile errors with libnl-1_2.0:

| ...
| mibII/tcpTable.c:579: error: too few arguments to function 'nl_geterror'
| mibII/tcpTable.c:579: error: too few arguments to function 'nl_geterror'
| ...

The patch was imported from the net-snmp bug tracker: current libnl 3.0 not supported - ID: 3250304 [1]

[1] <http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694>

Signed-off-by Steffen Sledz <[email protected]>
---
 .../net-snmp/net-snmp-5.7.1/net-snmp-libnl.patch   |   65 ++++++++++++++++++++
 recipes/net-snmp/net-snmp_5.7.1.bb                 |    3 +-
 2 files changed, 67 insertions(+), 1 deletions(-)
 create mode 100644 recipes/net-snmp/net-snmp-5.7.1/net-snmp-libnl.patch
recipes/net-snmp/net-snmp-5.7.1/net-snmp-libnl.patch new file +65 -0
new file mode 100644
index 0000000..0879e45
@@ -0,0 +1,65 @@
+--- net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c.org	2011-03-27 22:39:13.428728506 +0200
++++ net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c	2011-03-27 22:39:47.606956561 +0200
+@@ -555,8 +555,9 @@
+ static int
+ tcpTable_load_netlink(void)
+ {
++	int err;
+ 	/*  TODO: perhaps use permanent nl handle? */
+-	struct nl_handle *nl = nl_handle_alloc();
++	struct nl_sock *nl = nl_socket_alloc();
+ 
+ 	if (nl == NULL) {
+ 		DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n"));
+@@ -564,10 +565,10 @@
+ 		return -1;
+ 	}
+ 
+-	if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
+-		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror()));
+-		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror());
+-		nl_handle_destroy(nl);
++	if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) {
++		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err)));
++		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err));
++		nl_socket_free(nl);
+ 		return -1;
+ 	}
+ 
+@@ -579,10 +580,10 @@
+ 	struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
+ 	nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
+ 
+-	if (nl_send_auto_complete(nl, nm) < 0) {
+-		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror()));
+-		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror());
+-		nl_handle_destroy(nl);
++	if ((err = nl_send_auto_complete(nl, nm)) < 0) {
++		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err)));
++		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err));
++		nl_socket_free(nl);
+ 		return -1;
+ 	}
+ 	nlmsg_free(nm);
+@@ -593,9 +594,9 @@
+ 
+ 	while (running) {
+ 		if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
+-			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror()));
+-			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror());
+-			nl_handle_destroy(nl);
++			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len)));
++			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len));
++			nl_socket_free(nl);
+ 			return -1;
+ 		}
+ 
+@@ -644,7 +645,7 @@
+ 		free(buf);
+ 	}
+ 
+-	nl_handle_destroy(nl);
++	nl_socket_free(nl);
+ 
+ 	if (tcp_head) {
+ 		DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n"));
recipes/net-snmp/net-snmp_5.7.1.bb +2 -1
index 08571e9..655d7be 100644
@@ -1,10 +1,11 @@
 require net-snmp.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 LIC_FILES_CHKSUM = "file://README;beginline=3;endline=8;md5=7f7f00ba639ac8e8deb5a622ea24634e"
 
 DEFAULT_PREFERENCE = "1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
+        file://net-snmp-libnl.patch \
         file://init \
         file://snmpd.conf \
         file://snmptrapd.conf"
Signature · 1 line
1.7.7
author
#17 lore raw

PATCH 2/7 fakeroot-1.9.6: Update URI to a functioning one

We have to use a specific date to the debian snapshot mirror to get this version of the file.

Signed-off-by Steffen Sledz <[email protected]>
---
 recipes/fakeroot/fakeroot_1.9.6.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/fakeroot/fakeroot_1.9.6.bb +1 -1
index 0a3ea93..0666910 100644
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 RDEPENDS_${PN} = "util-linux"
 PR = "r3"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
+SRC_URI = "http://snapshot.debian.org/archive/debian/20080803T000000Z/pool/main/f/fakeroot/fakeroot_${PV}.tar.gz \
            file://configure-libtool.patch"
 	    
 inherit autotools
Signature · 1 line
1.7.7
author
#18 lore raw

PATCH 3/7 bluez4: Add version 4.95

In reply to Steffen Sledz

From: Vita Preskovsky <[email protected]>

Signed-off-by Vita Preskovsky <[email protected]>
Signed-off-by Koen Kooi <[email protected]>
---
 recipes/bluez/bluez4_4.95.bb |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 recipes/bluez/bluez4_4.95.bb
recipes/bluez/bluez4_4.95.bb new file +30 -0
new file mode 100644
index 0000000..290dff6
@@ -0,0 +1,30 @@
+require bluez4.inc
+
+SRC_URI = "\
+  ${KERNELORG_MIRROR}/pub/linux/bluetooth/bluez-${PV}.tar.gz \
+  file://bluetooth.conf \
+"
+SRC_URI[md5sum] = "341294b2849a04a4afff5c96bfbf30b2"
+SRC_URI[sha256sum] = "d6ea9de410fc2bcd2620d709c2202893b218e2e6a55c3c0ce6bebd27fa4120f6"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
+
+DEPENDS += "libsndfile1"
+
+PR = "${INC_PR}.0"
+
+# Not all distros have a recent enough udev
+BTUDEV = " --disable-udevrules"
+BTUDEV_angstrom = " --enable-udevrules"
+BTUDEV_shr = " --enable-udevrules"
+
+EXTRA_OECONF += "${BTUDEV}"
+do_configure_append(){
+	echo "#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE" >> ${S}/config.h
+}
+
+FILES_${PN}-dbg += "\
+  ${base_libdir}/udev/.debug \
+  ${libdir}/*/.debug \
+"
Signature · 1 line
1.7.7
author
#19 lore raw

PATCH 4/7 bluez4: fix checksums for bluez-4.95.tar.gz

In reply to Steffen Sledz
Signed-off-by Steffen Sledz <[email protected]>
---
 recipes/bluez/bluez4_4.95.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/bluez/bluez4_4.95.bb +2 -2
index 290dff6..23275e4 100644
@@ -4,8 +4,8 @@ SRC_URI = "\
   ${KERNELORG_MIRROR}/pub/linux/bluetooth/bluez-${PV}.tar.gz \
   file://bluetooth.conf \
 "
-SRC_URI[md5sum] = "341294b2849a04a4afff5c96bfbf30b2"
-SRC_URI[sha256sum] = "d6ea9de410fc2bcd2620d709c2202893b218e2e6a55c3c0ce6bebd27fa4120f6"
+SRC_URI[md5sum] = "3e6e77ae06aad73bbedbabed3f0d508e"
+SRC_URI[sha256sum] = "795dc8eb45e07c7848c58e2f2d730a404179ecce3dd1cd7b822cdec5ea7b69c8"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
Signature · 1 line
1.7.7
author
#20 lore raw

PATCH 5/7 jakarta-libs: fixed SRC_URI for avalon-framework-api-4.3

In reply to Steffen Sledz
Signed-off-by Steffen Sledz <[email protected]>
---
 recipes/jakarta-libs/avalon-framework-api_4.3.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/jakarta-libs/avalon-framework-api_4.3.bb +1 -1
index 06fde62..3340f5b 100644
@@ -3,7 +3,7 @@ LICENSE = "AL2.0"
 AUTHOR = "Apache Software Foundation"
 
 SRC_URI = "\
-	http://www.apache.org/dist/excalibur/avalon-framework/source/${BP}-src.tar.gz;name=archive \
+	http://archive.apache.org/dist/excalibur/framework/source/${BP}-src.tar.gz;name=archive \
 	http://www.apache.org/dist/avalon/logkit/source/logkit-1.2.2-src.tar.gz;name=logkit \
 	"
Signature · 1 line
1.7.7
author
#21 lore raw

PATCH 6/7 liblockfile-1.06: Update URI to a functioning one

In reply to Steffen Sledz

We have to use a specific date to the debian snapshot mirror to get this version of the file.

Signed-off-by Steffen Sledz <[email protected]>
---
 recipes/liblockfile/liblockfile_1.06.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/liblockfile/liblockfile_1.06.bb +1 -1
index 0235dbd..cfac5b7 100644
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PR ="r1"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_${PV}.tar.gz \
+SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/libl/liblockfile/liblockfile_${PV}.tar.gz \
 	   file://install.patch \
 	   file://configure.patch \
 	   file://ldflags.patch \
Signature · 1 line
1.7.7
author
#22 lore raw

PATCH 7/7 ltrace-0.5.3: Update URI to a functioning one

In reply to Steffen Sledz

We have to use a specific date to the debian snapshot mirror to get this version of the file.

Signed-off-by Steffen Sledz <[email protected]>
---
 recipes/ltrace/ltrace_0.5.3.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/ltrace/ltrace_0.5.3.bb +2 -2
index 53f4892..2fb7767 100644
@@ -10,8 +10,8 @@ PR = "r3"
 COMPATIBLE_TARGET_SYS = (?!sh[34])
 
 SRC_URI = "\
-  ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz;name=archive \
-  ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.diff.gz;name=patch \
+  http://snapshot.debian.org/archive/debian/20090801T192339Z/pool/main/l/ltrace/ltrace_${PV}.orig.tar.gz;name=archive \
+  http://snapshot.debian.org/archive/debian/20090801T192339Z/pool/main/l/ltrace/ltrace_${PV}-2.diff.gz;name=patch \
   file://add-sysdep.patch \
   file://ltrace-compile.patch \
   file://ltrace-mips-remove-CP.patch \
Signature · 1 line
1.7.7
Applied
#23 lore raw

Re: [2011.03-maintenance 0/7] pull request 20120314

In reply to Steffen Sledz
Quoted 10 lines · Steffen Sledz

Hi Tom,

please pull these commits cherry-picked from oe.dev.

The first one fixes a build problem with net-snmp and libnl. The others fix various fetch problems. All are well tested in our own environment.

This request replaces my pull request 20120224 which was rejected by you with the wish to use shapshot.debian.org for various SRC_URIs.

Applied, thanks!

Signature · 1 line
Tom