[oe-commits] org.oe.dev merge of '2ae8bcb602805ae4e0f884f4105f92526dd1c0db'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:41:12 UTC 2007
merge of '2ae8bcb602805ae4e0f884f4105f92526dd1c0db'
and '604336daca6c8f90c9634e4ee03d9a34dc153fc2'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 1ab663214c75f15191022cd0009603778fc2e828
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1ab663214c75f15191022cd0009603778fc2e828
Files:
1
conf/distro/angstrom-2007.1-oabi.conf
packages/altboot/altboot_1.0.5.bb
packages/altboot/altboot_1.1.1+wip-20061123.bb
packages/powertop/powertop_1.2.bb
packages/powertop/powertop_1.5.bb
packages/altboot/altboot.inc
packages/altboot/altboot_1.0.8+1.0.9_pre1.bb
packages/qpegps/qpegps.inc
packages/quake/quetoo_0.6.1.bb
MAINTAINERS
classes/palmtop.bbclass
classes/qmake-base.bbclass
conf/distro/angstrom-2007.1.conf
conf/documentation.conf
packages/altboot/README.txt
packages/altboot/altboot_1.0.8.bb
packages/altboot/altboot_1.1.1+wip-SVNR59.bb
packages/altboot/altboot_svn.bb
packages/display-brightness/display-brightness.sh
packages/display-brightness/display-brightness_1.0.0.bb
packages/libsdl/libsdl-x11_1.2.9.bb
packages/linux/linux-efika_2.6.21+git.bb
packages/qpegps/qpegps_0.9.2.3.3.bb
packages/qpegps/qpegps_0.9.3.bb
packages/qt/qt4-x11-free_4.3.0.bb
packages/usb-gadget-mode/files/usb-gadget
packages/usb-gadget-mode/usb-gadget-mode.bb
packages/xserver-common/files/sl-cxx00-modmap.patch
packages/xserver-common/xserver-common_1.16.bb
Diffs:
#
# mt diff -r2ae8bcb602805ae4e0f884f4105f92526dd1c0db -r1ab663214c75f15191022cd0009603778fc2e828
#
#
# no changes
#
#
# mt diff -r604336daca6c8f90c9634e4ee03d9a34dc153fc2 -r1ab663214c75f15191022cd0009603778fc2e828
#
#
#
# delete "conf/distro/angstrom-2007.1-oabi.conf"
#
# delete "packages/altboot/altboot_1.0.5.bb"
#
# delete "packages/altboot/altboot_1.1.1+wip-20061123.bb"
#
# rename "packages/powertop/powertop_1.2.bb"
# to "packages/powertop/powertop_1.5.bb"
#
# add_file "packages/altboot/altboot.inc"
# content [fe38b623c3b94fe6a165a38b80739fdfb73c498b]
#
# add_file "packages/altboot/altboot_1.0.8+1.0.9_pre1.bb"
# content [e011545d6b57783a1a980054514d51f4c8f33684]
#
# add_file "packages/qpegps/qpegps.inc"
# content [3da7e58c9eb26df021729878d8d0e46ebe5513ff]
#
# add_file "packages/quake/quetoo_0.6.1.bb"
# content [cec019795314a7f3433cc7d91beca0cd29e27c9c]
#
# patch "MAINTAINERS"
# from [8fa31ff402ace5a7fb922ac8b657329c63b10775]
# to [e37d9675092f5d37a4c9a17297f5f950308adcd9]
#
# patch "classes/palmtop.bbclass"
# from [8f2da59d99d7b1d032014727af453436c641ed29]
# to [47dee0d1bcbc560241a59d1d1689a90ca8e37b3f]
#
# patch "classes/qmake-base.bbclass"
# from [21899cea6a7a8f08dec40c2a294e92ea41fb9c6b]
# to [48e5a70a69927658c2baca79ac02bde07866b4fc]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [921aeb7f488e2edb792a20f3c13401a15a022c1d]
# to [830baec3c8ea1d6a5ddb795e4b4c06be10c09b8a]
#
# patch "conf/documentation.conf"
# from [c27c220c9046e06ac748ecd21f3f7015649e2174]
# to [39b05416fe91d4b5812b04d933b9da47d2659c73]
#
# patch "packages/altboot/README.txt"
# from [905cbc0cb0ea71adaf7859aa308b0c48eedee11b]
# to [0e100f5176af2abd03ef88701ccb2ca1080490a3]
#
# patch "packages/altboot/altboot_1.0.8.bb"
# from [a417814f691652989261c4e16bf27df1df4a97ee]
# to [e7cdd46a53bb7b9dfa3f4d7520ec9e6dce521581]
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR59.bb"
# from [ba5876e9167b6f7e0bcfcf0afdd12a083ee20801]
# to [72d2d7b4a01f0e47e2adec56d30e908f85830f96]
#
# patch "packages/altboot/altboot_svn.bb"
# from [62210bf81e8d9f3b03164f129b4e69480d49c9ed]
# to [6ae5256c1654c364f27500c99be5940eacaff077]
#
# patch "packages/display-brightness/display-brightness.sh"
# from [6514199d482ee2a1e6717490df081ad6afd75183]
# to [65d5fbbe0cd033ba0494e31cea3e599716639d59]
#
# patch "packages/display-brightness/display-brightness_1.0.0.bb"
# from [1fe5e9f08ffe774f85d26dd27595708dce27381a]
# to [12c4830aa405d31ba29002a2d258c332667bd7b0]
#
# patch "packages/libsdl/libsdl-x11_1.2.9.bb"
# from [fc3c4b208e59cdabf6c0e729b4ec1e71fc27896e]
# to [06aede1a5997211b6a86bab9b2462f2f8e4c0343]
#
# patch "packages/linux/linux-efika_2.6.21+git.bb"
# from [8491828f3efeb168150c5c0a1e049aec6c73f4c6]
# to [ac553b761959b48ae473369a31200d64d21b8bc1]
#
# patch "packages/powertop/powertop_1.5.bb"
# from [e14455ce075789a206c06072ac67da6198db4477]
# to [e371d3eaa74c8f4e6688d7a4ce8fec8ab4a57d50]
#
# patch "packages/qpegps/qpegps_0.9.2.3.3.bb"
# from [0d96d6616d20ef2e47f54b224adb632d4804860b]
# to [5ed209f056be5ae98b7ed0041ffdc771e271b7be]
#
# patch "packages/qpegps/qpegps_0.9.3.bb"
# from [27e05bc426a376b8acc01298f38863da30a86fcf]
# to [5ed209f056be5ae98b7ed0041ffdc771e271b7be]
#
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
# from [60a4f320d3d48b00cb4e2bd307b381db3b12a98a]
# to [a3d384a818163b14fb463ff6b7efa40460275517]
#
# patch "packages/usb-gadget-mode/files/usb-gadget"
# from [7f14fd72c68ffb0234fae442ec23e3c3da33ea22]
# to [1fa6c0e2f6526845f7cf5d86db4a4be1d4f975cc]
#
# patch "packages/usb-gadget-mode/usb-gadget-mode.bb"
# from [80bdef91c64dbdba86bcd174c2a2f4ad927d5ba3]
# to [3d3ee2ebfd57b8099099fc66590709a9d6dd03d7]
#
# patch "packages/xserver-common/files/sl-cxx00-modmap.patch"
# from [ccb48cbc7313d17c580c7eac8c5fce0ac7c35b43]
# to [efec9544ef6ca9105242d007c28ccf32226eaf24]
#
# patch "packages/xserver-common/xserver-common_1.16.bb"
# from [6b44ed9375b3f12356d847a9f85bbbd73d634875]
# to [e1d6b999690435387fed5305182426ab32d9a493]
#
============================================================
--- packages/altboot/altboot.inc fe38b623c3b94fe6a165a38b80739fdfb73c498b
+++ packages/altboot/altboot.inc fe38b623c3b94fe6a165a38b80739fdfb73c498b
@@ -0,0 +1,19 @@
+DESCRIPTION = "The altboot bootmanager"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+LICENSE = "GPL"
+RDEPENDS_${PN} = "${PN}-conf"
+RDEPENDS_${PN}-conf = "${PN}"
+RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools kexec-tools"
+RRECOMMENDS_${PN}_spitz += " kernel-module-jffs2"
+
+S = "${WORKDIR}/trunk/"
+
+PACKAGE_ARCH_${PN} = "${MACHINE}"
+PACKAGE_ARCH_${PN}-doc = "all"
+PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
+PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
+
+FILES_${PN}-conf = "/etc/altboot*cfg"
+
+MACHINE_DIR = "${MACHINE}"
+MACHINE_DIR_nslu2be = "nslu2le"
============================================================
--- packages/altboot/altboot_1.0.8+1.0.9_pre1.bb e011545d6b57783a1a980054514d51f4c8f33684
+++ packages/altboot/altboot_1.0.8+1.0.9_pre1.bb e011545d6b57783a1a980054514d51f4c8f33684
@@ -0,0 +1,76 @@
+require altboot.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+## Laibsch: The following DEPENDS lines seem broken in light of the fact that
+## they have circular dependencies and depend on stuff that is recommended
+## elsewhere. Let's activate them only after further discussion
+#RDEPENDS_${PN} = "${PN}-conf kexec-tools ncurses"
+#RDEPENDS_${PN}_append_poodle = " kexec-tools"
+#RDEPENDS_${PN}-conf = "${PN}"
+
+PR = "r0"
+
+SVN_REV="65"
+#TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
+TAG = '1.0.x'
+SRC_URI = "svn://hentges.net/public/altboot/branches/;module=${TAG};rev=${SVN_REV};proto=svn"
+
+LDFLAGS += "-lncurses -lmenu"
+
+S = "${WORKDIR}/${TAG}/"
+
+do_configure() {
+ cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${S}/init.altboot_
+ mv ${S}/init.altboot_ ${S}/init.altboot
+}
+
+do_compile() {
+ ${CC} ${CFLAGS} ${LDFLAGS} ${S}curses_menu/altboot_menu.c -o altboot_menu
+}
+
+do_install() {
+ install -d ${D}/sbin
+ install -d ${D}/etc/altboot-menu
+ install -d ${D}/etc/altboot-menu/Advanced
+ install -d ${D}/etc/altboot.rc
+ install -d ${D}/usr/share/doc/altboot
+ install -d ${D}/usr/share/sounds
+
+ if test -d ${S}/${MACHINE}
+ then
+ install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc
+ else
+ install -m 0644 ${S}/altboot*.cfg ${D}/etc
+ fi
+
+ install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
+ install -m 0644 ${S}/altboot.func ${D}/etc
+ install -m 0755 ${S}/init.altboot ${D}/sbin
+ install -m 0755 ${S}/altboot_menu ${D}/sbin
+
+ install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
+
+ install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+
+ install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+ install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+}
+
+pkg_postinst_${PN}() {
+ update-alternatives --install /sbin/init init /sbin/init.altboot 55
+}
+
+pkg_postrm_${PN}() {
+ update-alternatives --remove init /sbin/init.altboot
+}
+
+do_rm_work() {
+}
+
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN}-doc = "all"
+PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
+PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
+
+FILES_${PN}-conf = "/etc/altboot*.cfg"
============================================================
--- packages/qpegps/qpegps.inc 3da7e58c9eb26df021729878d8d0e46ebe5513ff
+++ packages/qpegps/qpegps.inc 3da7e58c9eb26df021729878d8d0e46ebe5513ff
@@ -0,0 +1,35 @@
+DESCRIPTION = "A GPS navigation application for the Opie environment"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://qpegps.sourceforge.net/"
+
+RRECOMMENDS = "gpsd"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \
+ file://qpegps.desktop \
+ file://qpegps.png"
+S = "${WORKDIR}/qpegps"
+
+inherit palmtop
+
+QMAKE_PROFILES = "qpegps.pro"
+EXTRA_QMAKEVARS_POST = "LIBS=-lqpe LIBS+=-lgps"
+OE_QMAKE_CFLAGS += " -DQWS "
+
+do_install() {
+ install -d ${D}${palmtopdir}/bin \
+ ${D}${palmtopdir}/apps/Applications \
+ ${D}${palmtopdir}/pics/qpegps \
+ ${D}${palmtopdir}/help/html/qpegps_icons \
+ ${D}${palmtopdir}/qpegps/maps \
+ ${D}${palmtopdir}/qpegps/icons \
+ ${D}${palmtopdir}/qpegps/tracks
+ install -m 0755 qpegps ${D}${palmtopdir}/bin/
+ install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
+ install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
+ install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
+ install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
+ install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
+ install -m 0644 datum/*.dat ${D}${palmtopdir}/qpegps/
+}
============================================================
--- packages/quake/quetoo_0.6.1.bb cec019795314a7f3433cc7d91beca0cd29e27c9c
+++ packages/quake/quetoo_0.6.1.bb cec019795314a7f3433cc7d91beca0cd29e27c9c
@@ -0,0 +1,26 @@
+DESCRIPTION = "Initially a fork of the Quake2Forge project, this engine aims to provide security and performance enhancements."
+LICENSE = "GPLv2"
+
+DEPENDS = "libsdl-x11 zlib mesa"
+SRC_URI = "http://tastyspleen.net/~jdolan/quetoo-${PV}-full.tar.bz2"
+
+inherit autotools pkgconfig
+
+
+EXTRA_OECONF = "\
+ --with-sdl \
+ --with-zlib \
+ "
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+ rm config.log
+}
+
+do_install_append() {
+ mv ${D}${bindir}/${TARGET_PREFIX}quetoo ${D}${bindir}/quetoo
+}
+
+FILES_${PN}-dbg += "${libdir}/quetoo/baseq2/.debug"
============================================================
--- MAINTAINERS 8fa31ff402ace5a7fb922ac8b657329c63b10775
+++ MAINTAINERS e37d9675092f5d37a4c9a17297f5f950308adcd9
@@ -16,6 +16,11 @@ Recipes: Maintained recipes (should m
-----------------------------------------------------------------------------
+Person: Andreas Holzer
+Mail: a.holzer at cheese.at
+Website: http://members.cheese.at/woody/zaurus/
+Recipes: gnuchess, fltk-chess
+
Person: Andy Wilcox
Mail: andy at protium.com
Website: http://www.openprotium.com
============================================================
--- classes/palmtop.bbclass 8f2da59d99d7b1d032014727af453436c641ed29
+++ classes/palmtop.bbclass 47dee0d1bcbc560241a59d1d1689a90ca8e37b3f
@@ -16,6 +16,7 @@ DEPENDS_prepend = "${@["virtual/libqpe1
EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "CONFIG-=thread",d)}'
EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
FILES_${PN} = " ${palmtopdir} "
============================================================
--- classes/qmake-base.bbclass 21899cea6a7a8f08dec40c2a294e92ea41fb9c6b
+++ classes/qmake-base.bbclass 48e5a70a69927658c2baca79ac02bde07866b4fc
@@ -23,7 +23,7 @@ export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
# default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11
export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
-export OE_QMAKE_LIBS_QT="qte"
+export OE_QMAKE_LIBS_QT="${QT_LIBRARY}"
export OE_QMAKE_LIBS_X11=""
oe_qmake_mkspecs () {
============================================================
--- conf/distro/angstrom-2007.1.conf 921aeb7f488e2edb792a20f3c13401a15a022c1d
+++ conf/distro/angstrom-2007.1.conf 830baec3c8ea1d6a5ddb795e4b4c06be10c09b8a
@@ -133,6 +133,7 @@ PREFERRED_VERSION_linux-handhelds-2.6_ma
PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6"
PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh6"
+# Needed for crappy ipaqs with broken hostap in the kernel
PREFERRED_VERSION_hostap-modules ?= "0.4.7"
PREFERRED_VERSION_hostap-utils ?= "0.4.7"
@@ -145,6 +146,8 @@ PREFERRED_VERSION_pango = "1.
PREFERRED_VERSION_cairo = "1.4.4"
PREFERRED_VERSION_glib-2.0 = "2.12.12"
PREFERRED_VERSION_pango = "1.16.4"
+PREFERRED_VERSION_atk = "1.10.3"
+PREFERRED_VERSION_gtk+ = "2.10.12"
# older gtk-webcore releases don't work on ARM/EABI
# We need to switch to a fixed SRCDATE or release as soon as possible
@@ -162,11 +165,10 @@ PREFERRED_VERSION_randrproto ?= "
PREFERRED_VERSION_xrandr ?= "1.2.0"
PREFERRED_VERSION_randrproto ?= "1.2.1"
-PREFERRED_VERSION_gtk+ = "2.10.12"
PREFERRED_VERSION_libgnomeui = "2.16.1"
PREFERRED_VERSION_prismstumbler = "0.7.3"
-#use EABI toolchain
+#use EABI ready toolchain
PREFERRED_VERSION_gcc ?= "4.1.2"
PREFERRED_VERSION_gcc-cross ?= "4.1.2"
PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
============================================================
--- conf/documentation.conf c27c220c9046e06ac748ecd21f3f7015649e2174
+++ conf/documentation.conf 39b05416fe91d4b5812b04d933b9da47d2659c73
@@ -98,6 +98,9 @@ SYSVINIT_ENABLED_GETTYS[doc] = "Specify
SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
+# insane bbclass
+QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log."
+
# palmtop build class
PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread"
============================================================
--- packages/altboot/README.txt 905cbc0cb0ea71adaf7859aa308b0c48eedee11b
+++ packages/altboot/README.txt 0e100f5176af2abd03ef88701ccb2ca1080490a3
@@ -1,5 +1,4 @@
-altboot_1.0.5.bb - Last known-working version for clamshell
- Zauruses running kernel 2.4
altboot_1.0.8.bb - Last known-working version for all Zauruses
altboot_1.1.1+wip-20061123.bb - Last known-working version for neo1973
altboot_svn.bb - Altboot developer snapshot - avoid ;)
+altboot_1.0.8+1.0.9_pre1 - Development version with new menu
============================================================
--- packages/altboot/altboot_1.0.8.bb a417814f691652989261c4e16bf27df1df4a97ee
+++ packages/altboot/altboot_1.0.8.bb e7cdd46a53bb7b9dfa3f4d7520ec9e6dce521581
@@ -1,49 +1,11 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel at hentges.net> (c) 2006
-# License: MIT (see COPYING.MIT)
-#
-# Filename: altboot_1.0.5-rc2.bb
-# Date: 21-Feb-06
+require altboot.inc
-DESCRIPTION = "The altboot bootmanager"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "GPL"
-
-######################################################################################
-
-RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
-RRECOMMENDS_${PN}_append_akita = " kexec-tools"
-RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
-RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
-
-RDEPENDS_${PN} = "${PN}-conf"
-RDEPENDS_${PN}-conf = "${PN}"
-
-######################################################################################
-
PR = "r2"
-######################################################################################
-
-PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
-
-PACKAGE_ARCH_${PN} = "all"
-PACKAGE_ARCH_${PN}-doc = "all"
-PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
-
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
-
SRC_URI = "svn://hentges.net/public/altboot/tags/;module=${TAG};proto=svn"
-
S = "${WORKDIR}/${TAG}/"
-######################################################################################
-
-FILES_${PN}-conf = "/etc/altboot*.cfg"
-
-######################################################################################
-
do_install() {
install -d ${D}/sbin
install -d ${D}/etc/altboot-menu
@@ -71,22 +33,17 @@ do_install() {
install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
}
-######################################################################################
-
do_configure() {
cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${S}/init.altboot_
mv ${S}/init.altboot_ ${S}/init.altboot
}
-######################################################################################
-
pkg_postinst_${PN}() {
update-alternatives --install /sbin/init init /sbin/init.altboot 55
}
-##################################################################%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list