[oe-commits] org.oe.dev merge of '92c05bc0b6ee1645537e1189be26b9962a1c5170'
koen commit
oe at amethyst.openembedded.net
Sun Apr 13 12:34:39 UTC 2008
merge of '92c05bc0b6ee1645537e1189be26b9962a1c5170'
and 'b4c276c777f8614628c038c3f75fb35493df20b7'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: dc8d5eb6a48cb5c18ffadcc4db1607fcc6ca81cd
ViewMTN: http://monotone.openembedded.org/revision/info/dc8d5eb6a48cb5c18ffadcc4db1607fcc6ca81cd
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/em8300
packages/em8300/files
packages/uclibc/uclibc-0.9.29/armv4t
packages/uclibc/uclibc-0.9.29/armv5te
packages/uclibc/uclibc-0.9.29/armv6
packages/uclibc/uclibc-0.9.29/armv7a
packages/uclibc/uclibc-0.9.29/iwmmxt
packages/em8300/em8300_0.16.3.bb
packages/em8300/files/kernel-source-dir.diff
packages/uclibc/uclibc-0.9.29/armv4t/uClibc.machine
packages/uclibc/uclibc-0.9.29/armv5te/uClibc.machine
packages/uclibc/uclibc-0.9.29/armv6/uClibc.machine
packages/uclibc/uclibc-0.9.29/armv7a/uClibc.machine
packages/uclibc/uclibc-0.9.29/iwmmxt/uClibc.machine
Diffs:
#
# mt diff -r92c05bc0b6ee1645537e1189be26b9962a1c5170 -rdc8d5eb6a48cb5c18ffadcc4db1607fcc6ca81cd
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [afc429e39ba516ccd96480fbeae6acda4c879cf2]
# to [fc9f6d1a44b49314cb26b36c070e7c89ad2be228]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc afc429e39ba516ccd96480fbeae6acda4c879cf2
+++ conf/distro/include/sane-srcrevs.inc fc9f6d1a44b49314cb26b36c070e7c89ad2be228
@@ -34,7 +34,7 @@ SRCREV_pn-gpe-contacts ?= "9312"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "116"
+SRCREV_pn-gsm0710muxd ?= "193"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
#
# mt diff -rb4c276c777f8614628c038c3f75fb35493df20b7 -rdc8d5eb6a48cb5c18ffadcc4db1607fcc6ca81cd
#
#
#
# add_dir "packages/em8300"
#
# add_dir "packages/em8300/files"
#
# add_dir "packages/uclibc/uclibc-0.9.29/armv4t"
#
# add_dir "packages/uclibc/uclibc-0.9.29/armv5te"
#
# add_dir "packages/uclibc/uclibc-0.9.29/armv6"
#
# add_dir "packages/uclibc/uclibc-0.9.29/armv7a"
#
# add_dir "packages/uclibc/uclibc-0.9.29/iwmmxt"
#
# add_file "packages/em8300/em8300_0.16.3.bb"
# content [2047065a6046d813c635c2d79b0632a50ce8a58b]
#
# add_file "packages/em8300/files/kernel-source-dir.diff"
# content [4d616db78a90f4d6957a52e25cdbc5490be7f149]
#
# add_file "packages/uclibc/uclibc-0.9.29/armv4t/uClibc.machine"
# content [4bb493d88e9e62926dd36a721907fb0f7485bb50]
#
# add_file "packages/uclibc/uclibc-0.9.29/armv5te/uClibc.machine"
# content [55b4a5c7c3dcf81fc96e330e74fc84374f0bc276]
#
# add_file "packages/uclibc/uclibc-0.9.29/armv6/uClibc.machine"
# content [51556a42a1edff0c1237f44a64bf285702144ca4]
#
# add_file "packages/uclibc/uclibc-0.9.29/armv7a/uClibc.machine"
# content [51556a42a1edff0c1237f44a64bf285702144ca4]
#
# add_file "packages/uclibc/uclibc-0.9.29/iwmmxt/uClibc.machine"
# content [b1e518a7f7fc0366b00ae228821d77e0a0d1ff56]
#
============================================================
--- packages/em8300/em8300_0.16.3.bb 2047065a6046d813c635c2d79b0632a50ce8a58b
+++ packages/em8300/em8300_0.16.3.bb 2047065a6046d813c635c2d79b0632a50ce8a58b
@@ -0,0 +1,47 @@
+DESCRIPTION = "Drivers and utils for DXR3/Hollywood+ mpeg decoder cards""
+DEPENDS = "gtk+"
+
+# Be sure to have the I2C bitbanging interface enabled in your kernel config
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/dxr3/${PN}-${PV}.tar.gz \
+ file://kernel-source-dir.diff;patch=1 \
+ "
+
+inherit module-base autotools
+
+do_configure_prepend() {
+ sed -i -e s:SEDME:${STAGING_KERNEL_DIR}:g modules/Makefile
+}
+
+do_compile_append() {
+ cd ${S}/modules
+ oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \
+ KERNEL_SRC=${STAGING_KERNEL_DIR} \
+ KERNEL_VERSION=${KERNEL_VERSION} \
+ CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+ cd ${S}
+}
+
+do_install_append() {
+ cd ${S}/modules
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" modules_install
+ cd ${S}
+}
+
+PACKAGES =+ "em8300-modules"
+FILES_em8300-modules = "${base_libdir}/modules"
+
+pkg_postinst_append () {
+ if [ -n "$D" ]; then
+ exit 1
+ fi
+ depmod -a
+ update-modules || true
+}
+
+pkg_postrm_append () {
+ update-modules || true
+}
+
+
============================================================
--- packages/em8300/files/kernel-source-dir.diff 4d616db78a90f4d6957a52e25cdbc5490be7f149
+++ packages/em8300/files/kernel-source-dir.diff 4d616db78a90f4d6957a52e25cdbc5490be7f149
@@ -0,0 +1,11 @@
+--- /tmp/Makefile 2007-12-26 20:28:11.474790960 +0100
++++ em8300-0.16.3/modules/Makefile 2007-12-26 20:28:57.938122985 +0100
+@@ -19,7 +19,7 @@
+
+ ifeq ($(KERNELRELEASE),)
+
+-KERNEL_LOCATION := /lib/modules/$(shell uname -r)/build
++KERNEL_LOCATION = SEDME
+
+ # If you are using external i2c modules, you should set
+ # EM8300_I2C_LOCATION to the source directory of the modules.
============================================================
--- packages/uclibc/uclibc-0.9.29/armv4t/uClibc.machine 4bb493d88e9e62926dd36a721907fb0f7485bb50
+++ packages/uclibc/uclibc-0.9.29/armv4t/uClibc.machine 4bb493d88e9e62926dd36a721907fb0f7485bb50
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
============================================================
--- packages/uclibc/uclibc-0.9.29/armv5te/uClibc.machine 55b4a5c7c3dcf81fc96e330e74fc84374f0bc276
+++ packages/uclibc/uclibc-0.9.29/armv5te/uClibc.machine 55b4a5c7c3dcf81fc96e330e74fc84374f0bc276
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
============================================================
--- packages/uclibc/uclibc-0.9.29/armv6/uClibc.machine 51556a42a1edff0c1237f44a64bf285702144ca4
+++ packages/uclibc/uclibc-0.9.29/armv6/uClibc.machine 51556a42a1edff0c1237f44a64bf285702144ca4
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+UCLIBC_HAS_SOFT_FLOAT=n
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
============================================================
--- packages/uclibc/uclibc-0.9.29/armv7a/uClibc.machine 51556a42a1edff0c1237f44a64bf285702144ca4
+++ packages/uclibc/uclibc-0.9.29/armv7a/uClibc.machine 51556a42a1edff0c1237f44a64bf285702144ca4
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+UCLIBC_HAS_SOFT_FLOAT=n
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
============================================================
--- packages/uclibc/uclibc-0.9.29/iwmmxt/uClibc.machine b1e518a7f7fc0366b00ae228821d77e0a0d1ff56
+++ packages/uclibc/uclibc-0.9.29/iwmmxt/uClibc.machine b1e518a7f7fc0366b00ae228821d77e0a0d1ff56
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
More information about the Openembedded-commits
mailing list