Pull request 20120705
cover Pull request 20120705
Hello,
The patches that come as a follow-up of this message fix build issues for the muffinman-image recipe. This is the result of rebasing them from master and testing that the recipes still build. Please pull this commit into 2011.03-maintenance branch.
The following changes since commit 19af5b608b3c69dcd73501402fdba3ca2d16e7b2:
classes/mirrors.bbclass: update debian snapshot mirror url (2012-06-19 07:52:20 -0700)
are available in the git repository at:
git://seketeli.net/~apelete/oe.git muffinman-image-fix
Apelete Seketeli (14):
opkg-utils: rebase on oe-core recipe
util-linux-ng: update SRC_URI to kernel.org valid URI libecj-bootstrap_3.6.1: Update SRC_URI to archive.eclipse.org udev/acl_2.2.49: update recipe SRC_URI udev/attr_2.4.44: update recipe SRC_URI
udev: update SRC_URI of multiple recipes
task-muffinman: remove phoneme-advanced-foundation bluez4_4.42: update checksum values
gtk+: Rebase gtk+-2.20.1/no-demos.patch
gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1 openssl_1.0.0e: fix build issue for hosts without ipv6 xcursor-transparent-theme_0.1.1: update SRC_URI echinus_0.4.3.2: update SRC_URI
psplash: convert from svn.o-hand.com to git.yoctoproject.org
recipes/bluez/bluez4_4.42.bb | 4 +-
recipes/echinus/echinus_0.4.3.2.bb | 2 +-
recipes/ecj/libecj-bootstrap_3.6.1.bb | 2 +-
recipes/gtk+/gtk+-2.20.1/no-demos.patch | 7 +--
.../gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch | 22 ++++++++
recipes/gtk+/gtk+_2.20.1.bb | 1 +
recipes/openssl/openssl.inc | 5 +-
.../opkg-utils/index-ignore-filenotfound.patch | 54 --------------------
recipes/opkg-utils/opkg-utils/mtime-int.patch | 27 ----------
.../{opkg-utils_svn.bb => opkg-utils_git.bb} | 19 +++----
...ash-angstrom_svn.bb => psplash-angstrom_git.bb} | 5 +-
...plash-kaeilos_svn.bb => psplash-kaeilos_git.bb} | 6 +--
...3pandora_svn.bb => psplash-omap3pandora_git.bb} | 5 +-
.../{psplash-ti_svn.bb => psplash-ti_git.bb} | 5 +-
recipes/psplash/psplash.inc | 8 +--
recipes/psplash/{psplash_svn.bb => psplash_git.bb} | 5 +-
recipes/tasks/task-muffinman.bb | 2 +-
recipes/udev/acl_2.2.49.bb | 2 +-
recipes/udev/attr_2.4.44.bb | 2 +-
recipes/udev/udev_151.bb | 2 +-
recipes/udev/udev_154.bb | 2 +-
recipes/udev/udev_162.bb | 2 +-
recipes/udev/udev_165.bb | 2 +-
recipes/util-linux-ng/util-linux-ng.inc | 2 +-
.../xcursor-transparent-theme_0.1.1.bb | 2 +-
25 files changed, 68 insertions(+), 127 deletions(-)
create mode 100644 recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch
delete mode 100644 recipes/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
delete mode 100644 recipes/opkg-utils/opkg-utils/mtime-int.patch
rename recipes/opkg-utils/{opkg-utils_svn.bb => opkg-utils_git.bb} (44%)
rename recipes/psplash/{psplash-angstrom_svn.bb => psplash-angstrom_git.bb} (85%)
rename recipes/psplash/{psplash-kaeilos_svn.bb => psplash-kaeilos_git.bb} (77%)
rename recipes/psplash/{psplash-omap3pandora_svn.bb => psplash-omap3pandora_git.bb} (85%)
rename recipes/psplash/{psplash-ti_svn.bb => psplash-ti_git.bb} (86%)
rename recipes/psplash/{psplash_svn.bb => psplash_git.bb} (84%)Signature · 1 line
1.7.10
PATCH 1/14 opkg-utils: rebase on oe-core recipe
This patch updates SRC_URI as the svn.openmoko.org repository is now down. The changes of this patch were picked from oe-core and brought over.
This is the result of rebasing my patch 1ff63aa from master.
---
.../opkg-utils/index-ignore-filenotfound.patch | 54 --------------------
recipes/opkg-utils/opkg-utils/mtime-int.patch | 27 ----------
.../{opkg-utils_svn.bb => opkg-utils_git.bb} | 19 +++----
3 files changed, 10 insertions(+), 90 deletions(-)
delete mode 100644 recipes/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
delete mode 100644 recipes/opkg-utils/opkg-utils/mtime-int.patch
rename recipes/opkg-utils/{opkg-utils_svn.bb => opkg-utils_git.bb} (44%)recipes/opkg-utils/opkg-utils/index-ignore-filenotfound.patch deleted +0 -54
@@ -1,54 +0,0 @@ -If we're building an image and some package rebuilds while this is happening -some package can be removed/added to the ipk deploy directory. The image will -not depend on this package so we can safely ignore these cases rather than -error out. - -RP - 26/8/09 - -Index: opkg-utils/opkg-make-index -=================================================================== ---- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100 -+++ opkg-utils/opkg-make-index 2009-08-27 16:11:22.000000000 +0100 -@@ -96,6 +96,7 @@ - files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb') - files.sort() - for filename in files: -+ try: - basename = os.path.basename(filename) - pkg = None - fnameStat = os.stat(filename) -@@ -130,6 +131,12 @@ - to_morgue(basename) - if opt_s: - print filename -+ except OSError: -+ sys.stderr.write("Package %s disappeared on us!\n" % (filename)) -+ continue -+ except IOError: -+ sys.stderr.write("Package %s disappeared on us!\n" % (filename)) -+ continue - - pkgsStampsFile = open(stamplist_filename, "w") - for f in pkgsStamps.keys(): -@@ -148,6 +155,7 @@ - names = packages.packages.keys() - names.sort() - for name in names: -+ try: - pkg = packages.packages[name] - if locales_dir and pkg.depends: - depends = string.split(pkg.depends, ',') -@@ -165,6 +173,13 @@ - if (verbose): - sys.stderr.write("Writing info for package %s\n" % (pkg.package,)) - print pkg -+ except OSError: -+ sys.stderr.write("Package %s disappeared on us!\n" % (name)) -+ continue -+ except IOError: -+ sys.stderr.write("Package %s disappeared on us!\n" % (name)) -+ continue -+ - if packages_filename: - sys.stdout.close() - sys.stdout = old_stdout
recipes/opkg-utils/opkg-utils/mtime-int.patch deleted +0 -27
@@ -1,27 +0,0 @@ -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]> - -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]
recipes/opkg-utils/opkg-utils_git.bb renamed from recipes/opkg-utils/opkg-utils_svn.bb +10 -9
@@ -1,24 +1,25 @@ DESCRIPTION = "OPKG Package Manager Utilities" SECTION = "base" HOMEPAGE = "http://wiki.openmoko.org/wiki/Opkg" -PRIORITY = "optional" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" RDEPENDS_${PN} = "python" RDEPENDS_${PN}_virtclass-native = "" -SRCREV = "4747" -PV = "0.1.8+svnr${SRCPV}" -PR = "r6" +SRCREV = "44df9dd3dc411ca1255cb4b23bde7eb71aed4778" +PV = "0.1.8+git${SRCPV}" +PR = "r1" -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ - file://index-ignore-filenotfound.patch \ - file://mtime-int.patch" +SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=git \ + " -S = "${WORKDIR}/opkg-utils" +S = "${WORKDIR}/git" # Avoid circular dependencies from package_ipk.bbclass PACKAGES_virtclass-native = "" do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install + oe_runmake PREFIX=${prefix} DESTDIR=${D} install } BBCLASSEXTEND = "native"
Signature · 1 line
1.7.10
PATCH 2/14 util-linux-ng: update SRC_URI to kernel.org valid URI
In reply to Apelete SeketeliThis updates SRC_URI as the former kernel.org URI was no longer valid. This commit is the result of rebasing my patch 8007a4 from master.
--- recipes/util-linux-ng/util-linux-ng.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes/util-linux-ng/util-linux-ng.inc +1 -1
@@ -11,7 +11,7 @@ INC_PR = "r36" # allows for a release candidate RC ?= "" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2;name=archive" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2;name=archive" SRC_URI_append_chinook-compat = " file://chinook_libtool.patch "
Signature · 1 line
1.7.10
PATCH 3/14 libecj-bootstrap_3.6.1: Update SRC_URI to archive.eclipse.org
In reply to Apelete SeketeliThis updates SRC_URI to archive.eclipse.org since mirrors.ibiblio.org seems to be down.
This commit is the result of rebasing my patch f5ea9a from master.
--- recipes/ecj/libecj-bootstrap_3.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes/ecj/libecj-bootstrap_3.6.1.bb +1 -1
@@ -3,7 +3,7 @@ require libecj-bootstrap.inc PR = "r0" SRC_URI = " \ - http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/ecjsrc-${PV}.zip \ + http://archive.eclipse.org/eclipse/downloads/drops/R-3.6.1-201009090800/ecjsrc-${PV}.zip \ "
Signature · 1 line
1.7.10
PATCH 4/14 udev/acl_2.2.49: update recipe SRC_URI
In reply to Apelete SeketeliThis updates the SRC_URI of the acl_2.2.49.bb recipe since mirror.its.uidaho.edu seems to be down. Fetch acl package from download.savannah.gnu.org from now on.
This commit is the result of rebasing my patch 6162ae from master.
--- recipes/udev/acl_2.2.49.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes/udev/acl_2.2.49.bb +1 -1
@@ -3,7 +3,7 @@ LICENSE = "GPLv2" PR = "r5" DEPENDS = "attr" -SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/acl/acl-${PV}.src.tar.gz \ +SRC_URI = "http://download.savannah.gnu.org/releases/acl/acl-${PV}.src.tar.gz \ file://nolargefile.patch" inherit autotools lib_package
Signature · 1 line
1.7.10
PATCH 5/14 udev/attr_2.4.44: update recipe SRC_URI
In reply to Apelete SeketeliThis updates the SRC_URI of the attr_2.4.44.bb recipe since mirrors.its.uidaho.edu seems down. Fetch attr package from download.savannah.gnu.org from now on.
This commit is the result of rebasing my patch ba7351 from master.
--- recipes/udev/attr_2.4.44.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes/udev/attr_2.4.44.bb +1 -1
@@ -3,7 +3,7 @@ LICENSE = "GPLv2" PR = "r4" -SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/attr/attr-${PV}.src.tar.gz" +SRC_URI = "http://download.savannah.gnu.org/releases/attr/attr-${PV}.src.tar.gz" inherit gettext autotools lib_package EXTRA_OECONF = " --enable-gettext=yes \
Signature · 1 line
1.7.10
PATCH 6/14 udev: update SRC_URI of multiple recipes
In reply to Apelete SeketeliThis patch updates the SRC_URI of udev_151.bb, udev_154.bb, udev_162.bb and udev_165.bb recipes to www.mirrorservice.org because the corresponding source package is no longer available at kernel.org This commit is the result of rebasing my patch 206155 from master.
--- recipes/udev/udev_151.bb | 2 +- recipes/udev/udev_154.bb | 2 +- recipes/udev/udev_162.bb | 2 +- recipes/udev/udev_165.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
recipes/udev/udev_151.bb +1 -1
@@ -12,7 +12,7 @@ DEFAULT_PREFERENCE = "-1" DEPENDS = "gperf-native usbutils acl glib-2.0" RDEPENDS_${PN} += "module-init-tools-depmod udev-utils" -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ +SRC_URI = "http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://udev-replace-le16toh.patch \ file://udev-replace-lutimes.patch \ file://mount.blacklist \
recipes/udev/udev_154.bb +1 -1
@@ -15,7 +15,7 @@ RDEPENDS_${PN} += "module-init-tools-depmod udev-utils" SRC_URI[md5sum] = "4ee3bcc4e326e967167ccb6a6ba04514" SRC_URI[sha256sum] = "29d66a5a8499cc6e4f2bcc7f79f2c6b44f4d720cecef2e552f0354d792e40a83" -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ +SRC_URI = "http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://mount.blacklist \ file://run.rules \ "
recipes/udev/udev_162.bb +1 -1
@@ -15,7 +15,7 @@ RDEPENDS_${PN} += "module-init-tools-depmod udev-utils" SRC_URI[md5sum] = "7c537de77442317ef1b93f9dba38fd4e" SRC_URI[sha256sum] = "f536de7fc0ec231cb793aae9501c648763901d4360c27a864d1bdf3ed8aca00f" -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ +SRC_URI = "http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://mount.blacklist \ file://run.rules \ "
recipes/udev/udev_165.bb +1 -1
@@ -12,7 +12,7 @@ DEFAULT_PREFERENCE = "-1" DEPENDS = "gperf-native usbutils acl glib-2.0" RDEPENDS_${PN} += "module-init-tools-depmod udev-utils" -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ +SRC_URI = "http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://mount.blacklist \ file://run.rules \ "
Signature · 1 line
1.7.10
PATCH 7/14 task-muffinman: remove phoneme-advanced-foundation
In reply to Apelete SeketeliThis patch remove phoneme-advanced-foundation from the task-muffinman.bb recipe, since it is no longer supported. This commit is the result of rebasing my patch 93984e from master.
--- recipes/tasks/task-muffinman.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes/tasks/task-muffinman.bb +1 -1
@@ -14,4 +14,4 @@ RDEPENDS_${PN} = "echinus ourico dzen2 matchbox-desktop net-tools xinit \ fileselector feh imlib2-loaders mupdf stppc2x mplayer \ gcalc psplash jlime-extras greq midpath-backend-sdl \ midpath-core midpath-cldc libxmlpull-java netsurf-fb \ - phoneme-advanced-foundation" + "
Signature · 1 line
1.7.10
PATCH 8/14 bluez4_4.42: update checksum values
In reply to Apelete SeketeliThis patch updates the md5 and sha256 checksum values reported in recipes/bluez/bluez4_4.42.bb to match the ones of the source package actually.
This commit is the result of rebasing my patch a2a3f3 from master.
--- recipes/bluez/bluez4_4.42.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
recipes/bluez/bluez4_4.42.bb +2 -2
@@ -4,5 +4,5 @@ DEPENDS += "libsndfile1" PR = "${INC_PR}.1" -SRC_URI[md5sum] = "d24dfd3ca42847123e29f58b29af6948" -SRC_URI[sha256sum] = "ed7631a6d22b456eb26b881bdbe46ea47f93d2f192da420408bad4bbc245f796" +SRC_URI[md5sum] = "a44181c8cf79796a99b792a5372e602d" +SRC_URI[sha256sum] = "a834f3a961449c6ae83ad26aa5d0b82a6cdd7e49f608aa71a2454a33c62cfb99"
Signature · 1 line
1.7.10
PATCH 9/14 gtk+: Rebase gtk+-2.20.1/no-demos.patch
In reply to Apelete SeketeliThis patch rebases the recipes/gtk+/gtk+-2.20.1/no-demos.patch file against the version of the files of gtk+-2.20.1.
--- recipes/gtk+/gtk+-2.20.1/no-demos.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
recipes/gtk+/gtk+-2.20.1/no-demos.patch +4 -3
@@ -1,7 +1,8 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ +--- gtk+-2.20.1/Makefile.am.orig 2012-06-18 22:40:19.348040648 +0200 ++++ gtk+-2.20.1/Makefile.am 2012-06-18 22:40:41.272149318 +0200 +@@ -1,7 +1,7 @@ ## Makefile.am for GTK+ + include $(top_srcdir)/Makefile.decl -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib +SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
Signature · 1 line
1.7.10
PATCH 10/14 gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1
In reply to Apelete SeketeliThis patch adds a patch to the gtk+-2.20.1 recipe that removes the need to build test-inline-pixbufs.h in the demos/Makefile.am file of the gtk+-2.20.1 upstream package.
It also removes all the demo programs that were dependant on test-inline-pixbufs.h from demos/Makefile.am.
--- .../gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch | 22 ++++++++++++++++++++ recipes/gtk+/gtk+_2.20.1.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch
recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch new file +22 -0
@@ -0,0 +1,22 @@ +--- gtk+-2.20.1/demos/Makefile.am.orig 2012-06-18 21:53:07.365997572 +0200 ++++ gtk+-2.20.1/demos/Makefile.am 2012-06-18 21:53:43.718177837 +0200 +@@ -23,18 +23,9 @@ + $(GTK_DEP_LIBS) \ + $(MATH_LIB) + +-noinst_PROGRAMS = \ +- testpixbuf-drawable \ +- testanimation \ +- testpixbuf-color \ +- testpixbuf-save \ +- testpixbuf-scale \ +- pixbuf-demo +- + # Need to build test-inline-pixbufs.h for testpixbuf + if HAVE_PNG +-noinst_PROGRAMS += testpixbuf +-BUILT_SOURCES = test-inline-pixbufs.h ++BUILT_SOURCES = + endif + + if CROSS_COMPILING
recipes/gtk+/gtk+_2.20.1.bb +1 -0
@@ -7,6 +7,7 @@ SRC_URI_append_virtclass-native = " file://no-demos.patch \ SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \ file://cross-nm.patch \ file://xkb-ifdef.patch \ + file://no-test-inline-pixbufs.patch \ " SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa"
Signature · 1 line
1.7.10
PATCH 11/14 openssl_1.0.0e: fix build issue for hosts without ipv6
In reply to Apelete SeketeliThis patch fixes an issue where some ipv6 code was injected into the bss_dgram.c regardless of the ipv6 availability of the host. The code is now injected only if the host is ipv6 enabled.
--- recipes/openssl/openssl.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
recipes/openssl/openssl.inc +4 -1
@@ -100,7 +100,10 @@ do_configure () { perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl $target eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "/_FILE_OFFSET_BITS/,/#endif/d" ${S}/crypto/bio/bss_file.c', d)}" - eval "${@base_contains('DISTRO_FEATURES', 'ipv6', '', 'sed -i -e "/AF_INET6/,/break/d" ${S}/crypto/bio/bss_dgram.c', d)}" + # inject ipv6 specific code if ipv6 is enabled on host + if [ `lsmod | grep -q ipv6; echo $?` -eq 0 ]; then + eval "${@base_contains('DISTRO_FEATURES', 'ipv6', '', 'sed -i -e "/AF_INET6/,/break/d" ${S}/crypto/bio/bss_dgram.c', d)}" + fi } do_compile () {
Signature · 1 line
1.7.10
PATCH 12/14 xcursor-transparent-theme_0.1.1: update SRC_URI
In reply to Apelete SeketeliThis patch updates the SRC_URI of xcursor-transparent-theme_0.1.1.bb to projects.o-hand.com since the matchbox-project.org repository seems to be down.
--- recipes/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb +1 -1
@@ -3,7 +3,7 @@ DESCRIPTION = "Transparent xcursor theme for handheld systems" SECTION = "x11/base" PR ="r2" -SRC_URI = "http://matchbox-project.org/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \ +SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \ file://use-relative-symlinks.patch \ file://fix_watch_cursor.patch" FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
Signature · 1 line
1.7.10
PATCH 14/14 psplash: convert from svn.o-hand.com to git.yoctoproject.org
In reply to Apelete SeketeliConvert all psplash recipes from svn.o-hand.com to git.yoctoproject.org since svn.o-hand.com seems to be down.
---
.../{psplash-angstrom_svn.bb => psplash-angstrom_git.bb} | 5 ++---
.../psplash/{psplash-kaeilos_svn.bb => psplash-kaeilos_git.bb} | 6 ++----
...psplash-omap3pandora_svn.bb => psplash-omap3pandora_git.bb} | 5 ++---
recipes/psplash/{psplash-ti_svn.bb => psplash-ti_git.bb} | 5 ++---
recipes/psplash/psplash.inc | 8 ++++----
recipes/psplash/{psplash_svn.bb => psplash_git.bb} | 5 ++---
6 files changed, 14 insertions(+), 20 deletions(-)
rename recipes/psplash/{psplash-angstrom_svn.bb => psplash-angstrom_git.bb} (85%)
rename recipes/psplash/{psplash-kaeilos_svn.bb => psplash-kaeilos_git.bb} (77%)
rename recipes/psplash/{psplash-omap3pandora_svn.bb => psplash-omap3pandora_git.bb} (85%)
rename recipes/psplash/{psplash-ti_svn.bb => psplash-ti_git.bb} (86%)
rename recipes/psplash/{psplash_svn.bb => psplash_git.bb} (84%)recipes/psplash/psplash-angstrom_git.bb renamed from recipes/psplash/psplash-angstrom_svn.bb +2 -3
@@ -9,7 +9,7 @@ ALTERNATIVE_PRIORITY = "20" # respectively psplash-bar-img.h (BAR) for the bar. # You might also want to patch the colors (see patch) -SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ +SRC_URI = "git://git.yoctoproject.org/psplash;protocol=git \ file://psplash-18bpp.patch \ file://logo-math.patch \ file://psplash-poky-img.h \
@@ -17,5 +17,4 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ file://psplash-default \ file://splashfuncs \ file://psplash-init" -S = "${WORKDIR}/psplash" - +S = "${WORKDIR}/git"
recipes/psplash/psplash-kaeilos_git.bb renamed from recipes/psplash/psplash-kaeilos_svn.bb +2 -4
@@ -3,7 +3,7 @@ require psplash-ua.inc ALTERNATIVE_PRIORITY = "20" -SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ +SRC_URI = "git://git.yoctoproject.org/psplash;protocol=git \ file://logo-math.patch \ file://psplash-poky-img.h \ file://psplash-bar-img.h \
@@ -13,6 +13,4 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ file://psplash-18bpp.patch \ file://psplash-24bpp-BGR666.patch" -S = "${WORKDIR}/psplash" - - +S = "${WORKDIR}/git"
recipes/psplash/psplash-omap3pandora_git.bb renamed from recipes/psplash/psplash-omap3pandora_svn.bb +2 -3
@@ -10,12 +10,11 @@ ALTERNATIVE_PRIORITY_omap3pandora = "5" # respectively psplash-bar-img.h (BAR) for the bar. # You might also want to patch the colors (see patch) -SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ +SRC_URI = "git://git.yoctoproject.org/psplash;protocol=git \ file://logo-math.patch \ file://psplash-poky-img.h \ file://psplash-bar-img.h \ file://psplash-default \ file://splashfuncs \ file://psplash-init" -S = "${WORKDIR}/psplash" - +S = "${WORKDIR}/git"
recipes/psplash/psplash-ti_git.bb renamed from recipes/psplash/psplash-ti_svn.bb +2 -3
@@ -9,7 +9,7 @@ ALTERNATIVE_PRIORITY = "20" # respectively psplash-bar-img.h (BAR) for the bar. # You might also want to patch the colors (see patch) -SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ +SRC_URI = "git://git.yoctoproject.org/psplash;protocol=git \ file://psplash-18bpp.patch \ file://logo-math.patch \ file://0001-configurability-for-rev-422.patch \
@@ -18,5 +18,4 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ file://psplash-default \ file://splashfuncs \ file://psplash-init" -S = "${WORKDIR}/psplash" - +S = "${WORKDIR}/git"
recipes/psplash/psplash.inc +4 -4
@@ -1,14 +1,14 @@ DESCRIPTION = "Userspace framebuffer boot logo based on usplash." -HOMEPAGE = "http://projects.o-hand.com/psplash" +HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" PROVIDES = "virtual/psplash" RPROVIDES_${PN} = "virtual-psplash" RCONFLICTS_${PN} = "exquisite" -SRCREV = "422" -PV = "0.0+svnr${SRCPV}" -PR = "r34" +SRCREV = "d8ebee6f2b14d72b69bd37f1ea7e64e936a24695" +PV = "0.1+git${SRCPV}" +PR = "r0" # You can create your own pslash-poky-img.h by doing # ./make-image-header.sh <file>.png POKY
recipes/psplash/psplash_git.bb renamed from recipes/psplash/psplash_svn.bb +2 -3
@@ -3,17 +3,16 @@ require psplash-ua.inc ALTERNATIVE_PRIORITY = "10" -SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ +SRC_URI = "git://git.yoctoproject.org/psplash;protocol=git \ file://psplash-poky-img.h \ file://psplash-bar-img.h \ file://psplash-default \ file://splashfuncs \ file://psplash-init" -S = "${WORKDIR}/psplash" +S = "${WORKDIR}/git" # This really should be default, but due yo openmoko hack below, can't be easily SRC_URI_append_angstrom = " file://logo-math.patch " SRC_URI_append_jlime = " file://configurability.patch file://progress-color.patch " SRC_URI_append_openmoko = " file://configurability.patch " SRC_URI_append_boc01 = " file://psplash_grayscale.patch " -
Signature · 1 line
1.7.10
PATCH 13/14 echinus_0.4.3.2: update SRC_URI
In reply to Apelete SeketeliUpdate the SRC_URI of echinus_0.4.3.2.bb since the source tarball has been moved to a different directory on the source repository.
--- recipes/echinus/echinus_0.4.3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes/echinus/echinus_0.4.3.2.bb +1 -1
@@ -5,7 +5,7 @@ PR = "r2" DEPENDS = "virtual/libx11 libxft libxrandr" -SRC_URI = "http://plhk.ru/static/echinus/echinus-${PV}.tar.gz \ +SRC_URI = "http://plhk.ru/static/echinus/old/echinus-${PV}.tar.gz \ file://Makefile" SRC_URI_append_jlime = " file://echinus-jlime.patch "
Signature · 1 line
1.7.10
Tom Rini
AppliedQuoted 58 lines · Apelete Seketeli
Hello,
The patches that come as a follow-up of this message fix build issues for the muffinman-image recipe. This is the result of rebasing them from master and testing that the recipes still build. Please pull this commit into 2011.03-maintenance branch.
The following changes since commit
19af5b608b3c69dcd73501402fdba3ca2d16e7b2:classes/mirrors.bbclass: update debian snapshot mirror url (2012-06-19 07:52:20 -0700)
are available in the git repository at:
git://seketeli.net/~apelete/oe.gitmuffinman-image-fixApelete Seketeli (14):
opkg-utils: rebase on oe-core recipe
util-linux-ng: updateSRC_URIto kernel.org valid URI libecj-bootstrap_3.6.1: UpdateSRC_URIto archive.eclipse.org udev/acl_2.2.49: update recipeSRC_URIudev/attr_2.4.44: update recipeSRC_URI
udev: updateSRC_URIof multiple recipes
task-muffinman: remove phoneme-advanced-foundation bluez4_4.42: update checksum values
gtk+: Rebasegtk+-2.20.1/no-demos.patch
gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1 openssl_1.0.0e: fix build issue for hosts without ipv6 xcursor-transparent-theme_0.1.1: updateSRC_URIechinus_0.4.3.2: updateSRC_URI
psplash: convert from svn.o-hand.com to git.yoctoproject.orgrecipes/bluez/bluez4_4.42.bb | 4 +- recipes/echinus/echinus_0.4.3.2.bb | 2 +- recipes/ecj/libecj-bootstrap_3.6.1.bb | 2 +- recipes/gtk+/gtk+-2.20.1/no-demos.patch | 7 +-- .../gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch | 22 ++++++++ recipes/gtk+/gtk+_2.20.1.bb | 1 + recipes/openssl/openssl.inc | 5 +- .../opkg-utils/index-ignore-filenotfound.patch | 54 -------------------- recipes/opkg-utils/opkg-utils/mtime-int.patch | 27 ---------- .../{opkg-utils_svn.bb => opkg-utils_git.bb} | 19 +++---- ...ash-angstrom_svn.bb => psplash-angstrom_git.bb} | 5 +- ...plash-kaeilos_svn.bb => psplash-kaeilos_git.bb} | 6 +-- ...3pandora_svn.bb => psplash-omap3pandora_git.bb} | 5 +- .../{psplash-ti_svn.bb => psplash-ti_git.bb} | 5 +- recipes/psplash/psplash.inc | 8 +-- recipes/psplash/{psplash_svn.bb => psplash_git.bb} | 5 +- recipes/tasks/task-muffinman.bb | 2 +- recipes/udev/acl_2.2.49.bb | 2 +- recipes/udev/attr_2.4.44.bb | 2 +- recipes/udev/udev_151.bb | 2 +- recipes/udev/udev_154.bb | 2 +- recipes/udev/udev_162.bb | 2 +- recipes/udev/udev_165.bb | 2 +- recipes/util-linux-ng/util-linux-ng.inc | 2 +- .../xcursor-transparent-theme_0.1.1.bb | 2 +- 25 files changed, 68 insertions(+), 127 deletions(-) create mode 100644 recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch
Quoted 8 lines
delete mode 100644 recipes/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
delete mode 100644 recipes/opkg-utils/opkg-utils/mtime-int.patch
rename recipes/opkg-utils/{opkg-utils_svn.bb => opkg-utils_git.bb} (44%)
rename recipes/psplash/{psplash-angstrom_svn.bb => psplash-angstrom_git.bb} (85%)
rename recipes/psplash/{psplash-kaeilos_svn.bb => psplash-kaeilos_git.bb} (77%)
rename recipes/psplash/{psplash-omap3pandora_svn.bb => psplash-omap3pandora_git.bb} (85%)
rename recipes/psplash/{psplash-ti_svn.bb => psplash-ti_git.bb} (86%)
rename recipes/psplash/{psplash_svn.bb => psplash_git.bb} (84%)Merged to 2011.03-maintenance, thanks!
Signature · 1 line
Tom