[oe-commits] org.oe.dev merge of '7f7e2abbafbc78c693195ccd3ecbc44742312157'

koen commit openembedded-commits at lists.openembedded.org
Tue Aug 28 03:41:59 UTC 2007


merge of '7f7e2abbafbc78c693195ccd3ecbc44742312157'
     and 'a3a33729f3f0c0ad0c71c9872010fc1d7dd4f9ee'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 5d2e32fb9864db7ab20c3a83fb59b021d1a8ed51
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5d2e32fb9864db7ab20c3a83fb59b021d1a8ed51
Files:
1
packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01
packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01
packages/linux/linux-gta01_2.6.21.5.bb
packages/xserver-common/xserver-common_1.10.bb
packages/xserver-common/xserver-common_1.3.bb
packages/xserver-common/xserver-common_1.8.bb
packages/xserver-common/xserver-common_1.9.bb
packages/lyx/lyx_1.4.4+1.5.0rc1.bb
packages/lyx/lyx_1.5.1.bb
packages/base-files/base-files/gumstix-connex
packages/base-files/base-files/gumstix-verdex
packages/portmap/portmap-6.0
conf/distro/include/angstrom-package-deb.inc
conf/distro/include/angstrom-package-ipk.inc
conf/distro/include/angstrom-package-rpm.inc
packages/alsa/alsa-lib/unbreak_plugindir.patch
packages/alsa/alsa-lib_1.0.14.bb
packages/alsa/alsa-oss_1.0.14.bb
packages/alsa/alsa-utils_1.0.14.bb
packages/base-files/base-files/gumstix-connex/fstab
packages/base-files/base-files/gumstix-verdex/fstab
packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch
packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch
packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch
packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch
packages/gcc/gcc-4.2.1/307-locale_facets.patch
packages/gcc/gcc-4.2.1/402-libbackend_dep_gcov-iov.h.patch
packages/gpephone/libabenabler2_1.0.bb
packages/gpephone/vochistory_0.1.bb
packages/linux/linux/alix/geode-mfgpt-clock-event-device-support.patch
packages/linux/linux/alix/geode-mfgpt-support-for-geode-class-machines.patch
packages/openssl/openssl-0.9.7g/armeb.patch.lock
packages/openssl/openssl-0.9.7g/debian.patch.lock
packages/openssl/openssl-0.9.7g/gnueabi-arm.patch.lock
packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch.lock
packages/openssl/openssl-0.9.7g/uclibcgnueabi.patch
packages/portmap/portmap-6.0/destdir-no-strip.patch
packages/portmap/portmap-6.0/no-libwrap.patch
packages/portmap/portmap-6.0/no-tcpd-support.patch
packages/portmap/portmap_6.0.bb
packages/qemu/qemu-gcc3-check.inc
packages/xserver-common/xserver-common_1.18.bb
MAINTAINERS
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom.inc
conf/machine/gumstix-connex.conf
conf/machine/gumstix-verdex.conf
conf/machine/include/gumstix.inc
conf/machine/include/tune-arm1136jf-s.conf
conf/machine/include/tune-arm920t.conf
conf/machine/include/tune-arm926ejs.conf
conf/machine/include/tune-xscale.conf
conf/machine/omap5912osk.conf
packages/avahi/avahi-python_0.6.21.bb
packages/avahi/avahi.inc
packages/base-files/base-files/omap5912osk/fstab
packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
packages/fbreader/fbreader_0.8.2a.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc_4.2.1.bb
packages/gpephone/gpe-session-scripts-phone/phonesession
packages/gpephone/gpe-session-scripts-phone_0.67.bb
packages/gpephone/ptim-engine_svn.bb
packages/images/angstrom-minimal-image.bb
packages/linux/ixp4xx-kernel/2.6.21/defconfig
packages/linux/ixp4xx-kernel/2.6.22/defconfig
packages/linux/linux/alix/defconfig
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/linux/linux_2.6.22+2.6.23-rc3.bb
packages/linux/linux_2.6.22.bb
packages/lm_sensors/lmsensors-apps_2.10.1.bb
packages/openssl/openssl_0.9.7g.bb
packages/portmap/portmap.inc
packages/qemu/qemu-native.inc
packages/qemu/qemu-native_20070613.bb
packages/qt/qt4-x11-free_4.3.0.bb
packages/tasks/task-gpephone.bb
packages/midori
packages/midori/midori_0.0.5.bb
Diffs:

#
# mt diff -r7f7e2abbafbc78c693195ccd3ecbc44742312157 -r5d2e32fb9864db7ab20c3a83fb59b021d1a8ed51
#
# 
# 
# delete "packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01"
# 
# delete "packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01"
# 
# delete "packages/linux/linux-gta01_2.6.21.5.bb"
# 
# delete "packages/xserver-common/xserver-common_1.10.bb"
# 
# delete "packages/xserver-common/xserver-common_1.3.bb"
# 
# delete "packages/xserver-common/xserver-common_1.8.bb"
# 
# delete "packages/xserver-common/xserver-common_1.9.bb"
# 
# rename "packages/lyx/lyx_1.4.4+1.5.0rc1.bb"
#     to "packages/lyx/lyx_1.5.1.bb"
# 
# add_dir "packages/base-files/base-files/gumstix-connex"
# 
# add_dir "packages/base-files/base-files/gumstix-verdex"
# 
# add_dir "packages/portmap/portmap-6.0"
# 
# add_file "conf/distro/include/angstrom-package-deb.inc"
#  content [8335e823a868d57d55708c602a26223d00ab6084]
# 
# add_file "conf/distro/include/angstrom-package-ipk.inc"
#  content [440a6b52c9a5ad608b32d2bbbd73a677595a08b1]
# 
# add_file "conf/distro/include/angstrom-package-rpm.inc"
#  content [765c4bf206ce98aa3df32967a2f3acd60e668558]
# 
# add_file "packages/alsa/alsa-lib/unbreak_plugindir.patch"
#  content [a16e20ebbbcde514ae86abd3664bf70c4279e5e3]
# 
# add_file "packages/alsa/alsa-lib_1.0.14.bb"
#  content [60431b66fbe642b84eebb662e02f977ce4cf8e9d]
# 
# add_file "packages/alsa/alsa-oss_1.0.14.bb"
#  content [7ca8c991dd2976fe24201983328f2b96c073e203]
# 
# add_file "packages/alsa/alsa-utils_1.0.14.bb"
#  content [a96036a12ca994ce724e4448bb897a719e94a500]
# 
# add_file "packages/base-files/base-files/gumstix-connex/fstab"
#  content [41dbd341dd76afdef10b78b4333320b8ed4752ca]
# 
# add_file "packages/base-files/base-files/gumstix-verdex/fstab"
#  content [60ebb29ec9fb9e06dc20abd4fd3b49d9c21f277c]
# 
# add_file "packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch"
#  content [b581c03296f5366b4537f115f0f15b882e4642d9]
# 
# add_file "packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch"
#  content [64a0003447e854b6c8205b5b87d3cdc8ca7caa1d]
# 
# add_file "packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch"
#  content [18ed95506560584fd1d043968fbd4b0815788660]
# 
# add_file "packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch"
#  content [65b2d89ea79630ced487f720de9e5a517e54c408]
# 
# add_file "packages/gcc/gcc-4.2.1/307-locale_facets.patch"
#  content [5dd86533b193ad688496b19e73f8e0395bb18761]
# 
# add_file "packages/gcc/gcc-4.2.1/402-libbackend_dep_gcov-iov.h.patch"
#  content [1f1916106df0ca5ef09c7ab3bb7f1323de3574e6]
# 
# add_file "packages/gpephone/libabenabler2_1.0.bb"
#  content [4f9c73be9459a6c41bed68e0a75c9b0fae0f5209]
# 
# add_file "packages/gpephone/vochistory_0.1.bb"
#  content [a6fc2d805c8e1894ef2c15a122934d42c45861d3]
# 
# add_file "packages/linux/linux/alix/geode-mfgpt-clock-event-device-support.patch"
#  content [d0e230915059acdf6b19ea60e86d9936b545c098]
# 
# add_file "packages/linux/linux/alix/geode-mfgpt-support-for-geode-class-machines.patch"
#  content [c55a38ac6a13fc66730cc600ffa2effc475670a6]
# 
# add_file "packages/openssl/openssl-0.9.7g/armeb.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/openssl/openssl-0.9.7g/debian.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/openssl/openssl-0.9.7g/gnueabi-arm.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch.lock"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/openssl/openssl-0.9.7g/uclibcgnueabi.patch"
#  content [bd1bc954b5c2e8539a39128f09661d686716eba9]
# 
# add_file "packages/portmap/portmap-6.0/destdir-no-strip.patch"
#  content [f8c1fc10af211a706c2d9e98872ddaaeef1c165e]
# 
# add_file "packages/portmap/portmap-6.0/no-libwrap.patch"
#  content [fc32321b7bf0534d84414d6f1aac381c2ff2475f]
# 
# add_file "packages/portmap/portmap-6.0/no-tcpd-support.patch"
#  content [e0c8679553ae5264003fc7b888634771ed4c4f3d]
# 
# add_file "packages/portmap/portmap_6.0.bb"
#  content [ca392f1e64fd7197d9e3a2fda7b4573b8ca5f289]
# 
# add_file "packages/qemu/qemu-gcc3-check.inc"
#  content [2e11e76ecd0c388cdcfd1319c8601c429ba5888e]
# 
# add_file "packages/xserver-common/xserver-common_1.18.bb"
#  content [14f7d103bf373a302fc67211bc1c91f71605d7fb]
# 
# patch "MAINTAINERS"
#  from [3cab1d77ede42bb82c4f7a38e738ebf61a50b9ae]
#    to [252ff8e6c48e3f59ae9a3cd0c57251b4d2a3e532]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [4d18aa56eca5e569ebbf0b616734cb7b5ca678fe]
#    to [854daa8fca5bd432a53da00b9cfe542bb9051a48]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [130b27cd1f01aa7501986af41f5aa3ec2ef4b767]
#    to [bc404e4b107f132331ca124ae5f643298bdf3840]
# 
# patch "conf/machine/gumstix-connex.conf"
#  from [40931b717032f2f77d845644dd98f36188404e43]
#    to [0903ecc3169560cf41fbd2d7ac041fe5500bae63]
# 
# patch "conf/machine/gumstix-verdex.conf"
#  from [634247a26215a0709ef800ab53ad7f65b87b5342]
#    to [04af755da5ac1ae0a6ca0357f3ebd3488923d7ba]
# 
# patch "conf/machine/include/gumstix.inc"
#  from [a650e6c9c2788b0d9289abdda0b9ed9e3e8ded38]
#    to [8cece65d17833204e5ccdd15bd8c7c456a999ebd]
# 
# patch "conf/machine/include/tune-arm1136jf-s.conf"
#  from [5a3e5932acd2c4060744b80a29575afe2d4371c9]
#    to [eb16d920f5e4b5c23d60ef7eeb3c4dc30ba84f11]
# 
# patch "conf/machine/include/tune-arm920t.conf"
#  from [207e404a30f6a151d53f88ddffbff128b41d77b3]
#    to [90b20a2b9db56011eaade4f5842ba8b4a8584126]
# 
# patch "conf/machine/include/tune-arm926ejs.conf"
#  from [e966494e533757a3d1a62411aad183ba18be3ea3]
#    to [c76a174d9339a3b351d5f39e293bf9321cac008f]
# 
# patch "conf/machine/include/tune-xscale.conf"
#  from [32838c82d74894c143d5d6c15c5202f982358479]
#    to [8823c4bff3c359eb9700b6eafb600e2820f129a3]
# 
# patch "conf/machine/omap5912osk.conf"
#  from [ee00da09140e71d024034162717e88ea68d14d11]
#    to [86e7eca5b6d5f581a0d4cfe3327b0782cbb54d26]
# 
# patch "packages/avahi/avahi-python_0.6.21.bb"
#  from [3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56]
#    to [91ec6e3aec765ad2c28ed09baa8424126d0b5baa]
# 
# patch "packages/avahi/avahi.inc"
#  from [8b9c1e9f1c3c321d890f95dad3f772fd5e727b12]
#    to [caffb4223742bd86a6d49f717b86d9172d22e5e6]
# 
# patch "packages/base-files/base-files/omap5912osk/fstab"
#  from [2e8d39b7b7fcf8fc007b1e25a9cab4b21e409ff9]
#    to [b1424544f95fef68b0973f843d84ed26a12f2fc0]
# 
# patch "packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch"
#  from [fc88b8e91f46ae81818e65b7ee832fc7b3db915f]
#    to [8b922bc76887bc8127d62d1af083f6868a493c90]
# 
# patch "packages/fbreader/fbreader_0.8.2a.bb"
#  from [bfe9fc8a8216d59eb9cfb3b1456b94f3ee163ef2]
#    to [d21eeca9a1bb496e84541d55957587838aaa33e9]
# 
# patch "packages/gcc/gcc-cross_4.2.1.bb"
#  from [320044acba5e9238f864668a392ad637e62641d5]
#    to [78f5b4b004f93529c71f6ccf6d0c605f7d25daac]
# 
# patch "packages/gcc/gcc_4.2.1.bb"
#  from [bafb5bf9dabe0cd6e870dcebb72d25a26d2ff890]
#    to [e8dadb13ddc8b7f5a90543b7fc26fd0466b3e1b6]
# 
# patch "packages/gpephone/gpe-session-scripts-phone/phonesession"
#  from [e0f4897cf03774795773888e2931554df0824118]
#    to [fef840f9cf5db3a22ea5bfac5e0d27b6516b52f2]
# 
# patch "packages/gpephone/gpe-session-scripts-phone_0.67.bb"
#  from [ea1d40745d9fe6c81ff23a05247b1fc791189eac]
#    to [78d311fb6d468089b270987a262475a63969ba75]
# 
# patch "packages/gpephone/ptim-engine_svn.bb"
#  from [7faa1b8b01b548efede423f2c32b31a4ae6ece7c]
#    to [ef51d9a661f2eb0e31b90b646ef0763265f8e070]
# 
# patch "packages/images/angstrom-minimal-image.bb"
#  from [c54fc3e4bfd625850981cbc316b0e61d8d1d48d3]
#    to [18997ce3f1ed2ef3216d3518a98aade1078e00de]
# 
# patch "packages/linux/ixp4xx-kernel/2.6.21/defconfig"
#  from [b30e7150607fae97b5c6688d3f4ba07220c743ed]
#    to [6bf8be494f8b7c23b0232d7c99c5d8adf4028ba2]
# 
# patch "packages/linux/ixp4xx-kernel/2.6.22/defconfig"
#  from [d2e4fd051ca58ad868be6e718c3036009e9a7338]
#    to [1cb9cbc470259061b12e46464f67295c60df26dd]
# 
# patch "packages/linux/linux/alix/defconfig"
#  from [ae7429017290047c958a445063d17fcfbc5e4133]
#    to [a71cc6d35024db907629ab4665daee048393e9fc]
# 
# patch "packages/linux/linux-handhelds-2.6/h2200/defconfig"
#  from [5567dff5dd14cc8563bdc9ccd4f03ae945e4c1d2]
#    to [09af962af20bc3d0a2a4b656f06577e664c2ec7c]
# 
# patch "packages/linux/linux_2.6.22+2.6.23-rc3.bb"
#  from [077937f15108c34d551011de6665dfaddab3a820]
#    to [f63ff8e509848ae02d7ff9d16a56f9b200db0082]
# 
# patch "packages/linux/linux_2.6.22.bb"
#  from [a7c4f5a30592c11bb5188d028c5c20b6ee98188e]
#    to [75d1a2f2d12313c50fdfb2b412412a7b675c00d0]
# 
# patch "packages/lm_sensors/lmsensors-apps_2.10.1.bb"
#  from [77da97f05946e612c7e93275f599fd5891b3876c]
#    to [cfb415f977c0f9b8a4e012bd39fe5df35f0e6b2b]
# 
# patch "packages/lyx/lyx_1.5.1.bb"
#  from [473b500d624d02e11fc4f57fe6c7023584d07365]
#    to [5541c792ef4a873fa0fcb9ed299cb24666497562]
# 
# patch "packages/openssl/openssl_0.9.7g.bb"
#  from [68560d0bda19a0b32c7f514bdb9cf445479e7406]
#    to [145744ceb1c1d90a5eb05ddcd4947d5f569402ab]
# 
# patch "packages/portmap/portmap.inc"
#  from [fe3c7fd20199a597bf47cca11fec9bcafa5bc049]
#    to [03a075d623238bc9402ae2882f8f05d638c80ab6]
# 
# patch "packages/qemu/qemu-native.inc"
#  from [740a86de6db274cb5c05df97968b02f1bc33a4cf]
#    to [22b8987bdaa1e51e0eaff486b9303f0957b086d5]
# 
# patch "packages/qemu/qemu-native_20070613.bb"
#  from [342f872dda508387c0cfd231275c9f7fa10f3a9e]
#    to [750dd1e695e2d0105b93941f87c372ddd4f9f0a1]
# 
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
#  from [b40fdda327f4da1d37441a34c084f97335ce58a5]
#    to [457aaaa25dd85451f4252d6535b8e314cce24ea4]
# 
# patch "packages/tasks/task-gpephone.bb"
#  from [32f3ddece27b455887f907603ffe167f70aaadd7]
#    to [c56f885095e703c6fe7dddc445c17a9632544977]
# 
============================================================
--- conf/distro/include/angstrom-package-deb.inc	8335e823a868d57d55708c602a26223d00ab6084
+++ conf/distro/include/angstrom-package-deb.inc	8335e823a868d57d55708c602a26223d00ab6084
@@ -0,0 +1 @@
+INHERIT += "package_deb"
============================================================
--- conf/distro/include/angstrom-package-ipk.inc	440a6b52c9a5ad608b32d2bbbd73a677595a08b1
+++ conf/distro/include/angstrom-package-ipk.inc	440a6b52c9a5ad608b32d2bbbd73a677595a08b1
@@ -0,0 +1 @@
+INHERIT += "package_ipk"
============================================================
--- conf/distro/include/angstrom-package-rpm.inc	765c4bf206ce98aa3df32967a2f3acd60e668558
+++ conf/distro/include/angstrom-package-rpm.inc	765c4bf206ce98aa3df32967a2f3acd60e668558
@@ -0,0 +1 @@
+INHERIT += "package_rpm"
============================================================
--- packages/alsa/alsa-lib/unbreak_plugindir.patch	a16e20ebbbcde514ae86abd3664bf70c4279e5e3
+++ packages/alsa/alsa-lib/unbreak_plugindir.patch	a16e20ebbbcde514ae86abd3664bf70c4279e5e3
@@ -0,0 +1,12 @@
+diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in
+--- alsa-lib-1.0.14.orig/configure.in	2007-05-31 03:05:13.000000000 -0500
++++ alsa-lib-1.0.14/configure.in	2007-08-18 13:05:49.000000000 -0500
+@@ -93,7 +93,7 @@
+     esac
+     plugindir="$dir/$PACKAGE"
+ fi
+-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
++AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules])
+ ALSA_PLUGIN_DIR="$plugindir"
+ AC_SUBST(ALSA_PLUGIN_DIR)
+ 
============================================================
--- packages/alsa/alsa-lib_1.0.14.bb	60431b66fbe642b84eebb662e02f977ce4cf8e9d
+++ packages/alsa/alsa-lib_1.0.14.bb	60431b66fbe642b84eebb662e02f977ce4cf8e9d
@@ -0,0 +1,44 @@
+DESCRIPTION = "Alsa sound library"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "libs/multimedia"
+LICENSE = "GPL"
+
+PR = "r1"
+
+# configure.in sets -D__arm__ on the command line for any arm system
+# (not just those with the ARM instruction set), this should be removed,
+# (or replaced by a permitted #define).
+#FIXME: remove the following
+ARM_INSTRUCTION_SET = "arm"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
+           file://fix-tstamp-declaration.patch;patch=1 \
+           file://unbreak_plugindir.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
+
+do_stage () {
+	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/alsa/sound
+	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
+	install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
+FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
+FILES_libasound = "${libdir}/libasound.so.*"
+FILES_alsa-server = "${bindir}/*"
+FILES_alsa-conf = "${datadir}/alsa/"
+FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
+FILES_alsa-conf-base = "\
+${datadir}/alsa/alsa.conf \
+${datadir}/alsa/cards/aliases.conf \
+${datadir}/alsa/pcm/default.conf \
+${datadir}/alsa/pcm/dmix.conf \
+${datadir}/alsa/pcm/dsnoop.conf"
+
+RDEPENDS_libasound = "alsa-conf-base"
============================================================
--- packages/alsa/alsa-oss_1.0.14.bb	7ca8c991dd2976fe24201983328f2b96c073e203
+++ packages/alsa/alsa-oss_1.0.14.bb	7ca8c991dd2976fe24201983328f2b96c073e203
@@ -0,0 +1,17 @@
+DESCRIPTION = "Alsa OSS Compatibility Package"
+SECTION = "libs/multimedia"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
+
+inherit autotools 
+
+do_configure_prepend () {
+	touch NEWS README AUTHORS ChangeLog
+}
+
+do_stage () {
+	oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR}
+	oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR}
+}
============================================================
--- packages/alsa/alsa-utils_1.0.14.bb	a96036a12ca994ce724e4448bb897a719e94a500
+++ packages/alsa/alsa-utils_1.0.14.bb	a96036a12ca994ce724e4448bb897a719e94a500
@@ -0,0 +1,61 @@
+DESCRIPTION = "ALSA Utilities"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib ncurses"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
+
+# lazy hack. needs proper fixing in gettext.m4, see
+# http://bugs.openembedded.org/show_bug.cgi?id=2348
+# please close bug and remove this comment when properly fixed
+#
+EXTRA_OECONF_linux-uclibc = "--disable-nls"
+EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
+
+inherit autotools
+
+# This are all packages that we need to make. Also, the now empty alsa-utils
+# ipk depend on them.
+
+PACKAGES += "\
+             alsa-utils-alsamixer \
+             alsa-utils-midi \
+             alsa-utils-aplay \
+             alsa-utils-amixer \
+             alsa-utils-aconnect \
+             alsa-utils-iecset \
+             alsa-utils-speakertest \
+             alsa-utils-aseqnet \
+             alsa-utils-aseqdump \
+             alsa-utils-alsaconf \
+             alsa-utils-alsactl "
+
+# We omit alsaconf, because
+# a) this is a bash script
+# b) it creates config files not suitable for OE-based distros
+
+FILES_${PN} = ""
+FILES_alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord"
+FILES_alsa-utils-amixer      = "${bindir}/amixer"
+FILES_alsa-utils-alsamixer   = "${bindir}/alsamixer"
+FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/"
+FILES_alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
+FILES_alsa-utils-aconnect    = "${bindir}/aconnect"
+FILES_alsa-utils-aseqnet     = "${bindir}/aseqnet"
+FILES_alsa-utils-iecset      = "${bindir}/iecset"
+FILES_alsa-utils-alsactl     = "${sbindir}/alsactl"
+FILES_alsa-utils-aseqdump    = "${bindir}/aseqdump"
+FILES_alsa-utils-alsaconf    = "${sbindir}/alsaconf"
+
+DESCRIPTION_alsa-utils-aplay        = "play (and record) sound files via ALSA"
+DESCRIPTION_alsa-utils-amixer       = "command-line based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-alsamixer    = "ncurses based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-speakertest  = "ALSA surround speaker test utility"
+DESCRIPTION_alsa-utils-midi         = "miscalleanous MIDI utilities for ALSA"
+DESCRIPTION_alsa-utils-aco%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -ra3a33729f3f0c0ad0c71c9872010fc1d7dd4f9ee -r5d2e32fb9864db7ab20c3a83fb59b021d1a8ed51
#
# 
# 
# delete "packages/midori"
# 
# delete "packages/midori/midori_0.0.5.bb"
# 






More information about the Openembedded-commits mailing list