[oe-commits] org.oe.dev merge of '4287770ea855fb20a7ff1b944f48982f4aab48c9'
hrw commit
openembedded-commits at lists.openembedded.org
Mon Aug 20 13:12:03 UTC 2007
merge of '4287770ea855fb20a7ff1b944f48982f4aab48c9'
and 'fd012d756d6df4946900321f427519708a15e866'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: dd31500500238107a50637418ba3f63cb4b36a7d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dd31500500238107a50637418ba3f63cb4b36a7d
Files:
1
packages/libsdl/libsdl-net_1.2.5.bb
packages/libsdl/libsdl-net_1.2.7.bb
packages/python/python-pygtk-0.6.12
packages/python/python-pygtk-1.2
packages/python/python-pygtk-0.6.12/remove-imlib-et-al
packages/python/python-pygtk-1.2/remove-imlib-et-al.patch
packages/python/python-pytest_0.6.0.bb
packages/python/python-pytester_0.6.0.bb
classes/task.bbclass
packages/initscripts/initscripts-1.0/functions
packages/tasks/task-openmoko-debug.bb
packages/tasks/task-openmoko-native-sdk.bb
packages/initscripts/initscripts_1.0.bb
packages/python/python-pygtk-1.2_0.6.12.bb
packages/tasks/task-openmoko.bb
packages/tasks/task-python-everything.bb
packages/zten/zten_1.6.2.bb
packages/libtiff/tiff_3.7.2.bb
Diffs:
#
# mt diff -r4287770ea855fb20a7ff1b944f48982f4aab48c9 -rdd31500500238107a50637418ba3f63cb4b36a7d
#
#
#
# rename "packages/libsdl/libsdl-net_1.2.5.bb"
# to "packages/libsdl/libsdl-net_1.2.7.bb"
#
# rename "packages/python/python-pygtk-0.6.12"
# to "packages/python/python-pygtk-1.2"
#
# rename "packages/python/python-pygtk-0.6.12/remove-imlib-et-al"
# to "packages/python/python-pygtk-1.2/remove-imlib-et-al.patch"
#
# rename "packages/python/python-pytest_0.6.0.bb"
# to "packages/python/python-pytester_0.6.0.bb"
#
# add_file "classes/task.bbclass"
# content [e7e881f731b2d8e00055d9a95c21b50d2c2a208b]
#
# add_file "packages/initscripts/initscripts-1.0/functions"
# content [cdb873e9c652d090c2e40fa96d5fd2db86db5413]
#
# add_file "packages/tasks/task-openmoko-debug.bb"
# content [194fcf90f766fbdbc057be3fec031b632534283d]
#
# add_file "packages/tasks/task-openmoko-native-sdk.bb"
# content [5ffc742e0afbb22c7591fc1491dc5f96bdbb4388]
#
# patch "packages/initscripts/initscripts_1.0.bb"
# from [6c15812e6872f15d45072ac63fb02065a0639077]
# to [4947d0fbf5c2bde2a6e56a3445f9c328b567a585]
#
# patch "packages/python/python-pygtk-1.2_0.6.12.bb"
# from [2abab9054c28a7d28d3c736bf7a117d55a4a9d3d]
# to [e163172bcdbd8047dcaebf5c3b45b51861beac8a]
#
# patch "packages/python/python-pytester_0.6.0.bb"
# from [22b359ff5bca61d75a21b42fd254ce53cfdc227c]
# to [6d5999f8f8ef96af3beace5ab8553bf3f7441967]
#
# patch "packages/tasks/task-openmoko.bb"
# from [8b037b50419fa01babd6a99e14c281d0c0b641bd]
# to [6b1416c92dd8ec8abdc9cdb30e309d9b3885f8d9]
#
# patch "packages/tasks/task-python-everything.bb"
# from [17e579990b0739c4d41ce3c43d9864b0171119e5]
# to [254f7dc42630e435f56b4ca93927f802d3bb00d4]
#
# patch "packages/zten/zten_1.6.2.bb"
# from [6dc2302625ff7cc29b4fd02acda47bed412e77ae]
# to [d16e5bbbdd5db91cc2059950ee052d9e1df00d1d]
#
============================================================
--- classes/task.bbclass e7e881f731b2d8e00055d9a95c21b50d2c2a208b
+++ classes/task.bbclass e7e881f731b2d8e00055d9a95c21b50d2c2a208b
@@ -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)
+}
+
============================================================
--- packages/initscripts/initscripts-1.0/functions cdb873e9c652d090c2e40fa96d5fd2db86db5413
+++ packages/initscripts/initscripts-1.0/functions cdb873e9c652d090c2e40fa96d5fd2db86db5413
@@ -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
+}
============================================================
--- packages/tasks/task-openmoko-debug.bb 194fcf90f766fbdbc057be3fec031b632534283d
+++ packages/tasks/task-openmoko-debug.bb 194fcf90f766fbdbc057be3fec031b632534283d
@@ -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 \
+"
============================================================
--- packages/tasks/task-openmoko-native-sdk.bb 5ffc742e0afbb22c7591fc1491dc5f96bdbb4388
+++ packages/tasks/task-openmoko-native-sdk.bb 5ffc742e0afbb22c7591fc1491dc5f96bdbb4388
@@ -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 \
+"
============================================================
--- packages/initscripts/initscripts_1.0.bb 6c15812e6872f15d45072ac63fb02065a0639077
+++ packages/initscripts/initscripts_1.0.bb 4947d0fbf5c2bde2a6e56a3445f9c328b567a585
@@ -1,12 +1,13 @@ LICENSE = "GPL"
DESCRIPTION = "SysV init scripts"
SECTION = "base"
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
============================================================
--- packages/python/python-pygtk-1.2_0.6.12.bb 2abab9054c28a7d28d3c736bf7a117d55a4a9d3d
+++ packages/python/python-pygtk-1.2_0.6.12.bb e163172bcdbd8047dcaebf5c3b45b51861beac8a
@@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/pyt
PR = "r1"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
- file://remove-imlib-et-al;patch=1 \
+ file://remove-imlib-et-al.patch;patch=1 \
file://acinclude.m4"
S = "${WORKDIR}/${SRCNAME}-${PV}"
@@ -17,7 +17,7 @@ EXTRA_OECONF += "--with-python-includes=
EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
-FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
+#FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
do_configure_prepend() {
install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
============================================================
--- packages/python/python-pytest_0.6.0.bb 22b359ff5bca61d75a21b42fd254ce53cfdc227c
+++ packages/python/python-pytester_0.6.0.bb 6d5999f8f8ef96af3beace5ab8553bf3f7441967
@@ -5,7 +5,7 @@ LICENSE = "GPL"
HOMEPAGE = "http://oss.wxnet.org/pytester/index.html"
PRIORITY = "optional"
LICENSE = "GPL"
-SRCNAME = "pytest"
+SRCNAME = "pytester"
PR = "ml0"
SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz"
============================================================
--- packages/tasks/task-openmoko.bb 8b037b50419fa01babd6a99e14c281d0c0b641bd
+++ packages/tasks/task-openmoko.bb 6b1416c92dd8ec8abdc9cdb30e309d9b3885f8d9
@@ -1,11 +1,10 @@ PROVIDES = "task-openmoko-everything"
DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r57"
+PR = "r59"
-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
#
@@ -72,6 +73,7 @@ RDEPENDS_task-openmoko-ui = "\
openmoko-sound-system \
openmoko-sound-theme-standard \
neod \
+ gpe-scap \
"
#
@@ -137,76 +139,3 @@ RDEPENDS_task-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 \
-"
============================================================
--- packages/tasks/task-python-everything.bb 17e579990b0739c4d41ce3c43d9864b0171119e5
+++ packages/tasks/task-python-everything.bb 254f7dc42630e435f56b4ca93927f802d3bb00d4
@@ -1,7 +1,7 @@ LICENSE = "MIT"
DESCRIPTION= "Everything Python"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml18"
+PR = "ml19"
RDEPENDS = "\
python-ao \
@@ -58,7 +58,7 @@ RDEPENDS = "\
python-pyrex \
python-pyro \
python-pyserial \
- python-pytest \
+ python-pytester \
python-pyvisa \
python-pyweather \
python-pyxml \
============================================================
--- packages/zten/zten_1.6.2.bb 6dc2302625ff7cc29b4fd02acda47bed412e77ae
+++ packages/zten/zten_1.6.2.bb d16e5bbbdd5db91cc2059950ee052d9e1df00d1d
@@ -7,7 +7,7 @@ RCONFLICTS = "ztenv"
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"
#
# mt diff -rfd012d756d6df4946900321f427519708a15e866 -rdd31500500238107a50637418ba3f63cb4b36a7d
#
#
#
# patch "packages/libtiff/tiff_3.7.2.bb"
# from [87afac8ebad21f27d937fcbf856fa987c3af79c2]
# to [026a8c2d0b6d10cc0c2950f8266faf28a6c8d243]
#
============================================================
--- packages/libtiff/tiff_3.7.2.bb 87afac8ebad21f27d937fcbf856fa987c3af79c2
+++ packages/libtiff/tiff_3.7.2.bb 026a8c2d0b6d10cc0c2950f8266faf28a6c8d243
@@ -1,9 +1,10 @@
-DESCRIPTION = "This software provides support for the Tag Image File Format (TIFF)"
-LICENSE = ""
-HOMEPAGE = "http://www.remotesensing.org/libtiff/"
+DESCRIPTION = "This software provides support for the Tag Image File Format (TIFF)"
+LICENSE = ""
+HOMEPAGE = "http://www.remotesensing.org/libtiff/"
+DEPENDS = "zlib jpeg"
+PR = "r1"
-DEPENDS = "zlib jpeg"
-SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz"
+SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz"
inherit autotools
@@ -13,3 +14,10 @@ do_stage() {
install -m 755 libtiff/.libs/libtiff.so.3.7.2 ${STAGING_LIBDIR}/libtiff.so
install -m 755 ./libtiff/.libs/libtiffxx.so.3.7.2 ${STAGING_LIBDIR}/libtiffxx.so
}
+
+PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiff-utils tiff-utils-dbg"
+FILES_tiffxx = "${libdir}/libtiffxx.so.*"
+FILES_tiffxx-dev = "${libdir}/libtiffxx.so ${libdir}/libtiffxx.*a"
+FILES_tiffxx-dbg = "${libdir}/.debug/libtiffxx.so*"
+FILES_tiff-utils = "${bindir}/*"
+FILES_tiff-utils-dbg = "${bindir}/.debug/"
More information about the Openembedded-commits
mailing list