Skip to contentSkip to conversation

Pull request 20120719

PATCH Applied Apelete Seketeli 2 participants 15 messages Jul 19, 2012 – Jul 30, 2012

lore
Share & tools
lore
#0 lore raw

cover Pull request 20120719

Hello,

The patches that come as a follow-up of this message fix issues found while building muffinman-image on top of the 2011.03-maintenance branch.
These modifications were tested by successfully building muffinman-image from scratch on a Debian Squeeze host. Please pull into 2011.03-maintenance branch.

The following changes since commit f9611c025109a3e0d6cebf12f49ae24c97759c09:

psplash: convert from svn.o-hand.com to git.yoctoproject.org (2012-07-04 22:34:04 +0200)

are available in the git repository at:

git://seketeli.net/~apelete/oe.git muffinman-image-fix

Apelete Seketeli (9):
mirrors.bbclass: add new GNU_MIRROR mirrors.bbclass: add new KERNELORG_MIRROR
libpng: update SRC_URI
bluez4_4.84: update checksum values
netsurf: update SRC_URI
tzcode: update SRC_URI
tzdata: update SRC_URI
git: update SRC_URI
opkg-utils: bump SRCREV to keep python2.6 compatibility

 classes/mirrors.bbclass                 |    2 ++
 recipes/bluez/bluez4_4.84.bb            |    4 ++--
 recipes/git/git.inc                     |    2 +-
 recipes/libpng/libpng.inc               |    2 +-
 recipes/netsurf/hubbub_0.0.2.bb         |    2 +-
 recipes/netsurf/libcss_0.0.2.bb         |    2 +-
 recipes/netsurf/libnsbmp_0.0.2.bb       |    2 +-
 recipes/netsurf/libnsgif_0.0.2.bb       |    2 +-
 recipes/netsurf/libparserutils_0.0.2.bb |    2 +-
 recipes/netsurf/libwapcaplet_0.0.2.bb   |    2 +-
 recipes/netsurf/netsurf_2.6.bb          |    2 +-
 recipes/opkg-utils/opkg-utils_git.bb    |    4 ++--
 recipes/tzcode/tzcode-native.inc        |    4 ++--
 recipes/tzdata/tzdata.inc               |    2 +-
 14 files changed, 18 insertions(+), 16 deletions(-)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/9 mirrors.bbclass: add new GNU_MIRROR

Add ftp://mirrors.usc.edu/pub/gnu as a new GNU_MIRROR because the binutils_2.21 source package could not be found on any of the defined GNU mirrors.

---
 classes/mirrors.bbclass |    1 +
 1 file changed, 1 insertion(+)
classes/mirrors.bbclass +1 -0
index bb4f1ec..d4fc2a5 100644
@@ -22,6 +22,7 @@ ${GNU_MIRROR}	ftp://mirrors.kernel.org/gnu
 ${GNU_MIRROR}	ftp://ftp.cs.ubc.ca/mirror2/gnu
 ${GNU_MIRROR}	ftp://sunsite.ust.hk/pub/gnu
 ${GNU_MIRROR}	ftp://ftp.ayamura.org/pub/gnu
+${GNU_MIRROR}	ftp://mirrors.usc.edu/pub/gnu
 ${KERNELORG_MIRROR}	http://www.kernel.org/pub
 ${KERNELORG_MIRROR}	ftp://ftp.us.kernel.org/pub
 ${KERNELORG_MIRROR}	ftp://ftp.uk.kernel.org/pub
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/9 mirrors.bbclass: add new KERNELORG_MIRROR

In reply to Apelete Seketeli

Add http://mirror.sit.wisc.edu/pub as a new KERNELORG_MIRROR because the libpam_1.1.1 source package could not be found on any of the defined kernel.org mirrors.

---
 classes/mirrors.bbclass |    1 +
 1 file changed, 1 insertion(+)
classes/mirrors.bbclass +1 -0
index d4fc2a5..5c6219b 100644
@@ -23,6 +23,7 @@ ${GNU_MIRROR}	ftp://ftp.cs.ubc.ca/mirror2/gnu
 ${GNU_MIRROR}	ftp://sunsite.ust.hk/pub/gnu
 ${GNU_MIRROR}	ftp://ftp.ayamura.org/pub/gnu
 ${GNU_MIRROR}	ftp://mirrors.usc.edu/pub/gnu
+${KERNELORG_MIRROR}/pub	http://mirror.sit.wisc.edu/pub
 ${KERNELORG_MIRROR}	http://www.kernel.org/pub
 ${KERNELORG_MIRROR}	ftp://ftp.us.kernel.org/pub
 ${KERNELORG_MIRROR}	ftp://ftp.uk.kernel.org/pub
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 3/9 libpng: update SRC_URI

In reply to Apelete Seketeli

Update the SRC_URI of libpng.inc since the libpng-1.2.44 source package has been moved to another directory on ftp.simplesystems.org.

---
 recipes/libpng/libpng.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes/libpng/libpng.inc +1 -1
index 7c6d247..bb2540b 100644
@@ -12,7 +12,7 @@ BBCLASSEXTEND = "native"
 
 RPROVIDES += "libpng3"
 
-SRC_URI = "ftp://ftp.simplesystems.org/pub/png/src/libpng-${PV}.tar.bz2;name=libpng"
+SRC_URI = "ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng12/libpng-${PV}.tar.bz2;name=libpng"
 S = "${WORKDIR}/libpng-${PV}"
 
 inherit autotools pkgconfig binconfig
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH 4/9 bluez4_4.84: update checksum values

In reply to Apelete Seketeli

Update the md5 and sha256 checksum values reported in bluez4_4.84.bb to actually match the ones of the source package.

---
 recipes/bluez/bluez4_4.84.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes/bluez/bluez4_4.84.bb +2 -2
index 729f38c..abfd39f 100644
@@ -1,7 +1,7 @@
 require bluez4.inc
 
-SRC_URI[md5sum] = "95e66f26f69aa425d27718f487b6bc74"
-SRC_URI[sha256sum] = "2913b0b09738295547c1bfdcca9e1da456c9ad6950cc499b1ee83b330bf8a5b6"
+SRC_URI[md5sum] = "fd2586143e2d87ee5cb1474cf2d6a221"
+SRC_URI[sha256sum] = "7dac3fb1c6d92fd86e5d98923c4da48b14fffec7b327f9008cacd1ca7777f371"
 
 DEPENDS += "libsndfile1"
 
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH 5/9 netsurf: update SRC_URI

In reply to Apelete Seketeli

Update the SRC_URI of the following recipes, since the NetSurf project has moved the download repository of its source packages:
- hubbub_0.0.2.bb
- libcss_0.0.2.bb
- libnsbmp_0.0.2.bb
- libnsgif_0.0.2.bb
- libparserutils_0.0.2.bb
- libwapcaplet_0.0.2.bb
- netsurf_2.6.bb

---
 recipes/netsurf/hubbub_0.0.2.bb         |    2 +-
 recipes/netsurf/libcss_0.0.2.bb         |    2 +-
 recipes/netsurf/libnsbmp_0.0.2.bb       |    2 +-
 recipes/netsurf/libnsgif_0.0.2.bb       |    2 +-
 recipes/netsurf/libparserutils_0.0.2.bb |    2 +-
 recipes/netsurf/libwapcaplet_0.0.2.bb   |    2 +-
 recipes/netsurf/netsurf_2.6.bb          |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
recipes/netsurf/hubbub_0.0.2.bb +1 -1
index 0d6b828..319fe1d 100644
@@ -7,7 +7,7 @@ DEPENDS = "libparserutils"
 
 PR = "r1"
 
-SRC_URI = "http://www.netsurf-browser.org/projects/releases/hubbub-${PV}-src.tar.gz"
+SRC_URI = "http://download.netsurf-browser.org/libs/releases/hubbub-${PV}-src.tar.gz"
 
 inherit pkgconfig
 
recipes/netsurf/libcss_0.0.2.bb +1 -1
index 42424c4..213b57e 100644
@@ -7,7 +7,7 @@ DEPENDS = "libwapcaplet"
 
 PR = "r1"
 
-SRC_URI = "http://www.netsurf-browser.org/projects/releases/libcss-${PV}-src.tar.gz \
+SRC_URI = "http://download.netsurf-browser.org/libs/releases/libcss-${PV}-src.tar.gz \
 	   file://no-werror.patch"
 
 inherit pkgconfig
recipes/netsurf/libnsbmp_0.0.2.bb +1 -1
index db02c1e..56eeb81 100644
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 
 PR = "r1"
 
-SRC_URI = "http://www.netsurf-browser.org/projects/releases/libnsbmp-${PV}-src.tar.gz"
+SRC_URI = "http://download.netsurf-browser.org/libs/releases/libnsbmp-${PV}-src.tar.gz"
 
 inherit pkgconfig
 
recipes/netsurf/libnsgif_0.0.2.bb +1 -1
index 5291169..57283f3 100644
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 
 PR = "r1"
 
-SRC_URI = "http://www.netsurf-browser.org/projects/releases/libnsgif-${PV}-src.tar.gz"
+SRC_URI = "http://download.netsurf-browser.org/libs/releases/libnsgif-${PV}-src.tar.gz"
 
 inherit pkgconfig
 
recipes/netsurf/libparserutils_0.0.2.bb +1 -1
index ea59272..cca2c02 100644
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 
 PR = "r1"
 
-SRC_URI = "http://www.netsurf-browser.org/projects/releases/libparserutils-${PV}-src.tar.gz"
+SRC_URI = "http://download.netsurf-browser.org/libs/releases/libparserutils-${PV}-src.tar.gz"
 
 inherit pkgconfig
 
recipes/netsurf/libwapcaplet_0.0.2.bb +1 -1
index 3ef4b3c..02c1d7a 100644
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 
 PR = "r1"
 
-SRC_URI = "http://www.netsurf-browser.org/projects/releases/libwapcaplet-${PV}-src.tar.gz"
+SRC_URI = "http://download.netsurf-browser.org/libs/releases/libwapcaplet-${PV}-src.tar.gz"
 
 inherit pkgconfig
 
recipes/netsurf/netsurf_2.6.bb +1 -1
index 607a18a..1e07223 100644
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.netsurf-browser.org/"
 SECTION = "x11/network"
 LICENSE = "GPLv2"
 
-SRC_URI = "http://www.netsurf-browser.org/downloads/releases/netsurf-${PV}-src.tar.gz \
+SRC_URI = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${PV}-src.tar.gz \
 	   file://fix_makefile.patch \
 	   file://debugxml_fix.patch \
 	   file://netsurf.png \
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH 6/9 tzcode: update SRC_URI

In reply to Apelete Seketeli

Update the SRC_URI of tzcode-native.inc to tzmirror.sunbase.org since elsie.nci.nih.gov seems to be down.

---
 recipes/tzcode/tzcode-native.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes/tzcode/tzcode-native.inc +2 -2
index 78ddec5..d2c711a 100644
@@ -2,8 +2,8 @@ DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
 INC_PR = "r4"
 
 SRC_URI = " \
-        ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz;name=tzcode-${PV} \
-        ftp://elsie.nci.nih.gov/pub/tzdata${TZDATA_PV}.tar.gz;name=tzdata-${TZDATA_PV} \
+        http://tzmirror.sunbase.org/tzfiles/oldtz/tzcode${PV}.tar.gz;name=tzcode-${PV} \
+        http://tzmirror.sunbase.org/tzfiles/oldtz/tzdata${TZDATA_PV}.tar.gz;name=tzdata-${TZDATA_PV} \
 	"
 
 S = "${WORKDIR}"
Signature · 1 line
1.7.10.4
#7 lore raw

PATCH 7/9 tzdata: update SRC_URI

In reply to Apelete Seketeli

Update the SRC_URI of tzdata.inc to tzmirror.sunbase.org since elsie.nci.nih.gov seems to be down.

---
 recipes/tzdata/tzdata.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes/tzdata/tzdata.inc +1 -1
index dd5c2c9..c9997d3 100644
@@ -12,7 +12,7 @@ RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarcti
              timezone-australia timezone-europe timezone-indian \
              timezone-iso3166.tab timezone-pacific timezone-zone.tab"
 
-SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz;name=tar"
+SRC_URI = "http://tzmirror.sunbase.org/tzfiles/oldtz/tzdata${PV}.tar.gz;name=tar"
 
 S = "${WORKDIR}"
 
Signature · 1 line
1.7.10.4
#8 lore raw

PATCH 8/9 git: update SRC_URI

In reply to Apelete Seketeli

Update SRC_URI to fetch git from one of the KERNELORG_MIRROR addresses instead of relying on a single kernel mirror.

---
 recipes/git/git.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes/git/git.inc +1 -1
index 003d7fa..eb59a2c 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "The git revision control system used by the Linux kernel develope
 SECTION = "console/utils"
 LICENSE = "GPLv2"
 
-SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2;name=src"
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/software/scm/git/git-${PV}.tar.bz2;name=src"
 
 S = "${WORKDIR}/git-${PV}"
 
Signature · 1 line
1.7.10.4
#9 lore raw

PATCH 9/9 opkg-utils: bump SRCREV to keep python2.6 compatibility

In reply to Apelete Seketeli

Fix an issue where opkg-utils was using a method that requires at least python2.7, causing compatibility issues on hosts that are still using python2.6.

---
 recipes/opkg-utils/opkg-utils_git.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes/opkg-utils/opkg-utils_git.bb +2 -2
index 997b292..75a1e9a 100644
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                      file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
 RDEPENDS_${PN} = "python"
 RDEPENDS_${PN}_virtclass-native = ""
-SRCREV = "44df9dd3dc411ca1255cb4b23bde7eb71aed4778"
+SRCREV = "423ecd36b4782327c16f516885d1248249c7724a"
 PV = "0.1.8+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=git \
            "
Signature · 1 line
1.7.10.4
#10 lore raw
In reply to Apelete Seketeli
Quoted 9 lines · Apelete Seketeli

Hello,

The patches that come as a follow-up of this message fix issues found while building muffinman-image on top of the 2011.03-maintenance branch.
These modifications were tested by successfully building muffinman-image from scratch on a Debian Squeeze host. Please pull into 2011.03-maintenance branch.

Quoted 7 lines

The following changes since commit f9611c025109a3e0d6cebf12f49ae24c97759c09:

psplash: convert from svn.o-hand.com to git.yoctoproject.org (2012-07-04 22:34:04 +0200)

are available in the git repository at:

git://seketeli.net/~apelete/oe.git muffinman-image-fix

I have a concern right now. It is that 9160263 was reported to have changed the behavior slightly such that some SDK tasks/images now fail. So..

[snip]

Quoted 1 line

opkg-utils: bump SRCREV to keep python2.6 compatibility

Is a little concerning. Denys, can you point to an upstream task / image that fails currently? Thanks!

Signature · 1 line
Tom
#11 lore raw
Quoted 15 lines · Tom Rini
Quoted 13 lines · Apelete Seketeli

Hello,

The patches that come as a follow-up of this message fix issues found while building muffinman-image on top of the 2011.03-maintenance branch.
These modifications were tested by successfully building muffinman-image from scratch on a Debian Squeeze host. Please pull into 2011.03-maintenance branch.

The following changes since commit f9611c025109a3e0d6cebf12f49ae24c97759c09:

psplash: convert from svn.o-hand.com to git.yoctoproject.org (2012-07-04 22:34:04 +0200)

Quoted 7 lines
Quoted 3 lines

are available in the git repository at:

git://seketeli.net/~apelete/oe.git muffinman-image-fix

I have a concern right now. It is that 9160263 was reported to have changed the behavior slightly such that some SDK tasks/images now fail. So..

I can't seem to find the commit corresponding to the 9160263 hash in the 2011.03 branch. Could you point it to me please ?

Quoted 5 lines

[snip]

Quoted 1 line

opkg-utils: bump SRCREV to keep python2.6 compatibility

Is a little concerning. Denys, can you point to an upstream task / image that fails currently? Thanks!

I did that change because muffinman-image wasn't building on a Debian Squeeze host, which runs python2.6. Maybe that was not a good way to proceed; I would gladly change the approach if necessary.

Cheers.

Signature · 1 line
        Apelete
#12 lore raw
Quoted 18 lines · Apelete Seketeli

Le 23-Jul-12, Tom Rini a ?crit:

Quoted 17 lines · Apelete Seketeli
Quoted 16 lines

Hello,

The patches that come as a follow-up of this message fix issues found while building muffinman-image on top of the 2011.03-maintenance branch.
These modifications were tested by successfully building muffinman-image from scratch on a Debian Squeeze host. Please pull into 2011.03-maintenance branch.

The following changes since commit f9611c025109a3e0d6cebf12f49ae24c97759c09:

psplash: convert from svn.o-hand.com to git.yoctoproject.org (2012-07-04 22:34:04 +0200)

are available in the git repository at:

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

git://seketeli.net/~apelete/oe.git muffinman-image-fix

I have a concern right now. It is that 9160263 was reported to have changed the behavior slightly such that some SDK tasks/images now fail. So..

I can't seem to find the commit corresponding to the 9160263 hash in the 2011.03 branch. Could you point it to me please ?

Sorry, the leading 'f' got missed, and I see Denys has a pull request to deal with that breakage now.

Signature · 1 line
Tom
#13 lore raw
In reply to Apelete Seketeli
Quoted 8 lines · Apelete Seketeli

The patches that come as a follow-up of this message fix issues found while building muffinman-image on top of the 2011.03-maintenance branch.
These modifications were tested by successfully building muffinman-image from scratch on a Debian Squeeze host. Please pull into 2011.03-maintenance branch.

Quoted 7 lines

The following changes since commit f9611c025109a3e0d6cebf12f49ae24c97759c09:

psplash: convert from svn.o-hand.com to git.yoctoproject.org (2012-07-04 22:34:04 +0200)

are available in the git repository at:

git://seketeli.net/~apelete/oe.git muffinman-image-fix

Hello,

Trying to bring some attention onto this thread.
Are there more blocking issues I should fix before getting those patches merged ?

Cheers.

Signature · 1 line
        Apelete
Applied
#14 lore raw
In reply to Apelete Seketeli
Quoted 28 lines · Apelete Seketeli

Hello,

The patches that come as a follow-up of this message fix issues found while building muffinman-image on top of the 2011.03-maintenance branch.
These modifications were tested by successfully building muffinman-image from scratch on a Debian Squeeze host. Please pull into 2011.03-maintenance branch.

The following changes since commit f9611c025109a3e0d6cebf12f49ae24c97759c09:

psplash: convert from svn.o-hand.com to git.yoctoproject.org (2012-07-04 22:34:04 +0200)

are available in the git repository at:

git://seketeli.net/~apelete/oe.git muffinman-image-fix

Apelete Seketeli (9):
mirrors.bbclass: add new GNU_MIRROR mirrors.bbclass: add new KERNELORG_MIRROR
libpng: update SRC_URI
bluez4_4.84: update checksum values
netsurf: update SRC_URI
tzcode: update SRC_URI
tzdata: update SRC_URI
git: update SRC_URI
opkg-utils: bump SRCREV to keep python2.6 compatibility

Quoted 15 lines
 classes/mirrors.bbclass                 |    2 ++
 recipes/bluez/bluez4_4.84.bb            |    4 ++--
 recipes/git/git.inc                     |    2 +-
 recipes/libpng/libpng.inc               |    2 +-
 recipes/netsurf/hubbub_0.0.2.bb         |    2 +-
 recipes/netsurf/libcss_0.0.2.bb         |    2 +-
 recipes/netsurf/libnsbmp_0.0.2.bb       |    2 +-
 recipes/netsurf/libnsgif_0.0.2.bb       |    2 +-
 recipes/netsurf/libparserutils_0.0.2.bb |    2 +-
 recipes/netsurf/libwapcaplet_0.0.2.bb   |    2 +-
 recipes/netsurf/netsurf_2.6.bb          |    2 +-
 recipes/opkg-utils/opkg-utils_git.bb    |    4 ++--
 recipes/tzcode/tzcode-native.inc        |    4 ++--
 recipes/tzdata/tzdata.inc               |    2 +-
 14 files changed, 18 insertions(+), 16 deletions(-)

Applied, thanks.

Signature · 1 line
Tom