[oe-commits] org.oe.dev merge of '1a7d8ef4f2ac682f876865778e2c6db09d211a87'
mickeyl commit
oe at amethyst.openembedded.net
Tue Jun 24 16:30:24 UTC 2008
merge of '1a7d8ef4f2ac682f876865778e2c6db09d211a87'
and 'dd270d37a9758c7acdca59383935fd9cadad3aa8'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e4a1dcbb68f844811ac77c084af0fc000ce31580
ViewMTN: http://monotone.openembedded.org/revision/info/e4a1dcbb68f844811ac77c084af0fc000ce31580
Files:
1
packages/ezx/ezx-boot-usb-native.inc
conf/distro/include/sane-srcrevs.inc
packages/ezx/ezx-boot-usb-native_0.1.0.bb
packages/ezx/ezx-boot-usb-native_0.2.0.bb
packages/ezx/ezx-boot-usb-native_svn.bb
packages/linux/linux-omap2-git/beagleboard/0001-ARM-OMAP-SmartReflex-driver.patch
packages/linux/linux-omap2-git/beagleboard/0002-ARM-OMAP-SmartReflex-driver.patch
packages/linux/linux-omap2-git/beagleboard/0003-ARM-OMAP-SmartReflex-driver.patch
packages/olsrd
packages/mozilla/firefox-2.0.0.14+3.0rc1
packages/mozilla/firefox-3.0
packages/mozilla/firefox_2.0.0.14+3.0rc1.bb
packages/mozilla/firefox_3.0.bb
packages/obexftp/obexftp_0.20.bb
packages/obexftp/obexftp_0.22.bb
packages/olsrd/files
packages/olsr/olsrd
packages/olsrd/olsrd.inc
packages/olsr/olsrd.inc
packages/olsrd/olsrd_0.4.10.bb
packages/olsr/olsrd_0.4.10.bb
packages/olsrd/olsrd_0.4.8.bb
packages/olsr/olsrd_0.4.8.bb
packages/olsrd/olsrd_0.4.9.bb
packages/olsr/olsrd_0.4.9.bb
packages/olsrd/olsrd_0.5.3.bb
packages/olsr/olsrd_0.5.3.bb
packages/olsrd/olsrd_cvs.bb
packages/olsr/olsrd_cvs.bb
packages/mozilla/firefox-3.0/jemalloc-tls.patch
packages/pidgin/pidgin_2.4.2.bb
packages/cmake/cmake-native_2.4.8.bb
packages/cmake/cmake.inc
packages/cmake/cmake_2.4.8.bb
packages/images/beagleboard-demo-image.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/pidgin/pidgin.inc
packages/sysfsutils/sysfsutils_2.1.0.bb
Diffs:
#
# mt diff -r1a7d8ef4f2ac682f876865778e2c6db09d211a87 -re4a1dcbb68f844811ac77c084af0fc000ce31580
#
#
#
# add_file "packages/ezx/ezx-boot-usb-native.inc"
# content [fb1beb2e96d50b3bdfc8e0d22d580ebbc231d715]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [6d5bc1b8492128dba5438635e85ece76202ee397]
# to [546e0b732206d7e072b5ac00ec14f4fef624e27f]
#
# patch "packages/ezx/ezx-boot-usb-native_0.1.0.bb"
# from [f4063c043372dee1eed2187f7b0009f47c03a64b]
# to [fca004441fcf8a4fa4a755ad4377f7cc3209d346]
#
# patch "packages/ezx/ezx-boot-usb-native_0.2.0.bb"
# from [863acca2c65f303392cb171c0b332215e6cbcca2]
# to [a39fdf026c487cb87491aaf3bc8e8f38bbf46ff6]
#
# patch "packages/ezx/ezx-boot-usb-native_svn.bb"
# from [d6f95db59823492e4f54e90c7ce99918afb00694]
# to [e591737662fe610fe0ab2af6b1cdf6ecead8c925]
#
============================================================
--- packages/ezx/ezx-boot-usb-native.inc fb1beb2e96d50b3bdfc8e0d22d580ebbc231d715
+++ packages/ezx/ezx-boot-usb-native.inc fb1beb2e96d50b3bdfc8e0d22d580ebbc231d715
@@ -0,0 +1,32 @@
+DESCRIPTION = "Boots a Motorola EZX device with a user supplied kernel zImage"
+DEPENDS = "libusb-native"
+SECTION = "devel"
+AUTHOR = "Harald Welte <laforge at openezx.org>"
+LICENSE = "GPL"
+
+SRC_URI = "\
+ svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http \
+ file://asm-arm \
+"
+S = "${WORKDIR}/boot_usb"
+
+inherit native
+
+do_compile() {
+ ${CC} -I${WORKDIR} ${CFLAGS} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c
+}
+
+do_deploy() {
+ install -d ${DEPLOY_DIR_TOOLS}
+ install -m 0755 ezx-boot-usb ${DEPLOY_DIR_TOOLS}/ezx-boot-usb-${PV}
+}
+
+do_stage() {
+ :
+}
+
+do_install() {
+ :
+}
+
+addtask deploy before do_build after do_compile
============================================================
--- conf/distro/include/sane-srcrevs.inc 6d5bc1b8492128dba5438635e85ece76202ee397
+++ conf/distro/include/sane-srcrevs.inc 546e0b732206d7e072b5ac00ec14f4fef624e27f
@@ -32,6 +32,7 @@ SRCREV_pn-exalt-module ?= "78"
SRCREV_pn-exalt ?= "79"
SRCREV_pn-exalt-daemon ?= "78"
SRCREV_pn-exalt-module ?= "78"
+SRCREV_pn-ezx-boot-usb-native = "2186"
SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
============================================================
--- packages/ezx/ezx-boot-usb-native_0.1.0.bb f4063c043372dee1eed2187f7b0009f47c03a64b
+++ packages/ezx/ezx-boot-usb-native_0.1.0.bb fca004441fcf8a4fa4a755ad4377f7cc3209d346
@@ -1,30 +1,7 @@
-DESCRIPTION = "Boots an EZX device with a user supplied kernel zImage"
-DEPENDS = "libusb-native"
-SECTION = "devel"
-AUTHOR = "Harald Welte"
-LICENSE = "GPL"
+require ezx-boot-usb-native.inc
PR = "r0"
SRC_URI = "http://www.openezx.org/download/boot_usb-${PV}.tar.bz2"
S = "${WORKDIR}/boot_usb-${PV}"
inherit native
-
-do_compile() {
- ${CC} ${CFLAGS} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c
-}
-
-do_deploy() {
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0755 ezx-boot-usb ${DEPLOY_DIR_IMAGE}/ezx-boot-usb
-}
-
-do_stage() {
- :
-}
-
-do_install() {
- :
-}
-
-addtask deploy before do_build after do_compile
============================================================
--- packages/ezx/ezx-boot-usb-native_0.2.0.bb 863acca2c65f303392cb171c0b332215e6cbcca2
+++ packages/ezx/ezx-boot-usb-native_0.2.0.bb a39fdf026c487cb87491aaf3bc8e8f38bbf46ff6
@@ -1,31 +1,5 @@
-DESCRIPTION = "Boots a Motorola EZX device with a user supplied kernel zImage"
-DEPENDS = "libusb-native"
-SECTION = "devel"
-AUTHOR = "Team OpenEZX <openezx-devel at lists.openezx.org>"
-LICENSE = "GPL"
-PR = "r0"
+require ezx-boot-usb-native.inc
SRC_URI = "http://www.openezx.org/download/boot_usb-${PV}.tar.bz2 \
file://asm-arm"
S = "${WORKDIR}/boot_usb-${PV}"
-
-inherit native
-
-do_compile() {
- ${CC} ${CFLAGS} -I${WORKDIR} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c
-}
-
-do_deploy() {
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0755 ezx-boot-usb ${DEPLOY_DIR_IMAGE}/ezx-boot-usb
-}
-
-do_stage() {
- :
-}
-
-do_install() {
- :
-}
-
-addtask deploy before do_build after do_compile
============================================================
--- packages/ezx/ezx-boot-usb-native_svn.bb d6f95db59823492e4f54e90c7ce99918afb00694
+++ packages/ezx/ezx-boot-usb-native_svn.bb e591737662fe610fe0ab2af6b1cdf6ecead8c925
@@ -1,35 +1,5 @@
-DESCRIPTION = "Boots an EZX device with a user supplied kernel zImage"
-DEPENDS = "libusb-native"
-SECTION = "devel"
-AUTHOR = "Harald Welte"
-LICENSE = "GPL"
-PR = "r1"
+require ezx-boot-usb-native.inc
DEFAULT_PREFERENCE = "-1"
+PV = "0.2.0+r${SRCREV}"
-REV = "1922"
-PV = "0.1.0+r${REV}"
-
-SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${REV}"
-S = "${WORKDIR}/boot_usb"
-
-inherit native
-
-do_compile() {
- ${CC} ${CFLAGS} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c
-}
-
-do_deploy() {
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0755 ezx-boot-usb ${DEPLOY_DIR_IMAGE}/ezx-boot-usb
-}
-
-do_stage() {
- :
-}
-
-do_install() {
- :
-}
-
-addtask deploy before do_build after do_compile
#
# mt diff -rdd270d37a9758c7acdca59383935fd9cadad3aa8 -re4a1dcbb68f844811ac77c084af0fc000ce31580
#
#
#
# delete "packages/linux/linux-omap2-git/beagleboard/0001-ARM-OMAP-SmartReflex-driver.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/0002-ARM-OMAP-SmartReflex-driver.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/0003-ARM-OMAP-SmartReflex-driver.patch"
#
# delete "packages/olsrd"
#
# rename "packages/mozilla/firefox-2.0.0.14+3.0rc1"
# to "packages/mozilla/firefox-3.0"
#
# rename "packages/mozilla/firefox_2.0.0.14+3.0rc1.bb"
# to "packages/mozilla/firefox_3.0.bb"
#
# rename "packages/obexftp/obexftp_0.20.bb"
# to "packages/obexftp/obexftp_0.22.bb"
#
# rename "packages/olsrd/files"
# to "packages/olsr/olsrd"
#
# rename "packages/olsrd/olsrd.inc"
# to "packages/olsr/olsrd.inc"
#
# rename "packages/olsrd/olsrd_0.4.10.bb"
# to "packages/olsr/olsrd_0.4.10.bb"
#
# rename "packages/olsrd/olsrd_0.4.8.bb"
# to "packages/olsr/olsrd_0.4.8.bb"
#
# rename "packages/olsrd/olsrd_0.4.9.bb"
# to "packages/olsr/olsrd_0.4.9.bb"
#
# rename "packages/olsrd/olsrd_0.5.3.bb"
# to "packages/olsr/olsrd_0.5.3.bb"
#
# rename "packages/olsrd/olsrd_cvs.bb"
# to "packages/olsr/olsrd_cvs.bb"
#
# add_file "packages/mozilla/firefox-3.0/jemalloc-tls.patch"
# content [1b0a4d83fe236599c2badb4192ffcce2ae9f57ae]
#
# add_file "packages/obexftp/obexftp_0.20.bb"
# content [48edce98bc6cfbe0d6432476f1ce2e1a82a79375]
#
# add_file "packages/pidgin/pidgin_2.4.2.bb"
# content [3f2390a31461f3a1825dcbab4911c2a1f2d67061]
#
# patch "packages/cmake/cmake-native_2.4.8.bb"
# from [e93af1577e83160d519fa02f84ead547fd2685f9]
# to [106454cd890b36ee338a471786bd52864e0348da]
#
# patch "packages/cmake/cmake.inc"
# from [89da3b3a405a5fd27d0640e5dbbed1cfee521b7f]
# to [342c5f01763ec602a7231d9b7a69e285c0684c55]
#
# patch "packages/cmake/cmake_2.4.8.bb"
# from [15b0b49ebb8470a51c6d1374f3871d8bd2d8b215]
# to [4cede4a764ccc81e385ce3ba6accc31c2adb7ecb]
#
# patch "packages/images/beagleboard-demo-image.bb"
# from [15ee949cc895b649a63d999a1fec276bcb31e3e6]
# to [be999464289bfc1cd9c18c68e242ef9c9a60759c]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [d9f5cd32de3cb959e7f83ae4f45edc6667992bf6]
# to [ee94d674aaf20c0ee28445eb6c163c03a82854fe]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [0fd69a8856fcd40e868ab5e308dc566f0a0a24f2]
# to [246b9b1219d72b6bbb937d847ce02e263dfc6f69]
#
# patch "packages/mozilla/firefox_3.0.bb"
# from [bf62db140979e7b94274730d22fe8418c70f6c11]
# to [50a3fa2d75086c5b1a38588f806d0dbb34dacffc]
#
# patch "packages/obexftp/obexftp_0.22.bb"
# from [c9341b7a2f8d1c46e28b8c3722e4dcce91a91cb0]
# to [fc8e125d1063215dc049e8c68ecff3584a627881]
#
# patch "packages/pidgin/pidgin.inc"
# from [4a2b74765b75cff02eeb3cbaae9740e0d32e857b]
# to [06327ea3cdaf2c7c51af81fa62d1fccd727a5fe3]
#
# patch "packages/sysfsutils/sysfsutils_2.1.0.bb"
# from [700d2162d28469101eeb235c3e01023ecb3c894b]
# to [6319324060fff5ec0b47b9164c8a0cea67ea4dd6]
#
============================================================
--- packages/mozilla/firefox-3.0/jemalloc-tls.patch 1b0a4d83fe236599c2badb4192ffcce2ae9f57ae
+++ packages/mozilla/firefox-3.0/jemalloc-tls.patch 1b0a4d83fe236599c2badb4192ffcce2ae9f57ae
@@ -0,0 +1,28 @@
+--- /tmp/jemalloc.c 2008-06-23 10:57:36.000000000 +0200
++++ mozilla/memory/jemalloc/jemalloc.c 2008-06-23 11:20:13.000000000 +0200
+@@ -386,7 +386,7 @@
+ #else
+ # define NO_TLS
+ #endif
+-#if 0
++
+ #ifdef __i386__
+ # define QUANTUM_2POW_MIN 4
+ # define SIZEOF_PTR_2POW 2
+@@ -420,7 +420,6 @@
+ # define QUANTUM_2POW_MIN 4
+ # define SIZEOF_PTR_2POW 2
+ #endif
+-#endif
+
+ #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW)
+
+@@ -2582,7 +2581,7 @@
+ * knowledge of how _pthread_self() calculates values, we can't
+ * easily do much better than this.
+ */
+- ind = (unsigned long) _pthread_self() % narenas;
++ ind = 255255 % narenas;
+
+ /*
+ * Optimistially assume that arenas[ind] has been initialized.
============================================================
--- packages/obexftp/obexftp_0.20.bb 48edce98bc6cfbe0d6432476f1ce2e1a82a79375
+++ packages/obexftp/obexftp_0.20.bb 48edce98bc6cfbe0d6432476f1ce2e1a82a79375
@@ -0,0 +1,22 @@
+DESCRIPTION = "OBEX Ftp Client based on openobex."
+SECTION = "console/network"
+HOMEPAGE = "http://openobex.triq.net"
+LICENSE = "GPL"
+DEPENDS = "openobex libgsm"
+PR = "r4"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
+ file://iconv.patch;patch=1 \
+ file://i-hate-libtool.patch;patch=1 \
+ file://m4.patch;patch=1"
+
+inherit autotools gettext
+
+EXTRA_OECONF += "--enable-bluetooth --disable-swig --disable-perl --disable-python --disable-tcl --disable-builddocs --disable-rpath"
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/pidgin/pidgin_2.4.2.bb 3f2390a31461f3a1825dcbab4911c2a1f2d67061
+++ packages/pidgin/pidgin_2.4.2.bb 3f2390a31461f3a1825dcbab4911c2a1f2d67061
@@ -0,0 +1,17 @@
+require pidgin.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+ file://sanitize-configure.ac.patch;patch=1 \
+ file://gconf-no-errors.patch;patch=1 \
+ file://pidgin.desktop-set-icon.patch;patch=1 \
+ file://purple-OE-branding.patch;patch=1 \
+ "
+
+EXTRA_OECONF += " --disable-gtkspell \
+ --disable-meanwhile \
+ --disable-nm \
+ "
+
+PR = "r0"
============================================================
--- packages/cmake/cmake-native_2.4.8.bb e93af1577e83160d519fa02f84ead547fd2685f9
+++ packages/cmake/cmake-native_2.4.8.bb 106454cd890b36ee338a471786bd52864e0348da
@@ -1,4 +1,3 @@
-CMAKE_MAJOR_VERSION="2.4"
require cmake.inc
inherit native
============================================================
--- packages/cmake/cmake.inc 89da3b3a405a5fd27d0640e5dbbed1cfee521b7f
+++ packages/cmake/cmake.inc 342c5f01763ec602a7231d9b7a69e285c0684c55
@@ -6,6 +6,7 @@ SECTION = "console/utils"
LICENSE = "Berkely-style license"
SECTION = "console/utils"
+CMAKE_MAJOR_VERSION = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz"
inherit autotools
============================================================
--- packages/cmake/cmake_2.4.8.bb 15b0b49ebb8470a51c6d1374f3871d8bd2d8b215
+++ packages/cmake/cmake_2.4.8.bb 4cede4a764ccc81e385ce3ba6accc31c2adb7ecb
@@ -1,2 +1 @@
-CMAKE_MAJOR_VERSION="2.4"
require cmake.inc
============================================================
--- packages/images/beagleboard-demo-image.bb 15ee949cc895b649a63d999a1fec276bcb31e3e6
+++ packages/images/beagleboard-demo-image.bb be999464289bfc1cd9c18c68e242ef9c9a60759c
@@ -23,6 +23,7 @@ IMAGE_INSTALL = "\
jaaa nmap iperf gnuplot \
abiword gnumeric gimp \
powertop \
+ pidgin irssi \
"
IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
============================================================
--- packages/linux/linux-omap2-git/beagleboard/defconfig d9f5cd32de3cb959e7f83ae4f45edc6667992bf6
+++ packages/linux/linux-omap2-git/beagleboard/defconfig ee94d674aaf20c0ee28445eb6c163c03a82854fe
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.26-rc5-omap1
-# Fri Jun 13 19:50:40 2008
+# Linux kernel version: 2.6.26-rc7-omap1
+# Mon Jun 23 10:04:35 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -581,6 +581,7 @@ CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_OMAP2=y
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@@ -1155,9 +1156,6 @@ CONFIG_SND_OMAP_SOC=y
# SoC Audio for the Texas Instruments OMAP
#
CONFIG_SND_OMAP_SOC=y
-CONFIG_SND_OMAP_SOC_MCBSP=y
-CONFIG_SND_OMAP_SOC_OMAP3BEAGLE=y
-CONFIG_SND_SOC_TWL4030=y
#
# Open Sound System
@@ -1425,6 +1423,7 @@ CONFIG_RTC_DRV_TWL4030=y
# CONFIG_RTC_DRV_M41T80 is not set
CONFIG_RTC_DRV_TWL4030=y
# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
#
# SPI RTC drivers
@@ -1683,8 +1682,7 @@ CONFIG_FRAME_POINTER=y
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_ERRORS is not set
# CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_DEBUG_LL=n
-# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_LL is not set
#
# Security options
============================================================
--- packages/linux/linux-omap2_git.bb 0fd69a8856fcd40e868ab5e308dc566f0a0a24f2
+++ packages/linux/linux-omap2_git.bb 246b9b1219d72b6bbb937d847ce02e263dfc6f69
@@ -2,9 +2,9 @@ FILESDIR = "${@os.path.dirname(bb.data.g
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "5b97d3ec6732c87741b2fc04f2956f097a458818"
+SRCREV = "6604ac6c8a14d583a463159f3a1601427dab7e05"
-PV = "2.6.25+2.6.26-rc6+${PR}+git${SRCREV}"
+PV = "2.6.25+2.6.26-rc7+${PR}+git${SRCREV}"
PR = "r27"
@@ -14,9 +14,6 @@ SRC_URI_append_beagleboard = " file://no
SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
file://flash.patch;patch=1 \
- file://0001-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
- file://0002-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
- file://0003-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
file://0001-omap3-cpuidle.patch;patch=1 \
file://0002-omap3-cpuidle.patch;patch=1 \
file://timer-suppression.patch;patch=1 \
============================================================
--- packages/mozilla/firefox_2.0.0.14+3.0rc1.bb bf62db140979e7b94274730d22fe8418c70f6c11
+++ packages/mozilla/firefox_3.0.bb 50a3fa2d75086c5b1a38588f806d0dbb34dacffc
@@ -1,7 +1,7 @@ DEPENDS += "cairo"
DEPENDS += "cairo"
-PR = "r3"
+PR = "r0"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0rc1/source/firefox-3.0rc1-source.tar.bz2 \
+SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0/source/firefox-${PV}-source.tar.bz2 \
file://jsautocfg.h \
file://security-cross.patch;patch=1 \
file://jsautocfg-dontoverwrite.patch;patch=1 \
@@ -9,6 +9,9 @@ SRC_URI = "http://ftp.mozilla.org/pub/mo
file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \
file://Bug405992.atomic.nspr.diff;patch=1 \
file://random_to_urandom.diff;patch=1 \
+ file://jemalloc-tls.patch;patch=1 \
+ http://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz \
+ http://ftp.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0~rc2-2.diff.gz;patch=1 \
"
S = "${WORKDIR}/mozilla"
@@ -18,6 +21,10 @@ require firefox.inc
inherit mozilla
require firefox.inc
+do_unpack2() {
+ cp -pPr ${WORKDIR}/js/src* ${S}/js/
+}
+
do_compile_prepend() {
cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk
@@ -35,3 +42,5 @@ do_stage() {
# removes 2 lines that call absent headers
sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h
}
+
+addtask unpack2 after do_unpack before do_patch
============================================================
--- packages/obexftp/obexftp_0.20.bb c9341b7a2f8d1c46e28b8c3722e4dcce91a91cb0
+++ packages/obexftp/obexftp_0.22.bb fc8e125d1063215dc049e8c68ecff3584a627881
@@ -1,21 +1,29 @@ SECTION = "console/network"
DESCRIPTION = "OBEX Ftp Client based on openobex."
SECTION = "console/network"
-HOMEPAGE = "http://openobex.triq.net"
+HOMEPAGE = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
LICENSE = "GPL"
-DEPENDS = "openobex libgsm virtual/libiconv"
-PR = "r3"
+DEPENDS = "openobex bluez-libs libusb virtual/libiconv"
+PR = "r0"
-SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
- file://iconv.patch;patch=1 \
- file://i-hate-libtool.patch;patch=1 \
- file://m4.patch;patch=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.bz2 \
+ "
-inherit autotools
+inherit autotools pkgconfig
-EXTRA_OECONF = "--enable-bluetooth --disable-swig --disable-perl --disable-python --disable-tcl --disable-builddocs"
+EXTRA_OECONF += "--enable-bluetooth \
+ --disable-swig \
+ --disable-perl \
+ --disable-python \
+ --disable-tcl \
+ --disable-ruby \
+ --disable-builddocs \
+ --disable-rpath \
+ "
PARALLEL_MAKE = ""
+LEAD_SONAME = "libobexftp.so"
+
do_stage() {
autotools_stage_all
}
============================================================
--- packages/pidgin/pidgin.inc 4a2b74765b75cff02eeb3cbaae9740e0d32e857b
+++ packages/pidgin/pidgin.inc 06327ea3cdaf2c7c51af81fa62d1fccd727a5fe3
@@ -2,7 +2,7 @@ LICENSE = "GPL"
DESCRIPTION = "multi-protocol instant messaging client"
LICENSE = "GPL"
-DEPENDS = "avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
+DEPENDS = "startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
RRECOMMENDS_${PN} = "libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp"
EXTRA_OECONF = " \
============================================================
--- packages/sysfsutils/sysfsutils_2.1.0.bb 700d2162d28469101eeb235c3e01023ecb3c894b
+++ packages/sysfsutils/sysfsutils_2.1.0.bb 6319324060fff5ec0b47b9164c8a0cea67ea4dd6
@@ -1,22 +1,15 @@ LICENSE = "GPLv2"
DESCRIPTION = "System Utilities Based on Sysfs"
HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \
file://get_mnt_path_check.patch;patch=1"
-S = "${WORKDIR}/sysfsutils-${PV}"
-
inherit autotools
-includedir += "/sysfs"
-
do_stage () {
- oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}/sysfs
- install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs
- install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs
+ autotools_stage_all
}
PACKAGES = "libsysfs libsysfs-dbg libsysfs-dev \
@@ -24,7 +17,6 @@ FILES_libsysfs-dev = "${includedir} ${li
FILES_libsysfs = "${libdir}/*.so.*"
FILES_libsysfs-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/*.o "
+ ${libdir}/*.a"
FILES_libsysfs-dbg += "${libdir}/.debug"
FILES_${PN}-dbg += "${bindir}/.debug"
-
More information about the Openembedded-commits
mailing list