diff options
| -rw-r--r-- | classes/task.bbclass | 27 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-1.0/functions | 17 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 30 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko-debug.bb | 36 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko-native-sdk.bb | 41 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko.bb | 84 | ||||
| -rw-r--r-- | packages/zten/zten_1.6.2.bb | 2 | ||||
| -rw-r--r-- | site/ix86-common | 1 |
8 files changed, 145 insertions, 93 deletions
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) +} + 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 } ' </proc/cpuinfo +} + +killproc() { # kill the named process(es) + pid=`/bin/ps -e x | + /bin/grep $1 | + /bin/grep -v grep | + /bin/sed -e 's/^ *//' -e 's/ .*//'` + [ "$pid" != "" ] && kill $pid +} diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index aa30833895..ebddf17b61 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,9 +4,10 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r97" +PR = "r98" -SRC_URI = "file://halt \ +SRC_URI = "file://functions \ + file://halt \ file://ramdisk \ file://umountfs \ file://devices \ @@ -32,7 +33,7 @@ SRC_URI = "file://halt \ file://volatiles \ file://save-rtc.sh" -SRC_URI_append_arm = " file://alignment.sh" +SRC_URI_append_arm = " file://alignment.sh" KERNEL_VERSION = "" @@ -40,18 +41,19 @@ do_install () { # # Create directories and install device independent scripts # - install -d ${D}${sysconfdir}/init.d \ - ${D}${sysconfdir}/rcS.d \ - ${D}${sysconfdir}/rc0.d \ - ${D}${sysconfdir}/rc1.d \ - ${D}${sysconfdir}/rc2.d \ - ${D}${sysconfdir}/rc3.d \ - ${D}${sysconfdir}/rc4.d \ - ${D}${sysconfdir}/rc5.d \ - ${D}${sysconfdir}/rc6.d \ - ${D}${sysconfdir}/default \ - ${D}${sysconfdir}/default/volatiles + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/rcS.d + install -d ${D}${sysconfdir}/rc0.d + install -d ${D}${sysconfdir}/rc1.d + install -d ${D}${sysconfdir}/rc2.d + install -d ${D}${sysconfdir}/rc3.d + install -d ${D}${sysconfdir}/rc4.d + install -d ${D}${sysconfdir}/rc5.d + install -d ${D}${sysconfdir}/rc6.d + install -d ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/default/volatiles + install -m 0755 ${WORKDIR}/functions ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/checkroot.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/finish ${D}${sysconfdir}/init.d diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb new file mode 100644 index 0000000000..6ea7ca236b --- /dev/null +++ b/packages/tasks/task-openmoko-debug.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "OpenMoko: Debugging Tools" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r57" + +inherit task + +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..6a5c2c2aa5 --- /dev/null +++ b/packages/tasks/task-openmoko-native-sdk.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "OpenMoko: Native SDK" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r58" + +inherit task + +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..ba024e349e 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,10 +2,9 @@ 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" +inherit task PACKAGES = "\ task-openmoko-linux \ @@ -17,12 +16,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 # @@ -137,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 \ -" 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" 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} |