From 71e917c19c83c7042eca136c30bb97eb5ac3f6b0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 20 Aug 2007 07:41:50 +0000 Subject: site/ix86-common: added glib_cv_sizeof_system_thread definition to get glib 1.2 built --- site/ix86-common | 1 + 1 file changed, 1 insertion(+) diff --git a/site/ix86-common b/site/ix86-common index f114710ac9..36412c9689 100644 --- a/site/ix86-common +++ b/site/ix86-common @@ -114,6 +114,7 @@ ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes} am_cv_func_working_getline=${am_cv_func_working_getline=yes} # glib +glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} glib_cv_has__inline=${glib_cv_has__inline=yes} glib_cv_has__inline__=${glib_cv_has__inline__=yes} glib_cv_hasinline=${glib_cv_hasinline=yes} -- cgit v1.2.3 From 60fcde6fba18416aea7ec3583e5d9b4fc5457415 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 20 Aug 2007 10:54:21 +0000 Subject: zten: correct md5sum. Closes 2808. Thanks, Philippe for spotting it. --- packages/zten/zten_1.6.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/zten/zten_1.6.2.bb b/packages/zten/zten_1.6.2.bb index 1511341f0a..b5a4c6eac1 100644 --- a/packages/zten/zten_1.6.2.bb +++ b/packages/zten/zten_1.6.2.bb @@ -7,7 +7,7 @@ DEPENDS = "eb kakasi" RDEPENDS = "virtual/japanese-font" RCONFLICTS = "ztenv" -SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc9321 \ +SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc932 \ file://zten.patch;patch=1" S = "${WORKDIR}/zten" -- cgit v1.2.3 From 91bbf116d75d79b481924c8ee54b78a07da41ace Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 20 Aug 2007 11:04:29 +0000 Subject: task.bbclass: add a task class that sets common task recipe variables and automates adding -dev and -dbg packages --- classes/task.bbclass | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 classes/task.bbclass diff --git a/classes/task.bbclass b/classes/task.bbclass new file mode 100644 index 0000000000..4edd704829 --- /dev/null +++ b/classes/task.bbclass @@ -0,0 +1,27 @@ +# Task packages are only used to pull in other packages +# via their dependencies. They are empty. +ALLOW_EMPTY = "1" + +# By default, only the task package itself is in PACKAGES. +# -dbg and -dev flavours are handled by the anonfunc below. +# This means that task recipes used to build multiple task +# packages have to modify PACKAGES after inheriting task.bbclass. +PACKAGES = "${PN}" + +# By default, task packages do not depend on a certain architecture. +# Only if dependencies are modified by MACHINE_FEATURES, packages +# need to be set to MACHINE_ARCH after inheriting task.bbclass +PACKAGE_ARCH = "all" + +# This automatically adds -dbg and -dev flavours of all PACKAGES +# to the list. Their dependencies (RRECOMMENDS) are handled as usual +# by package_depchains in a following step. +python () { + packages = bb.data.getVar('PACKAGES', d, 1).split() + genpackages = [] + for pkg in packages: + for postfix in ['-dbg', '-dev']: + genpackages.append(pkg+postfix) + bb.data.setVar('PACKAGES', ' '.join(packages+genpackages), d) +} + -- cgit v1.2.3 From 1430820cd5eb357881bc1b44ffbda2fe1e675fb5 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 20 Aug 2007 11:12:37 +0000 Subject: task-openmoko: split out -debug and -native-sdk tasks into own recipes --- packages/tasks/task-openmoko-debug.bb | 37 ++++++++++++++++++++++++++ packages/tasks/task-openmoko-native-sdk.bb | 42 ++++++++++++++++++++++++++++++ packages/tasks/task-openmoko.bb | 8 +++--- 3 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 packages/tasks/task-openmoko-debug.bb create mode 100644 packages/tasks/task-openmoko-native-sdk.bb diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb new file mode 100644 index 0000000000..44a70b2a82 --- /dev/null +++ b/packages/tasks/task-openmoko-debug.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "OpenMoko: Debugging Tools" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r57" + +ALLOW_EMPTY = "1" +PACKAGE_ARCH = "all" + +RDEPENDS_task-openmoko-debug = "\ + alsa-utils-amixer \ + alsa-utils-aplay \ + alsa-utils-aconnect \ + alsa-utils-alsamixer \ + alsa-utils-speakertest \ + madplay \ + vorbis-tools \ + strace \ + ltrace \ + gdb \ + gdbserver \ + tcpdump \ + tslib-calibrate \ + tslib-tests \ + fbgrab \ + fstests \ + lsof \ + lrzsz \ + udev-utils \ + usbutils \ + uucp \ + cu \ +# sensors-i2cdetect sensors-i2cdump sensors-i2cset \ + xev \ + bonnie++ \ + memtester \ + dbench \ +" diff --git a/packages/tasks/task-openmoko-native-sdk.bb b/packages/tasks/task-openmoko-native-sdk.bb new file mode 100644 index 0000000000..7de475170f --- /dev/null +++ b/packages/tasks/task-openmoko-native-sdk.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "OpenMoko: Native SDK" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r58" + +ALLOW_EMPTY = "1" +PACKAGE_ARCH = "all" + +RDEPENDS_task-openmoko-native-sdk = "\ + binutils \ + binutils-symlinks \ + gcc \ + gcc-symlinks \ + cpp \ + cpp-symlinks \ + cvs \ + libc6-dev \ + libgcc-dev \ + glibc-utils \ + ldd \ + g++ \ + g++-symlinks \ + libstdc++-dev \ + \ + make \ + flex \ + flex-dev \ + bison \ + gawk \ + grep \ + sed \ + automake \ + autoconf \ + patch \ + patchutils \ + diffstat \ + diffutils \ + libtool \ + pkgconfig \ + \ + xoo \ +" diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index a7739d8c01..9e5942c1d3 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r57" +PR = "r58" ALLOW_EMPTY = "1" PACKAGE_ARCH = "all" @@ -17,12 +17,14 @@ PACKAGES = "\ \ task-openmoko-games \ task-openmoko-examples \ +" + +RDEPENDS_task-openmoko-everything := "\ + ${PACKAGES} \ task-openmoko-debug \ task-openmoko-native-sdk \ " -RDEPENDS_task-openmoko-everything := "${PACKAGES}" - # # task-openmoko-core # -- cgit v1.2.3 From eae99420b20b1969e0ded2241e86284176b0c5e9 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 20 Aug 2007 11:14:32 +0000 Subject: task-openmoko: inherit task.bbclass to enable generation of -dbg and -dev versions of all task packages --- packages/tasks/task-openmoko-debug.bb | 3 +-- packages/tasks/task-openmoko-native-sdk.bb | 3 +-- packages/tasks/task-openmoko.bb | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb index 44a70b2a82..6ea7ca236b 100644 --- a/packages/tasks/task-openmoko-debug.bb +++ b/packages/tasks/task-openmoko-debug.bb @@ -3,8 +3,7 @@ SECTION = "openmoko/base" LICENSE = "MIT" PR = "r57" -ALLOW_EMPTY = "1" -PACKAGE_ARCH = "all" +inherit task RDEPENDS_task-openmoko-debug = "\ alsa-utils-amixer \ diff --git a/packages/tasks/task-openmoko-native-sdk.bb b/packages/tasks/task-openmoko-native-sdk.bb index 7de475170f..6a5c2c2aa5 100644 --- a/packages/tasks/task-openmoko-native-sdk.bb +++ b/packages/tasks/task-openmoko-native-sdk.bb @@ -3,8 +3,7 @@ SECTION = "openmoko/base" LICENSE = "MIT" PR = "r58" -ALLOW_EMPTY = "1" -PACKAGE_ARCH = "all" +inherit task RDEPENDS_task-openmoko-native-sdk = "\ binutils \ diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 9e5942c1d3..9084fd03ec 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -4,8 +4,7 @@ LICENSE = "MIT" PROVIDES = "task-openmoko-everything" PR = "r58" -ALLOW_EMPTY = "1" -PACKAGE_ARCH = "all" +inherit task PACKAGES = "\ task-openmoko-linux \ -- cgit v1.2.3 From 50a725086ad78d6733af3896710c38712c54ceed Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 20 Aug 2007 11:18:26 +0000 Subject: task-openmoko: remove -debug and -native-sdk task packages, they are split out into their own recipes --- packages/tasks/task-openmoko.bb | 73 ----------------------------------------- 1 file changed, 73 deletions(-) diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 9084fd03ec..ba024e349e 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -138,76 +138,3 @@ DESCRIPTION_task-openmoko-games = "OpenMoko: Games" RDEPENDS_task-openmoko-games = "\ oh-puzzles \ " - -# -# task-openmoko-debug -# -DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools" -RDEPENDS_task-openmoko-debug = "\ - alsa-utils-amixer \ - alsa-utils-aplay \ - alsa-utils-aconnect \ - alsa-utils-alsamixer \ - alsa-utils-speakertest \ - madplay \ - vorbis-tools \ - strace \ - ltrace \ - gdb \ - gdbserver \ - tcpdump \ - tslib-calibrate \ - tslib-tests \ - fbgrab \ - fstests \ - lsof \ - lrzsz \ - udev-utils \ - usbutils \ - uucp \ - cu \ -# sensors-i2cdetect sensors-i2cdump sensors-i2cset \ - xev \ - bonnie++ \ - memtester \ - dbench \ -" - -# -# task-openmoko-native-sdk -# -DESCRIPTION_task-openmoko-native-sdk = "OpenMoko: Native SDK" -RDEPENDS_task-openmoko-native-sdk = "\ - binutils \ - binutils-symlinks \ - gcc \ - gcc-symlinks \ - cpp \ - cpp-symlinks \ - cvs \ - libc6-dev \ - libgcc-dev \ - glibc-utils \ - ldd \ - g++ \ - g++-symlinks \ - libstdc++-dev \ - \ - make \ - flex \ - flex-dev \ - bison \ - gawk \ - grep \ - sed \ - automake \ - autoconf \ - patch \ - patchutils \ - diffstat \ - diffutils \ - libtool \ - pkgconfig \ - \ - xoo \ -" -- cgit v1.2.3 From 8276d6ef3f035028322f1063c98b9717cd80db09 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 20 Aug 2007 12:03:16 +0000 Subject: initscripts: add a functions script that is supposed to be sourced from individual init scripts providing some useful functions. added cpuinfo_id() and killproc() for a start --- packages/initscripts/initscripts-1.0/functions | 17 +++++++++++++++ packages/initscripts/initscripts_1.0.bb | 30 ++++++++++++++------------ 2 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 packages/initscripts/initscripts-1.0/functions diff --git a/packages/initscripts/initscripts-1.0/functions b/packages/initscripts/initscripts-1.0/functions new file mode 100644 index 0000000000..358fc6edb3 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/functions @@ -0,0 +1,17 @@ +# -*-Shell-script-*- +# +# functions This file contains functions to be used by most or all +# shell scripts in the /etc/init.d directory. +# + +cpuinfo_id() { # return the Hardware module ID + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } '