summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-05-29 13:38:10 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-29 13:38:10 +0000
commit9ad7da861459bf8b1a42c04de819c1bc9c44534d (patch)
treeee95cfa04eab679c762b8533c2aef3f16749d3a5
parent2db3499796223578d281d5503997e9716cf7421a (diff)
parentbc8b949cfbab0654d2818894c1c22c0002a6c010 (diff)
merge of 1c17f3bc992735c3812d224e4eec728fd12650f3
and 9c65cea979ed9596cf0a6ec6776d094ce174ea6a
-rw-r--r--classes/multimachine.bbclass22
-rw-r--r--conf/distro/angstrom.conf4
-rw-r--r--conf/distro/familiar.conf4
-rw-r--r--conf/distro/generic-uclibc.conf24
-rw-r--r--conf/distro/generic.conf67
-rw-r--r--conf/distro/include/.mtn2git_empty0
-rw-r--r--conf/distro/include/multimachine.conf3
-rw-r--r--conf/distro/jlime-donkey.conf12
-rw-r--r--conf/distro/openzaurus.conf4
-rw-r--r--packages/bluez/bluez-utils.inc5
-rw-r--r--packages/cherokee/cherokee_0.5.3.bb19
-rw-r--r--packages/glibc/glibc_2.4.bb5
-rw-r--r--packages/gpe-login/files/chvt-keylaunch.patch11
-rw-r--r--packages/gpe-login/gpe-login_0.86.bb3
-rw-r--r--packages/keylaunch/files/80chvt-SUID25
-rw-r--r--packages/keylaunch/files/akita/keylaunchrc4
-rw-r--r--packages/keylaunch/files/spitz/keylaunchrc4
-rw-r--r--packages/keylaunch/keylaunch_2.0.10.bb2
-rw-r--r--packages/qpegps/qpegps_0.9.2.3.3.bb (renamed from packages/qpegps/qpegps_0.9.2.3.2.bb)3
-rw-r--r--packages/qpegps/qpegps_0.9.2.3.bb35
20 files changed, 181 insertions, 75 deletions
diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass
new file mode 100644
index 0000000000..2248f326cc
--- /dev/null
+++ b/classes/multimachine.bbclass
@@ -0,0 +1,22 @@
+STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}-${HOST_OS}/${PF}"
+WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}-${HOST_OS}/${PF}"
+STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${HOST_OS}/kernel"
+
+# Find any machine specific sub packages and if present, mark the
+# whole package as machine specific for multimachine purposes.
+python __anonymous () {
+ packages = bb.data.getVar('PACKAGES', d, 1).split()
+ macharch = bb.data.getVar('MACHINE_ARCH', d, 1)
+ multiarch = bb.data.getVar('PACKAGE_ARCH', d, 1)
+
+ for pkg in packages:
+ pkgarch = bb.data.getVar("PACKAGE_ARCH_%s" % pkg, d, 1)
+
+ # We could look for != PACKAGE_ARCH here but how to choose
+ # if multiple differences are present?
+ # Look through IPKG_ARCHS for the priority order?
+ if pkgarch and pkgarch == macharch:
+ multiarch = macharch
+
+ bb.data.setVar('MULTIMACH_ARCH', multiarch, d)
+}
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index 403b13934f..100017410d 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -12,10 +12,8 @@ ANGSTROM_URI = "http://www.angstrom-distribution.org/"
MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
#use ipkg package format with debian style naming
-INHERIT += "package_ipk debian"
-
#use multimachine buildrules
-include conf/distro/include/multimachine.conf
+INHERIT += "package_ipk debian multimachine"
#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native"
diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf
index da5caa7998..2646fe78a6 100644
--- a/conf/distro/familiar.conf
+++ b/conf/distro/familiar.conf
@@ -4,7 +4,7 @@
MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>"
-INHERIT += "package_ipk debian"
+INHERIT += "package_ipk debian multimachine"
TARGET_OS = "linux"
BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
@@ -15,5 +15,3 @@ PARALLEL_INSTALL_MODULES = "1"
UDEV_DEVFS_RULES = "1"
DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
-
-include conf/distro/include/multimachine.conf
diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf
new file mode 100644
index 0000000000..d9ace6d629
--- /dev/null
+++ b/conf/distro/generic-uclibc.conf
@@ -0,0 +1,24 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Generic uClibC
+#@DESCRIPTION: Generic uClibC Embedded Linux Distribution Configuration
+#
+#@COMMENT: This distribution configuration serves as a starting point for
+#@COMMENT: the integration of new target platforms, machines, or distributions.
+#@COMMENT: It bases on conservative settings and should always be buildable.
+#-----------------------------------------------------------------------------
+
+require conf/distro/generic.conf
+
+#
+# Header
+#
+DISTRO_NAME = "generic-uClibC"
+
+#
+# Target OS and FPU system
+#
+TARGET_OS = "linux-uclibc"
+TARGET_FPU = "soft"
+PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
+PREFERRED_PROVIDER_virtual/libintl = "libintl"
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 59e003f9b3..e6671d1337 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -1,16 +1,69 @@
+#-----------------------------------------------------------------------------
#@TYPE: Distribution
#@NAME: Generic
-#@DESCRIPTION: Generic Linux Distribution Configuration
+#@DESCRIPTION: Generic Embedded Linux Distribution Configuration
+#
+#@COMMENT: This distribution configuration serves as a starting point for
+#@COMMENT: the integration of new target platforms, machines, or distributions.
+#@COMMENT: It bases on conservative settings and should always be buildable.
+#-----------------------------------------------------------------------------
-INHERIT += " package_ipk debian"
-TARGET_OS = "linux"
-# TARGET_FPU = "soft"
-IMAGE_FSTYPES = "ext2.gz"
-
-DISTRO_NAME = "GenericDistribution"
+#
+# Header
+#
+DISTRO_NAME = "generic-glibc"
DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
+#DISTRO_TYPE = "release"
+DISTRO_TYPE = "debug"
+
+#
+# Naming schemes
+#
+PARALLEL_INSTALL_MODULES = "1"
+INHERIT += "debian multimachine"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_VERSION_gcc = "3.4.4"
+PREFERRED_VERSION_gcc-cross = "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_VERSION_binutils = "2.15.94.0.1"
+
+#
+# Target OS and FPU system
+#
+TARGET_OS = "linux"
+TARGET_FPU = "soft"
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
+
+#
+# GPE
+#
require conf/distro/preferred-gpe-versions.inc
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
require conf/distro/preferred-opie-versions.inc
+
+#
+# Enlightenment
+#
require conf/distro/preferred-e-versions.inc
diff --git a/conf/distro/include/.mtn2git_empty b/conf/distro/include/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/conf/distro/include/.mtn2git_empty
+++ /dev/null
diff --git a/conf/distro/include/multimachine.conf b/conf/distro/include/multimachine.conf
deleted file mode 100644
index 1f73ffd30f..0000000000
--- a/conf/distro/include/multimachine.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-STAMP = "${TMPDIR}/stamps/${PACKAGE_ARCH}-${HOST_OS}/${PF}"
-WORKDIR = "${TMPDIR}/work/${PACKAGE_ARCH}-${HOST_OS}/${PF}"
-STAGING_KERNEL_DIR = "${STAGING_DIR}/${PACKAGE_ARCH}-${HOST_OS}/kernel"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 01c90a5b26..dfdbe19e46 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -53,7 +53,11 @@ PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312"
#<>
#<>Other Specific stuff.
#<>
-INHERIT += "package_tar package_ipk"
+#<>
+#<>We want to be able to build this for all jornadas so
+#<>to not mess up the folders we need to make them dynamic.
+#<>It will use different folders depending on Arch (set in local.conf)
+INHERIT += "package_tar package_ipk multimachine"
BBINCLUDELOGS = "yes"
IMAGE_FSTYPES = "tar.bz2"
TARGET_OS = "linux"
@@ -76,12 +80,6 @@ include conf/distro/preferred-opie-versions.inc
PCMCIA_MANAGER = "pcmciautils"
#<>
-#<>We want to be able to build this for all jornadas so
-#<>to not mess up the folders we need to make them dynamic.
-#<>It will use different folders depending on Arch (set in local.conf)
-include conf/distro/include/multimachine.conf
-
-#<>
#<> Dont wanna break stuff when "some" packages do -O3, so lets set it at -O2
#<>
FULL_OPTIMIZATION = "-O2"
diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf
index edcbacc80e..b7f456320f 100644
--- a/conf/distro/openzaurus.conf
+++ b/conf/distro/openzaurus.conf
@@ -5,7 +5,7 @@
DISTRO = "openzaurus"
DISTRO_NAME = "OpenZaurus"
-INHERIT += " package_ipk debian"
+INHERIT += " package_ipk debian multimachine"
# For some reason, this doesn't work
# TARGET_OS ?= "linux"
TARGET_OS = "linux"
@@ -16,5 +16,3 @@ BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version"
PARALLEL_INSTALL_MODULES = "1"
DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
-
-include conf/distro/include/multimachine.conf
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc
index db5ddf066d..e71f2cef87 100644
--- a/packages/bluez/bluez-utils.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -15,9 +15,8 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://02dtl1_cs.sh"
# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
-# Let's default to that instead of 'any' and see if we break something with that
-SRC_URI_append_familiar = " file://default-manfid-0x0-to-bcps.patch;patch=1"
-SRC_URI_append_openzaurus = " file://default-manfid-0x0-to-bcps.patch;patch=1"
+# Let's default to that instead of 'any' until further notice...
+SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
S = "${WORKDIR}/bluez-utils-${PV}"
diff --git a/packages/cherokee/cherokee_0.5.3.bb b/packages/cherokee/cherokee_0.5.3.bb
index e6ea8e03fb..c7cd02c70d 100644
--- a/packages/cherokee/cherokee_0.5.3.bb
+++ b/packages/cherokee/cherokee_0.5.3.bb
@@ -1,19 +1,17 @@
DESCRIPTION = "Cherokee Web Server fast and secure"
+DESCRIPTION_cget = "Small downloader based in the Cherokee client library"
LICENSE = "GPL"
DEPENDS = "pcre gnutls"
HOMEPAGE = "http://www.0x50.org/"
+PR = "r1"
+
SRC_URI = "http://www.0x50.org/download/0.5/${PV}/${P}.tar.gz \
file://configure.patch;patch=1 \
file://Makefile.in.patch;patch=1 \
file://Makefile.cget.patch;patch=1 \
- file://util.patch;patch=1 \
-"
-
-inherit autotools
-
-PARALLEL_MAKE=""
+ file://util.patch;patch=1"
-LEAD_SONAME = "libcherokee-base"
+inherit autotools pkgconfig binconfig
EXTRA_OECONF = "--enable-tls=gnutls --disable-static --disable-nls"
@@ -26,3 +24,10 @@ do_configure() {
do_install_prepend () {
$BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
}
+
+PACKAGES =+ "cget libcherokee-server libcherokee-client libcherokee-base"
+
+FILES_cget = "${bindir}/cget"
+FILES_libcherokee-server = "${libdir}/libcherokee-server*"
+FILES_libcherokee-client = "${libdir}/libcherokee-client*"
+FILES_libcherokee-base = "${libdir}/libcherokee-base*"
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 2cc568df6f..45174d0551 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -6,6 +6,11 @@ PRIORITY = "required"
DEFAULT_PREFERENCE = "-1"
PR = "r5"
+# the -isystem in bitbake.conf screws up glibc do_stage
+BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+
+
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
GLIBC_ADDONS ?= "ports,nptl,libidn"
diff --git a/packages/gpe-login/files/chvt-keylaunch.patch b/packages/gpe-login/files/chvt-keylaunch.patch
new file mode 100644
index 0000000000..5e62a1107e
--- /dev/null
+++ b/packages/gpe-login/files/chvt-keylaunch.patch
@@ -0,0 +1,11 @@
+--- gpe-login-0.86/gpe-login.keylaunchrc.orig 2006-05-28 20:38:39.846547024 +0200
++++ gpe-login-0.86/gpe-login.keylaunchrc 2006-05-28 20:38:56.800969560 +0200
+@@ -1,3 +1,8 @@
+ key=???XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
+ key=???XF86PowerDown:-:/usr/bin/apm --suspend
+ key=???Held XF86PowerDown:-:bl toggle
++
++# VT changing
++key=...*Left:-:~chvt 1
++key=...*Right:-:~chvt 3
++key=...*Escape:-:~/etc/init.d/gpe-dm stop
diff --git a/packages/gpe-login/gpe-login_0.86.bb b/packages/gpe-login/gpe-login_0.86.bb
index f6eb0c921a..1dd6818903 100644
--- a/packages/gpe-login/gpe-login_0.86.bb
+++ b/packages/gpe-login/gpe-login_0.86.bb
@@ -7,7 +7,7 @@ PRIORITY = "optional"
DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
RDEPENDS = "xkbd"
RPROVIDES = "gpe-session-starter"
-PR = "r0"
+PR = "r1"
#apply a patch to set the fontsize for bigdpi (200+) devices to 5
SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1"
@@ -16,3 +16,4 @@ SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"
SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append += " file://chvt-keylaunch.patch;patch=1 "
diff --git a/packages/keylaunch/files/80chvt-SUID b/packages/keylaunch/files/80chvt-SUID
new file mode 100644
index 0000000000..e3b4efef5d
--- /dev/null
+++ b/packages/keylaunch/files/80chvt-SUID
@@ -0,0 +1,25 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: chvt-SUID.sh
+# Date: 28-May-06
+
+
+#
+# Sets the SUID bit on chvt to allow changing to the VT from inside X by
+# any user. Since a SUID binary still is a security risk, we chmod only
+# when keylaunch is used and not by default.
+#
+
+for target in /usr/bin/chvt.console-tools
+do
+ if test "`ls -l "$target" | awk '{print $1}'|cut -c 2-4`" != "rws"
+ then
+ echo "Making [$target] SUID root..."
+ chmod u+s "$target"
+ else
+ echo "Ignoring [$target]"
+ fi
+done
diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc
index 0379c719c4..27cce24e93 100644
--- a/packages/keylaunch/files/akita/keylaunchrc
+++ b/packages/keylaunch/files/akita/keylaunchrc
@@ -22,3 +22,7 @@ key=....F18:-:gpe-calendar
#key=....F19:-:
#key=....F19:-:
#key=....F10:-:
+
+# VT changing
+key=...*Left:-:~chvt 1
+key=...*Right:-:~chvt 3
diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc
index f5e1fd70be..433221a586 100644
--- a/packages/keylaunch/files/spitz/keylaunchrc
+++ b/packages/keylaunch/files/spitz/keylaunchrc
@@ -22,3 +22,7 @@ key=....F18:-:gpe-calendar
#key=....F19:-:
#key=....F19:-:
#key=....F10:-:
+
+# VT changing
+key=...*Left:-:~chvt 1
+key=...*Right:-:~chvt 3
diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb
index c06c9c4587..67ed0923f2 100644
--- a/packages/keylaunch/keylaunch_2.0.10.bb
+++ b/packages/keylaunch/keylaunch_2.0.10.bb
@@ -13,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\
program is already running, keylaunch can bring its window to the front\
rather than just running another copy."
PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r4"
+PR = "r5"
SRC_URI += " file://keylaunchrc"
diff --git a/packages/qpegps/qpegps_0.9.2.3.2.bb b/packages/qpegps/qpegps_0.9.2.3.3.bb
index 073b95a96a..d93ee529b8 100644
--- a/packages/qpegps/qpegps_0.9.2.3.2.bb
+++ b/packages/qpegps/qpegps_0.9.2.3.3.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Navigation application for use with GPS adapters"
+DESCRIPTION = "A GPS navigation application for the Opie environment."
SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
@@ -15,7 +15,6 @@ S = "${WORKDIR}/qpegps_my"
inherit palmtop
QMAKE_PROFILES = "qpegps.pro"
-EXTRA_QMAKEVARS_POST += "LIBS=-lqpe"
do_install() {
install -d ${D}${palmtopdir}/bin \
diff --git a/packages/qpegps/qpegps_0.9.2.3.bb b/packages/qpegps/qpegps_0.9.2.3.bb
deleted file mode 100644
index 0b4e5e3ccd..0000000000
--- a/packages/qpegps/qpegps_0.9.2.3.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Navigation application for use with GPS adapters"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-RRECOMMENDS = "gpsd"
-LICENSE = "GPL"
-HOMEPAGE = "http://qpegps.sourceforge.net/"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_source.zip \
- file://qpegps.desktop \
- file://qpegps.png"
-S = "${WORKDIR}/root/qpegps_src_my/qpegps_my"
-
-inherit palmtop
-
-QMAKE_PROFILES = "qpegps.pro"
-EXTRA_QMAKEVARS_POST += "LIBS=-lqpe"
-
-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/
-}