[oe-commits] org.oe.dev merge of '0a57d791817bb802f8d5d76a1f72267f1b8f3824'
koen commit
openembedded-commits at lists.openembedded.org
Mon Nov 12 20:56:55 UTC 2007
merge of '0a57d791817bb802f8d5d76a1f72267f1b8f3824'
and '60523827594e8dff880897c63c20ce4b5515bb3e'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 7ec568cd47ad18ba0056bcb3f35488f2e6c5cc40
ViewMTN: http://monotone.openembedded.org/revision/info/7ec568cd47ad18ba0056bcb3f35488f2e6c5cc40
Files:
1
packages/blueprobe/blueprobe-0.18/h4000.patch
packages/blueprobe/blueprobe.inc
packages/blueprobe/blueprobe_0.18.bb
packages/bluez/bluez-gnome_0.10.bb
packages/bluez/bluez-gnome_0.13.bb
packages/bluez/bluez-gnome_0.14.bb
packages/bluez/bluez-gnome_cvs.bb
packages/bluez/bluez-gnome_git.bb
packages/dbus/dbus-glib-native_0.74.bb
packages/dbus/dbus-glib_0.74.bb
packages/dbus/dbus-native_1.0.1.bb
packages/dbus/dbus-python_0.71.bb
packages/dbus/dbus.inc
packages/dropbear/dropbear.inc
packages/glibc/glibc_2.7.bb
Diffs:
#
# mt diff -r0a57d791817bb802f8d5d76a1f72267f1b8f3824 -r7ec568cd47ad18ba0056bcb3f35488f2e6c5cc40
#
#
#
# patch "packages/blueprobe/blueprobe-0.18/h4000.patch"
# from [dd7df6cf0e31e8d70cb409c0aa6b74dc669fd273]
# to [0ed8984334230380f569942612ce226c185fcf23]
#
# patch "packages/blueprobe/blueprobe.inc"
# from [9f5d6c8e6bad51c66b81021a506f4d890003f803]
# to [026ad3220dd814ec0b57b4271cd40c24392c2b01]
#
# patch "packages/blueprobe/blueprobe_0.18.bb"
# from [7f893ead4128113aab8a6cac8891b52b51ea09f6]
# to [80ee40be194a83f05bb244f4092920aaae325612]
#
# patch "packages/bluez/bluez-gnome_0.10.bb"
# from [6841233421c5e08a0657919d990abdc76ffac9e7]
# to [34f167687bc60341cffbaad6ad0b91af256a2c38]
#
# patch "packages/bluez/bluez-gnome_0.13.bb"
# from [6cbb9f5eeecaf368ffa6b829edd445c7877dc847]
# to [b4b42d7a72595784b9e4a5628c4211153814d05b]
#
# patch "packages/bluez/bluez-gnome_0.14.bb"
# from [6cbb9f5eeecaf368ffa6b829edd445c7877dc847]
# to [b4b42d7a72595784b9e4a5628c4211153814d05b]
#
# patch "packages/bluez/bluez-gnome_cvs.bb"
# from [d475d61535bc5a7b92ecd43e67e72e83cfa9bb17]
# to [dd0723b847bee2aebb6422159d14f7217a3fc5cd]
#
# patch "packages/bluez/bluez-gnome_git.bb"
# from [5367f6822e3f3a11b3977d70ef24c0956ae2fe85]
# to [aab596ac3e8a78f580f63080ded7aaee9522d02d]
#
# patch "packages/dbus/dbus-glib-native_0.74.bb"
# from [d4ea0635819a397d0e6d56b2801272629daaf604]
# to [22ad5c52fdc28abe3cf1cdc6c17d7d2901487ebd]
#
# patch "packages/dbus/dbus-glib_0.74.bb"
# from [58e13a7d2c191154fc3aa8fdadca4c0675c7f149]
# to [2de7352f30945b16f803b91bdcfae992622b43c2]
#
# patch "packages/dbus/dbus-native_1.0.1.bb"
# from [833883e0548ac4f60201dad953b020969a952971]
# to [9ed9b4ac98d99e64ae880b961efde6c208c66951]
#
# patch "packages/dbus/dbus-python_0.71.bb"
# from [222487d3f7e5dc5e948ab3338e763387a5f79a6d]
# to [705a7fa94b004fe65ef02f4bd440c865f03df0c0]
#
# patch "packages/dbus/dbus.inc"
# from [9c959556ad6f5662b1f849ccc7ae1feaa63c5a47]
# to [ea256c4c8b990fd68875bffd43137d01b3d8dd0a]
#
# patch "packages/dropbear/dropbear.inc"
# from [0fb89381d326f94dcaca0c7cff61ec28480a313d]
# to [6d50c1193e4d2fa9a7c6f85db6149b36aee06851]
#
============================================================
--- packages/blueprobe/blueprobe-0.18/h4000.patch dd7df6cf0e31e8d70cb409c0aa6b74dc669fd273
+++ packages/blueprobe/blueprobe-0.18/h4000.patch 0ed8984334230380f569942612ce226c185fcf23
@@ -1,10 +1,10 @@
--- blueprobe-0.18/blueprobe.init.org 2007-01-11 11:54:09.000000000 +0000
+++ blueprobe-0.18/blueprobe.init 2007-02-11 17:05:51.000000000 +0000
@@ -65,6 +65,13 @@
PROTO=bcsp
PROBE=yes
;;
-+ "HP iPAQ H4000")
++ "HP iPAQ H4100" | "HP iPAQ H4300")
+ BLUETOOTH=yes
+ PORT=/dev/ttyS1
+ SPEED=115200
============================================================
--- packages/blueprobe/blueprobe.inc 9f5d6c8e6bad51c66b81021a506f4d890003f803
+++ packages/blueprobe/blueprobe.inc 026ad3220dd814ec0b57b4271cd40c24392c2b01
@@ -1,3 +1,4 @@ LICENSE = "GPL"
SECTION = "base"
LICENSE = "GPL"
+DESCRIPTION = "Discovers machine-specific Bluetooth parameters"
inherit gpe
============================================================
--- packages/blueprobe/blueprobe_0.18.bb 7f893ead4128113aab8a6cac8891b52b51ea09f6
+++ packages/blueprobe/blueprobe_0.18.bb 80ee40be194a83f05bb244f4092920aaae325612
@@ -1,6 +1,6 @@ require blueprobe.inc
require blueprobe.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://h4000.patch;patch=1 \
file://uclibc-fix.patch;patch=1"
============================================================
--- packages/bluez/bluez-gnome_0.10.bb 6841233421c5e08a0657919d990abdc76ffac9e7
+++ packages/bluez/bluez-gnome_0.10.bb 34f167687bc60341cffbaad6ad0b91af256a2c38
@@ -1,4 +1,4 @@
-DESCRIPTION = "BLuetooth configuration applet"
+DESCRIPTION = "Bluetooth configuration applet"
LICENSE = "GPL+LGPL"
DEPENDS = "dbus-glib gconf libnotify gtk+"
============================================================
--- packages/bluez/bluez-gnome_0.13.bb 6cbb9f5eeecaf368ffa6b829edd445c7877dc847
+++ packages/bluez/bluez-gnome_0.13.bb b4b42d7a72595784b9e4a5628c4211153814d05b
@@ -1,4 +1,4 @@
-DESCRIPTION = "BLuetooth configuration applet"
+DESCRIPTION = "Bluetooth configuration applet"
LICENSE = "GPL+LGPL"
PR = "r1"
============================================================
--- packages/bluez/bluez-gnome_0.14.bb 6cbb9f5eeecaf368ffa6b829edd445c7877dc847
+++ packages/bluez/bluez-gnome_0.14.bb b4b42d7a72595784b9e4a5628c4211153814d05b
@@ -1,4 +1,4 @@
-DESCRIPTION = "BLuetooth configuration applet"
+DESCRIPTION = "Bluetooth configuration applet"
LICENSE = "GPL+LGPL"
PR = "r1"
============================================================
--- packages/bluez/bluez-gnome_cvs.bb d475d61535bc5a7b92ecd43e67e72e83cfa9bb17
+++ packages/bluez/bluez-gnome_cvs.bb dd0723b847bee2aebb6422159d14f7217a3fc5cd
@@ -1,4 +1,4 @@
-DESCRIPTION = "BLuetooth configuration applet"
+DESCRIPTION = "Bluetooth configuration applet"
LICENSE = "GPL+LGPL"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/bluez/bluez-gnome_git.bb 5367f6822e3f3a11b3977d70ef24c0956ae2fe85
+++ packages/bluez/bluez-gnome_git.bb aab596ac3e8a78f580f63080ded7aaee9522d02d
@@ -1,4 +1,4 @@
-DESCRIPTION = "BLuetooth configuration applet"
+DESCRIPTION = "Bluetooth configuration applet"
LICENSE = "GPL+LGPL"
DEFAULT_PREFERENCE = "-2"
============================================================
--- packages/dbus/dbus-glib-native_0.74.bb d4ea0635819a397d0e6d56b2801272629daaf604
+++ packages/dbus/dbus-glib-native_0.74.bb 22ad5c52fdc28abe3cf1cdc6c17d7d2901487ebd
@@ -1,7 +1,7 @@ HOMEPAGE = "http://www.freedesktop.org/S
SECTION = "base"
PR = "r0"
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
+DESCRIPTION = "Message bus system for applications to talk to one another"
LICENSE = "GPL"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
============================================================
--- packages/dbus/dbus-glib_0.74.bb 58e13a7d2c191154fc3aa8fdadca4c0675c7f149
+++ packages/dbus/dbus-glib_0.74.bb 2de7352f30945b16f803b91bdcfae992622b43c2
@@ -1,7 +1,7 @@ HOMEPAGE = "http://www.freedesktop.org/S
SECTION = "base"
PR = "r0"
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
+DESCRIPTION = "Message bus system for applications to talk to one another"
LICENSE = "GPL"
DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
============================================================
--- packages/dbus/dbus-native_1.0.1.bb 833883e0548ac4f60201dad953b020969a952971
+++ packages/dbus/dbus-native_1.0.1.bb 9ed9b4ac98d99e64ae880b961efde6c208c66951
@@ -1,4 +1,4 @@
-DESCRIPTION = "message bus system for applications to talk to one another"
+DESCRIPTION = "Message bus system for applications to talk to one another"
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
LICENSE = "GPL"
SECTION = "base"
============================================================
--- packages/dbus/dbus-python_0.71.bb 222487d3f7e5dc5e948ab3338e763387a5f79a6d
+++ packages/dbus/dbus-python_0.71.bb 705a7fa94b004fe65ef02f4bd440c865f03df0c0
@@ -1,4 +1,4 @@
-DESCRIPTION = "message bus system for applications to talk to one another - python bindings"
+DESCRIPTION = "Message bus system for applications to talk to one another - python bindings"
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
LICENSE = "GPL"
SECTION = "devel/python"
============================================================
--- packages/dbus/dbus.inc 9c959556ad6f5662b1f849ccc7ae1feaa63c5a47
+++ packages/dbus/dbus.inc ea256c4c8b990fd68875bffd43137d01b3d8dd0a
@@ -1,6 +1,6 @@ HOMEPAGE = "http://www.freedesktop.org/S
SECTION = "base"
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
+DESCRIPTION = "Message bus system for applications to talk to one another"
LICENSE = "GPL"
DEPENDS = "expat glib-2.0 virtual/libintl"
============================================================
--- packages/dropbear/dropbear.inc 0fb89381d326f94dcaca0c7cff61ec28480a313d
+++ packages/dropbear/dropbear.inc 6d50c1193e4d2fa9a7c6f85db6149b36aee06851
@@ -1,4 +1,4 @@
-DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
+DESCRIPTION = "Dropbear is a lightweight SSH and SCP implementation"
HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
SECTION = "console/network"
LICENSE = "MIT"
#
# mt diff -r60523827594e8dff880897c63c20ce4b5515bb3e -r7ec568cd47ad18ba0056bcb3f35488f2e6c5cc40
#
#
#
# add_file "packages/glibc/glibc_2.7.bb"
# content [103ab2ecbe46e58a2574221a6ab35e0d7b843e62]
#
============================================================
--- packages/glibc/glibc_2.7.bb 103ab2ecbe46e58a2574221a6ab35e0d7b843e62
+++ packages/glibc/glibc_2.7.bb 103ab2ecbe46e58a2574221a6ab35e0d7b843e62
@@ -0,0 +1,156 @@
+require glibc.inc
+
+ARM_INSTRUCTION_SET = "arm"
+
+PACKAGES_DYNAMIC = "libc6*"
+RPROVIDES_${PN}-dev = "libc6-dev"
+
+PR = "r0"
+
+# the -isystem in bitbake.conf screws up glibc do_stage
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
+
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
+
+GLIBC_ADDONS ?= "ports,nptl,libidn"
+
+GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN"
+
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+ import bb, re
+ uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
+ if uc_os:
+ raise bb.parse.SkipPackage("incompatible with target %s" %
+ bb.data.getVar('TARGET_OS', d, 1))
+}
+
+RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
+
+# file://noinfo.patch;patch=1
+# file://ldconfig.patch;patch=1;pnum=0
+# file://arm-machine-gmon.patch;patch=1;pnum=0 \
+# \
+# file://arm-ioperm.patch;patch=1;pnum=0 \
+# file://ldd.patch;patch=1;pnum=0 \
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
+ ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \
+ ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \
+ file://arm-memcpy.patch;patch=1 \
+ file://arm-longlong.patch;patch=1 \
+ file://fhs-linux-paths.patch;patch=1 \
+ file://dl-cache-libcmp.patch;patch=1 \
+ file://ldsocache-varrun.patch;patch=1 \
+ file://nptl-crosscompile.patch;patch=1 \
+ file://glibc-check_pf.patch;patch=1;pnum=0 \
+# file://glibc-2.4-compile.patch;patch=1 \
+# file://glibc-2.4-openat-3.patch;patch=1 \
+# file://fixup-aeabi-syscalls.patch;patch=1 \
+# file://zecke-sane-readelf.patch;patch=1 \
+ file://ldd-unbash.patch;patch=1 \
+ file://generic-bits_select.h \
+ file://generic-bits_types.h \
+ file://generic-bits_typesizes.h \
+ file://generic-bits_time.h \
+ file://etc/ld.so.conf \
+ file://generate-supported.mk"
+
+
+# Build fails on sh3 and sh4 without additional patches
+SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+
+#powerpc patches to add support for soft-float
+SRC_URI_append_powerpc= " \
+ file://powerpc-sqrt-hack.diff;patch=1""
+
+S = "${WORKDIR}/glibc-${PV}"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
+ --without-cvs --disable-profile --disable-debug --without-gd \
+ --enable-clocale=gnu \
+ --enable-add-ons=${GLIBC_ADDONS} \
+ --with-headers=${STAGING_INCDIR} \
+ --without-selinux \
+ ${GLIBC_EXTRA_OECONF}"
+
+EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
+
+do_munge() {
+ # Integrate ports and libidn into tree
+ mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports
+ mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn
+
+ # Ports isn't really working... Fix it
+ # Some of this is rather dirty, but it seems to be the only
+ # quick way to get this cruft to compile
+ rm -rf ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
+ ln -s nptl ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
+ cp ${S}/nptl/sysdeps/pthread/bits/sigthread.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+ cp ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+ cp ${S}/sysdeps/wordsize-32/bits/wordsize.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+ cp ${WORKDIR}/generic-bits_select.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/select.h
+ cp ${WORKDIR}/generic-bits_types.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/types.h
+ cp ${WORKDIR}/generic-bits_typesizes.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/typesizes.h
+ cp ${WORKDIR}/generic-bits_time.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/time.h
+ # Copy in generic stuff for not yet implemented headers
+ for i in ${S}/bits/*.h; do
+ F=`basename $i`
+ [ "$F" = "local_lim.h" ] && continue
+ [ "$F" = "errno.h" ] && continue
+ test -e ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/$F || test -e ${S}/ports/sysdeps/arm/bits/$F || test -e ${S}/sysdeps/unix/sysv/linux/bits/$F || test -e ${S}/sysdeps/ieee754/bits/$F || cp $i ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+ done
+ # This is harmful; we need to get the one from nptl/sysdeps/pthreads
+ rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/libc-lock.h
+ # Obsoleted by sysdeps/arm/{fpu,eabi}/bits/fenv.h
+ rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/fenv.h
+ # Obsoleted by sysdeps/gnu/bits/utmp.h
+ rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/utmp.h
+}
+
+addtask munge before do_patch after do_unpack
+
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+ if [ -z "`which rpcgen`" ]; then
+ echo "rpcgen not found. Install glibc-devel."
+ exit 1
+ fi
+ (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+ CPPFLAGS="" oe_runconf
+}
+
+rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
+ yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+ rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
+
+do_compile () {
+ # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
+ unset LDFLAGS
+ base_do_compile
+ (
+ cd ${S}/sunrpc/rpcsvc
+ for r in ${rpcsvc}; do
+ h=`echo $r|sed -e's,\.x$,.h,'`
+ rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
+ done
+ )
+}
+
+require glibc-stage.inc
+
+require glibc-package.bbclass
More information about the Openembedded-commits
mailing list