summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/base.bbclass40
-rw-r--r--classes/sanity.bbclass14
-rw-r--r--conf/bitbake.conf4
-rw-r--r--conf/checksums.ini8
-rw-r--r--conf/sanity.conf10
-rw-r--r--packages/altboot/altboot_1.1.1+wip-SVNR79.bb (renamed from packages/altboot/altboot_1.1.1+wip-SVNR78.bb)4
-rw-r--r--packages/fbset/fbset-init.bb19
-rw-r--r--packages/fbset/fbset-init/.mtn2git_empty0
-rw-r--r--packages/fbset/fbset-init/default-fbset3
-rwxr-xr-xpackages/fbset/fbset-init/fbset.sh4
-rw-r--r--packages/fbset/fbset-modes.bb2
-rw-r--r--packages/fbset/fbset-modes/qemuarm/.mtn2git_empty0
-rw-r--r--packages/fbset/fbset-modes/qemuarm/fb.modes17
-rw-r--r--packages/free42/free42-vga_1.4.41.bb (renamed from packages/free42/free42-vga_1.4.36.bb)4
-rw-r--r--packages/gpsdrive/gpsdrive_2.10pre2.bb2
-rw-r--r--packages/gpsdrive/gpsdrive_2.10pre3.bb2
-rw-r--r--packages/psplash/psplash_svn.bb4
-rw-r--r--packages/ttf-fonts/ttf-dejavu_2.23.bb1
18 files changed, 96 insertions, 42 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 3250e0ca43..2f74104185 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -85,7 +85,7 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data):
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)
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 08b077a1e1..44c74a0354 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -2,15 +2,6 @@
# 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:
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index d0aa47a143..858e411d8c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -176,14 +176,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
${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"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 36b7a8f4bf..596674eca0 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3306,6 +3306,10 @@ sha256=6f36ca624a12dce03cdea59c9eb900eda49ea2f463b329737eb9f2a8f3ac144d
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=652f579171e6e8f73c13ab6b060d2447ae35ebfbd39a6002b7c05a1dfc0f7eb8
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
diff --git a/conf/sanity.conf b/conf/sanity.conf
index 0d494f1409..4af4454e2e 100644
--- a/conf/sanity.conf
+++ b/conf/sanity.conf
@@ -4,5 +4,15 @@
#
# 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"
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR78.bb b/packages/altboot/altboot_1.1.1+wip-SVNR79.bb
index db7c10d79f..335572f3c1 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR78.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR79.bb
@@ -1,8 +1,8 @@
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} \
"
diff --git a/packages/fbset/fbset-init.bb b/packages/fbset/fbset-init.bb
new file mode 100644
index 0000000000..f04691d793
--- /dev/null
+++ b/packages/fbset/fbset-init.bb
@@ -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"
diff --git a/packages/fbset/fbset-init/.mtn2git_empty b/packages/fbset/fbset-init/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fbset/fbset-init/.mtn2git_empty
diff --git a/packages/fbset/fbset-init/default-fbset b/packages/fbset/fbset-init/default-fbset
new file mode 100644
index 0000000000..5c163a7f7c
--- /dev/null
+++ b/packages/fbset/fbset-init/default-fbset
@@ -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"
diff --git a/packages/fbset/fbset-init/fbset.sh b/packages/fbset/fbset-init/fbset.sh
new file mode 100755
index 0000000000..900a1d4182
--- /dev/null
+++ b/packages/fbset/fbset-init/fbset.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+. /etc/default/fbset
+[ -n "$FBSET_MODE" ] && fbset -n $FBSET_MODE
diff --git a/packages/fbset/fbset-modes.bb b/packages/fbset/fbset-modes.bb
index 2724252125..403751c90a 100644
--- a/packages/fbset/fbset-modes.bb
+++ b/packages/fbset/fbset-modes.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Default display timings and resolutions for fbset"
PV = "0.1.0"
-PR = "r2"
+PR = "r3"
SRC_URI = "file://fb.modes"
diff --git a/packages/fbset/fbset-modes/qemuarm/.mtn2git_empty b/packages/fbset/fbset-modes/qemuarm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fbset/fbset-modes/qemuarm/.mtn2git_empty
diff --git a/packages/fbset/fbset-modes/qemuarm/fb.modes b/packages/fbset/fbset-modes/qemuarm/fb.modes
new file mode 100644
index 0000000000..1114564797
--- /dev/null
+++ b/packages/fbset/fbset-modes/qemuarm/fb.modes
@@ -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
diff --git a/packages/free42/free42-vga_1.4.36.bb b/packages/free42/free42-vga_1.4.41.bb
index 3f64f99c6a..ff5e07feae 100644
--- a/packages/free42/free42-vga_1.4.36.bb
+++ b/packages/free42/free42-vga_1.4.41.bb
@@ -1,10 +1,10 @@
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 \
diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb
index 675c556b6f..f44c5925d2 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre2.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre2.bb
@@ -9,7 +9,7 @@ SECTION = "x11"
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"
diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb
index cb651aaf39..6a97344260 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre3.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre3.bb
@@ -11,7 +11,7 @@ SECTION = "x11"
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"
diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb
index 17b459a15f..7e19ce3cbb 100644
--- a/packages/psplash/psplash_svn.bb
+++ b/packages/psplash/psplash_svn.bb
@@ -3,7 +3,7 @@ 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 @@ do_install_prepend() {
}
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"
diff --git a/packages/ttf-fonts/ttf-dejavu_2.23.bb b/packages/ttf-fonts/ttf-dejavu_2.23.bb
index c0655ec5f4..fe291163fc 100644
--- a/packages/ttf-fonts/ttf-dejavu_2.23.bb
+++ b/packages/ttf-fonts/ttf-dejavu_2.23.bb
@@ -18,6 +18,7 @@ do_install_append () {
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"
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-20 23:08:33 +0000