[oe-commits] org.oe.dev merge of '3e0e5727f7fe0745a9ac42f53da9955314c5f869'
thesing commit
openembedded-commits at lists.openembedded.org
Sun Feb 24 00:13:01 UTC 2008
merge of '3e0e5727f7fe0745a9ac42f53da9955314c5f869'
and '7ab0c406df80db3fa391ee33a803bc653763cafb'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 6532acc7ea90348a664d957c08288d6d93c60760
ViewMTN: http://monotone.openembedded.org/revision/info/6532acc7ea90348a664d957c08288d6d93c60760
Files:
1
packages/kexec/kexec-tools-static_1.101.bb
packages/altboot/altboot_1.1.1+wip-SVNR78.bb
packages/altboot/altboot_1.1.1+wip-SVNR79.bb
packages/free42/free42-vga_1.4.36.bb
packages/free42/free42-vga_1.4.41.bb
packages/fbset/fbset-init
packages/fbset/fbset-modes/qemuarm
packages/fbset/fbset-init/default-fbset
packages/fbset/fbset-init/fbset.sh
packages/fbset/fbset-init.bb
packages/fbset/fbset-modes/qemuarm/fb.modes
classes/base.bbclass
classes/sanity.bbclass
conf/bitbake.conf
conf/checksums.ini
conf/sanity.conf
packages/fbset/fbset-modes.bb
packages/gpsdrive/gpsdrive_2.10pre2.bb
packages/gpsdrive/gpsdrive_2.10pre3.bb
packages/psplash/psplash_svn.bb
packages/ttf-fonts/ttf-dejavu_2.23.bb
mtn:execute
true
Diffs:
#
# mt diff -r3e0e5727f7fe0745a9ac42f53da9955314c5f869 -r6532acc7ea90348a664d957c08288d6d93c60760
#
#
#
# patch "packages/kexec/kexec-tools-static_1.101.bb"
# from [d0f22ab3acf2088a1f8f5c9d8c236df7ab851083]
# to [5c7677ba0e8d8e43af7045696503b09ba7f8aab6]
#
============================================================
--- packages/kexec/kexec-tools-static_1.101.bb d0f22ab3acf2088a1f8f5c9d8c236df7ab851083
+++ packages/kexec/kexec-tools-static_1.101.bb 5c7677ba0e8d8e43af7045696503b09ba7f8aab6
@@ -1,7 +1,7 @@ require kexec-tools.inc
# the binaries are statical linked against klibc
require kexec-tools.inc
-PR = "r1"
+PR = "r2"
DEPENDS = "klibc"
SRC_URI += "file://kexec-klibc.patch;patch=1"
@@ -16,7 +16,7 @@ export LDFLAGS=""
export CPPFLAGS=""
export LDFLAGS=""
-PACKAGES =+ "kexec-klibc kdump-klibc"
+PACKAGES =+ "kexec-static kdump-static"
FILES_kexec-klibc = "${sbindir}/kexec"
FILES_kdump-klibc = "${sbindir}/kdump"
#
# mt diff -r7ab0c406df80db3fa391ee33a803bc653763cafb -r6532acc7ea90348a664d957c08288d6d93c60760
#
#
#
# rename "packages/altboot/altboot_1.1.1+wip-SVNR78.bb"
# to "packages/altboot/altboot_1.1.1+wip-SVNR79.bb"
#
# rename "packages/free42/free42-vga_1.4.36.bb"
# to "packages/free42/free42-vga_1.4.41.bb"
#
# add_dir "packages/fbset/fbset-init"
#
# add_dir "packages/fbset/fbset-modes/qemuarm"
#
# add_file "packages/fbset/fbset-init/default-fbset"
# content [75705626b2020d4da86e03d8ec233c6a7f471f40]
#
# add_file "packages/fbset/fbset-init/fbset.sh"
# content [cad0c4d5575c11336c95f684d2de2aca9ca97a93]
#
# add_file "packages/fbset/fbset-init.bb"
# content [a83fcda44f7eb9b99d9ff8d0a0f061a69b2ba2f6]
#
# add_file "packages/fbset/fbset-modes/qemuarm/fb.modes"
# content [d7e99588e4262702106e8b8c0dd75c117f3ff997]
#
# patch "classes/base.bbclass"
# from [b9e3242f33b6557cb0a7ae902cf31b9a284c1db3]
# to [1a4cea219c6fbdcac157bc9e75d192ac0d8ff7fc]
#
# patch "classes/sanity.bbclass"
# from [17eaa6a6a031b90e039f0607d801649c4c1c56b4]
# to [2891c5197046f50c1ea83ee2502e4a49ae595aed]
#
# patch "conf/bitbake.conf"
# from [20411cfe48d828effd31bc1b225638aa75828191]
# to [ea1e16116ff065e62f58aa7bb32a1757f5aa0695]
#
# patch "conf/checksums.ini"
# from [d46efbb6c50b6c05af0157650b6e3e6a51f5243d]
# to [eb9de8f37d459cdc0493e46911c3d815b00b240f]
#
# patch "conf/sanity.conf"
# from [8074d545842c568a6a98bad4358a6da7c037e6c6]
# to [19e2e5d9bfa5113b4c25577b445fd588b4a0999b]
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR79.bb"
# from [23034faf0bf4b951b3987f4253824cfdc50c4459]
# to [92a2019a88f00288a822465089cc720b1d997615]
#
# patch "packages/fbset/fbset-modes.bb"
# from [414d4cdbb4ad78dce7653a1ff5b6825200370c26]
# to [b6bc4b79dc3409ade5a257e67bcb6eaad78e693d]
#
# patch "packages/free42/free42-vga_1.4.41.bb"
# from [affee0392f2e9a5336abf00c6e4fd71d74c796cc]
# to [a6ade0fcdd09478ecb22e8612d24fa99a5c986c6]
#
# patch "packages/gpsdrive/gpsdrive_2.10pre2.bb"
# from [93bb980156ef9b9d196e0009f4a6380e9eaa5133]
# to [29a714e888f2ef1c714628caa9619d49cfc6609b]
#
# patch "packages/gpsdrive/gpsdrive_2.10pre3.bb"
# from [e63780f5ca196c284339d860c6e30e64fa95b65e]
# to [fd9c716c886a1f0c00d776ff46083b8cc5c6efea]
#
# patch "packages/psplash/psplash_svn.bb"
# from [b698aff22a0110395efea1fa894814aa903d798e]
# to [fa4a90b01b11bc3fd19dec0f01b3f34da4aef5ec]
#
# patch "packages/ttf-fonts/ttf-dejavu_2.23.bb"
# from [fb12ffa0e0b11e13b88d1a6e8b63489c7c461026]
# to [1472225038dc6d20a8ce435c6caf0ffa2dcb67e1]
#
# set "packages/fbset/fbset-init/fbset.sh"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/fbset/fbset-init/default-fbset 75705626b2020d4da86e03d8ec233c6a7f471f40
+++ packages/fbset/fbset-init/default-fbset 75705626b2020d4da86e03d8ec233c6a7f471f40
@@ -0,0 +1,3 @@
+# Uncomment and set value below to one of modes from /etc/fb.modes
+# or alternatively to "-xres <width> -yres <height>"
+#FBSET_MODE="vga"
============================================================
--- packages/fbset/fbset-init/fbset.sh cad0c4d5575c11336c95f684d2de2aca9ca97a93
+++ packages/fbset/fbset-init/fbset.sh cad0c4d5575c11336c95f684d2de2aca9ca97a93
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+. /etc/default/fbset
+[ -n "$FBSET_MODE" ] && fbset -n $FBSET_MODE
============================================================
--- packages/fbset/fbset-init.bb a83fcda44f7eb9b99d9ff8d0a0f061a69b2ba2f6
+++ packages/fbset/fbset-init.bb a83fcda44f7eb9b99d9ff8d0a0f061a69b2ba2f6
@@ -0,0 +1,19 @@
+DESCRIPTION = "Set framebuffer mode during boot"
+PR = "r1"
+
+SRC_URI = "file://fbset.sh file://default-fbset"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "fbset.sh"
+INITSCRIPT_PARAMS = "start 0 S ."
+
+do_install() {
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${sysconfdir}/default
+ install -m 0755 ${WORKDIR}/fbset.sh ${D}${sysconfdir}/init.d/
+ install -m 0644 ${WORKDIR}/default-fbset ${D}${sysconfdir}/default/fbset
+}
+
+PACKAGE_ARCH = "all"
+CONFFILES_${PN} = "${sysconfdir}/default/fbset"
============================================================
--- packages/fbset/fbset-modes/qemuarm/fb.modes d7e99588e4262702106e8b8c0dd75c117f3ff997
+++ packages/fbset/fbset-modes/qemuarm/fb.modes d7e99588e4262702106e8b8c0dd75c117f3ff997
@@ -0,0 +1,17 @@
+# QEMU versatilepb machine, qemuarm in OE
+
+mode "vga" "640x480"
+ geometry 640 480 640 480 16
+endmode
+
+mode "vga-portrait" "480x640"
+ geometry 480 640 480 640 16
+endmode
+
+mode "qvga" "320x240"
+ geometry 320 240 320 240 16
+endmode
+
+mode "qvga-portrait" "240x320"
+ geometry 240 320 240 320 16
+endmode
============================================================
--- classes/base.bbclass b9e3242f33b6557cb0a7ae902cf31b9a284c1db3
+++ classes/base.bbclass 1a4cea219c6fbdcac157bc9e75d192ac0d8ff7fc
@@ -85,7 +85,7 @@ def base_dep_prepend(d):
def base_dep_prepend(d):
- import bb;
+ import bb
#
# Ideally this will check a flag so we will operate properly in
# the case where host == build == target, for now we don't work in
@@ -777,8 +777,10 @@ def get_subpkgedata_fn(pkg, d):
import bb, os
archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ")
archs.reverse()
+ pkgdata = bb.data.expand('${STAGING_DIR}/pkgdata/', d)
+ targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d)
for arch in archs:
- fn = bb.data.expand('${STAGING_DIR}/pkgdata/' + arch + '${TARGET_VENDOR}-${TARGET_OS}/runtime/%s' % pkg, d)
+ fn = pkgdata + arch + targetdir + pkg
if os.path.exists(fn):
return fn
return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
@@ -814,6 +816,20 @@ python read_subpackage_metadata () {
bb.data.setVar(key, sdata[key], d)
}
+# Make sure MACHINE isn't exported
+# (breaks binutils at least)
+MACHINE[unexport] = "1"
+
+# Make sure TARGET_ARCH isn't exported
+# (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this
+# in them, undocumented)
+TARGET_ARCH[unexport] = "1"
+
+# Make sure DISTRO isn't exported
+# (breaks sysvinit at least)
+DISTRO[unexport] = "1"
+
+
def base_after_parse(d):
import bb, os, exceptions
@@ -833,8 +849,6 @@ def base_after_parse(d):
if this_machine and not re.match(need_machine, this_machine):
raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine)
-
-
pn = bb.data.getVar('PN', d, 1)
# OBSOLETE in bitbake 1.7.4
@@ -846,22 +860,6 @@ def base_after_parse(d):
if use_nls != None:
bb.data.setVar('USE_NLS', use_nls, d)
- # Make sure MACHINE isn't exported
- # (breaks binutils at least)
- bb.data.delVarFlag('MACHINE', 'export', d)
- bb.data.setVarFlag('MACHINE', 'unexport', 1, d)
-
- # Make sure TARGET_ARCH isn't exported
- # (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this
- # in them, undocumented)
- bb.data.delVarFlag('TARGET_ARCH', 'export', d)
- bb.data.setVarFlag('TARGET_ARCH', 'unexport', 1, d)
-
- # Make sure DISTRO isn't exported
- # (breaks sysvinit at least)
- bb.data.delVarFlag('DISTRO', 'export', d)
- bb.data.setVarFlag('DISTRO', 'unexport', 1, d)
-
# Git packages should DEPEND on git-native
srcuri = bb.data.getVar('SRC_URI', d, 1)
if "git://" in srcuri:
@@ -891,7 +889,7 @@ def base_after_parse(d):
if len(paths) == 0:
return
- for s in bb.data.getVar('SRC_URI', d, 1).split():
+ for s in srcuri.split():
if not s.startswith("file://"):
continue
local = bb.data.expand(bb.fetch.localpath(s, d), d)
============================================================
--- classes/sanity.bbclass 17eaa6a6a031b90e039f0607d801649c4c1c56b4
+++ classes/sanity.bbclass 2891c5197046f50c1ea83ee2502e4a49ae595aed
@@ -1,16 +1,7 @@
#
# Sanity check the users setup for common misconfigurations
#
-#
-# SANITY_ABI allows us to notify users when the format of TMPDIR changes in
-# an incompatible way. Such changes should usually be detailed in the commit
-# that breaks the format and have been previously discussed on the mailing list
-# with general agreement from the core team.
-#
-SANITY_ABI = "0"
-SANITY_ABIFILE = "${TMPDIR}/abi_version"
-
def raise_sanity_error(msg):
import bb
bb.fatal(""" Openembedded's config sanity checker detected a potential misconfiguration.
@@ -146,7 +137,10 @@ def check_sanity(e):
if os.path.exists(abifile):
f = file(abifile, "r")
abi = f.read().strip()
- if (abi != current_abi):
+ if not abi.isdigit():
+ f = file(abifile, "w")
+ f.write(current_abi)
+ elif (abi != current_abi):
# Code to convert from one ABI to another could go here if possible.
messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)
else:
============================================================
--- conf/bitbake.conf 20411cfe48d828effd31bc1b225638aa75828191
+++ conf/bitbake.conf ea1e16116ff065e62f58aa7bb32a1757f5aa0695
@@ -176,14 +176,14 @@ ALLOW_EMPTY_${PN}-dev = "1"
${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
SECTION_${PN}-dev = "devel"
ALLOW_EMPTY_${PN}-dev = "1"
-RDEPENDS_${PN}-dev = "${@['', '${PN} (= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+RDEPENDS_${PN}-dev = "${PN} (= ${DEBPV})"
FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
${libdir}/matchbox-panel/.debug"
SECTION_${PN}-dbg = "devel"
ALLOW_EMPTY_${PN}-dbg = "1"
-RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+RRECOMMENDS_${PN}-dbg = "${PN} (= ${DEBPV})"
FILES_${PN}-locale = "${datadir}/locale"
============================================================
--- conf/checksums.ini d46efbb6c50b6c05af0157650b6e3e6a51f5243d
+++ conf/checksums.ini eb9de8f37d459cdc0493e46911c3d815b00b240f
@@ -3306,6 +3306,10 @@ sha256=bd6767cc7c8d9551df0fb3e6d40706746
md5=fca5d26c8efea4e6e547c81c801bf67c
sha256=bd6767cc7c8d9551df0fb3e6d40706746723f6daa0ecd4a78facffc40f9d8a97
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.4.tar.bz2]
+md5=7ee7874108cbe9ea7fff1f4ab3389ce8
+sha256=10e6ebecc2cbd07f193a5d26b88c3bf2107e32b2a4d024f10f77f59a98d579ff
+
[http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-2.2.3.tar.bz2]
md5=aa214a10d873b68ddd67cd9de2ccae55
sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
@@ -12846,6 +12850,10 @@ sha256=e1a3c4986f16a5fbca611d0547cc7499a
md5=bb196907ea1e182dcb396eb22f7d2c1a
sha256=e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085
+[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.0.4.tar.bz2]
+md5=8b36cdf08df12be96615e3d550236626
+sha256=765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/xtrans-X11R7.0-1.0.0.tar.bz2]
md5=153642136a003871a9093c8103d6ac5a
sha256=c9a049b4367318b53cbad02bc7e3c4450778e3237400a515b2a6272405b8b912
============================================================
--- conf/sanity.conf 8074d545842c568a6a98bad4358a6da7c037e6c6
+++ conf/sanity.conf 19e2e5d9bfa5113b4c25577b445fd588b4a0999b
@@ -1,8 +1,18 @@ BB_MIN_VERSION = "1.8.10"
# Sanity checks for common user misconfigurations
#
# See sanity.bbclass
#
# Expert users can confirm their sanity with "touch conf/sanity.conf"
BB_MIN_VERSION = "1.8.10"
+
+#
+# SANITY_ABI allows us to notify users when the format of TMPDIR changes in
+# an incompatible way. Such changes should usually be detailed in the commit
+# that breaks the format and have been previously discussed on the mailing list
+# with general agreement from the core team.
+#
+SANITY_ABI = "0"
+SANITY_ABIFILE = "${TMPDIR}/abi_version"
+
INHERIT += "sanity"
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR78.bb 23034faf0bf4b951b3987f4253824cfdc50c4459
+++ packages/altboot/altboot_1.1.1+wip-SVNR79.bb 92a2019a88f00288a822465089cc720b1d997615
@@ -1,8 +1,8 @@ require altboot.inc
require altboot.inc
-PR = "r2"
+PR = "r0"
-SVN_REV = "78"
+SVN_REV = "79"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
"
============================================================
--- packages/fbset/fbset-modes.bb 414d4cdbb4ad78dce7653a1ff5b6825200370c26
+++ packages/fbset/fbset-modes.bb b6bc4b79dc3409ade5a257e67bcb6eaad78e693d
@@ -1,6 +1,6 @@ PV = "0.1.0"
DESCRIPTION = "Default display timings and resolutions for fbset"
PV = "0.1.0"
-PR = "r2"
+PR = "r3"
SRC_URI = "file://fb.modes"
============================================================
--- packages/free42/free42-vga_1.4.36.bb affee0392f2e9a5336abf00c6e4fd71d74c796cc
+++ packages/free42/free42-vga_1.4.41.bb a6ade0fcdd09478ecb22e8612d24fa99a5c986c6
@@ -1,10 +1,10 @@ DESCRIPTION = "Free42 RPN Calculator"
DESCRIPTION = "Free42 RPN Calculator"
+HOMEPAGE = "http://free42.sf.net"
SECTION = "openmoko/applications"
DEPENDS = "gtk+"
-PV = "1.4.36"
PR = "r1"
-SRC_URI = "http://home.planet.nl/~demun000/thomas_projects/free42/free42.tgz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/free42/free42.tgz \
http://sense.net/zc/free42/42c_skins.tgz \
file://free42-bcd-gtk-only.patch;patch=1 \
file://free42-vga-skin.patch;patch=1 \
============================================================
--- packages/gpsdrive/gpsdrive_2.10pre2.bb 93bb980156ef9b9d196e0009f4a6380e9eaa5133
+++ packages/gpsdrive/gpsdrive_2.10pre2.bb 29a714e888f2ef1c714628caa9619d49cfc6609b
@@ -9,7 +9,7 @@ LICENSE = "GPL"
PRIORITY = "optional"
LICENSE = "GPL"
-SRC_URI = "http://www.gpsdrive.de/${PN}-${PV}.tar.gz \
+SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
file://gpsdrive.desktop"
CFLAGS += "-D_GNU_SOURCE"
============================================================
--- packages/gpsdrive/gpsdrive_2.10pre3.bb e63780f5ca196c284339d860c6e30e64fa95b65e
+++ packages/gpsdrive/gpsdrive_2.10pre3.bb fd9c716c886a1f0c00d776ff46083b8cc5c6efea
@@ -11,7 +11,7 @@ LICENSE = "GPL"
PRIORITY = "optional"
LICENSE = "GPL"
-SRC_URI = "http://www.ostertag.name/tweety/Projekte/gpsdrive/gpsdrive-2.10pre3.tar.gz \
+SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
file://gpsdrive.desktop"
CFLAGS += "-D_GNU_SOURCE"
============================================================
--- packages/psplash/psplash_svn.bb b698aff22a0110395efea1fa894814aa903d798e
+++ packages/psplash/psplash_svn.bb fa4a90b01b11bc3fd19dec0f01b3f34da4aef5ec
@@ -1,9 +1,9 @@ PV = "0.0+svnr${SRCREV}"
DESCRIPTION = "Userspace framebuffer boot logo based on usplash."
HOMEPAGE = "http://projects.o-hand.com/psplash"
SECTION = "base"
LICENSE = "GPL"
PV = "0.0+svnr${SRCREV}"
-PR = "r12"
+PR = "r13"
RDEPENDS = "initscripts"
# You can create your own pslash-hand-img.h by doing
@@ -36,6 +36,6 @@ INITSCRIPT_NAME = "psplash"
}
INITSCRIPT_NAME = "psplash"
-INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ."
FILES_${PN} += "/mnt/.psplash"
============================================================
--- packages/ttf-fonts/ttf-dejavu_2.23.bb fb12ffa0e0b11e13b88d1a6e8b63489c7c461026
+++ packages/ttf-fonts/ttf-dejavu_2.23.bb 1472225038dc6d20a8ce435c6caf0ffa2dcb67e1
@@ -18,6 +18,7 @@ PACKAGES = "${PN}-dbg ttf-dejavu-sans tt
PACKAGES = "${PN}-dbg ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \
ttf-dejavu-serif ttf-dejavu-serif-condensed ttf-dejavu-common"
+RRECOMMENDS_${PN}-dbg = ""
FILES_ttf-dejavu-sans = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf"
FILES_ttf-dejavu-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf"
More information about the Openembedded-commits
mailing list