[oe-commits] org.oe.dev merge of '8707d2256d87ca3844a2e60a4e054ffec5b09af7'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sat Feb 9 16:12:06 UTC 2008
merge of '8707d2256d87ca3844a2e60a4e054ffec5b09af7'
and 'ad92000f8881981e810886f09f574d06c9a5f87a'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 6686ff23579d58fcc1cd77385b2f7dab97200433
ViewMTN: http://monotone.openembedded.org/revision/info/6686ff23579d58fcc1cd77385b2f7dab97200433
Files:
1
packages/musicbrainz/libmusicbrainz_2.1.4.bb
packages/taglib/taglibc_1.4.bb
packages/taglib/files
packages/taglib/files/taglib_1.4-8.diff.gz
packages/e17/enna_cvs.bb
packages/taglib/taglib_1.4.bb
mtn:manual_merge
true
conf/machine/at32stk1000.conf
conf/machine/at91sam9260ek.conf
conf/machine/at91sam9261ek.conf
conf/machine/at91sam9263ek.conf
conf/machine/bd-neon.conf
conf/machine/fic-gta01.conf
conf/machine/gesbc-9302.conf
conf/machine/include/motorola-ezx-base.inc
conf/machine/omap1510inn.conf
conf/machine/omap1610h2.conf
conf/machine/omap1710h3.conf
conf/machine/omap2420h4.conf
conf/machine/omap2430sdp.conf
conf/machine/omap5912osk.conf
conf/machine/shark.conf
conf/machine/triton.conf
conf/machine/xxs1500.conf
Diffs:
#
# mt diff -r8707d2256d87ca3844a2e60a4e054ffec5b09af7 -r6686ff23579d58fcc1cd77385b2f7dab97200433
#
#
#
# delete "packages/musicbrainz/libmusicbrainz_2.1.4.bb"
#
# delete "packages/taglib/taglibc_1.4.bb"
#
# add_dir "packages/taglib/files"
#
# add_file "packages/taglib/files/taglib_1.4-8.diff.gz"
# content [c71a982f1f2f332c4477100d574d2031d3bf4b18]
#
# patch "packages/e17/enna_cvs.bb"
# from [85178607c7932e6f49e8e5ac0cecf5631cc84b2c]
# to [829b76d4efae3a18edc2a557c1e41e509f4b1c30]
#
# patch "packages/taglib/taglib_1.4.bb"
# from [ba6c47f548d00f94ed177f8934c40cbaea043095]
# to [be06346f9694f8bab9ce367bdfcaeff9f45d0345]
#
# set "packages/taglib/files/taglib_1.4-8.diff.gz"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/taglib/files/taglib_1.4-8.diff.gz is binary
============================================================
--- packages/e17/enna_cvs.bb 85178607c7932e6f49e8e5ac0cecf5631cc84b2c
+++ packages/e17/enna_cvs.bb 829b76d4efae3a18edc2a557c1e41e509f4b1c30
@@ -1,7 +1,7 @@ DEPENDS = "curl dbus eet evas edje ecore
DESCRIPTION = "Enna is a media center application based on EFL"
LICENSE = "GPL"
DEPENDS = "curl dbus eet evas edje ecore edbus emotion"
-DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglibc"
+DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib"
SECTION = "x11/multimedia"
PV = "0.2.0+cvs${SRCDATE}"
============================================================
--- packages/taglib/taglib_1.4.bb ba6c47f548d00f94ed177f8934c40cbaea043095
+++ packages/taglib/taglib_1.4.bb be06346f9694f8bab9ce367bdfcaeff9f45d0345
@@ -1,41 +1,24 @@ DESCRIPTION = "TagLib is a library for r
DESCRIPTION = "TagLib is a library for reading and editing the meta-data of several popular audio formats"
-SECTION = "libs"
+SECTION = "libs/multimedia"
HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz"
+SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \
+ file://taglib_1.4-8.diff.gz;patch=1"
S = "${WORKDIR}/taglib-${PV}"
-inherit autotools qmake_base pkgconfig binconfig
+inherit autotools pkgconfig binconfig
-export OE_QMAKE_LINK="${CXX}"
-
-do_configure() {
- # calling oe_runconf to generate pkgconfig and binconfig files
- oe_runconf
- cd ${S}/taglib && rm -f Makefile* && qmake -project -o tag.pro -t lib && \
- qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${S}
+do_postpatch() {
+ rm -rf patches && rm -rf .pc && mv -f debian/patches patches && quilt push -av
}
+addtask postpatch after do_patch before do_configure
-do_compile() {
- oe_runmake -C taglib
+do_stage() {
+ autotools_stage_all
}
+PACKAGES =+ "${PN}-c"
+FILES_${PN}-dbg += "${bindir}/taglib-config"
+FILES_${PN}-c = "${libdir}/libtag_c.so.*"
-do_stage_append() {
- install -d ${STAGING_INCDIR}/taglib
- for i in `find taglib -name "*.h"`
- do
- install $i ${STAGING_INCDIR}/taglib/
- done
- for i in `find taglib -name "*.tcc"`
- do
- install $i ${STAGING_INCDIR}/taglib/
- done
- oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR}
-}
-
-do_install() {
- install -d ${D}${libdir}
- oe_libinstall -so -C taglib libtag ${D}${libdir}
-}
#
# mt diff -rad92000f8881981e810886f09f574d06c9a5f87a -r6686ff23579d58fcc1cd77385b2f7dab97200433
#
#
#
# patch "conf/machine/at32stk1000.conf"
# from [f879f3d6c973dc116c1b2c1f62ef587d4b4906fe]
# to [994d60f948a5739d6823d08b129b0b578c266e6b]
#
# patch "conf/machine/at91sam9260ek.conf"
# from [ccdf7373c8151b655be9d0e00012b96f491fda02]
# to [198beed11366de7d9f545e7bfda78eb9cf0ce095]
#
# patch "conf/machine/at91sam9261ek.conf"
# from [082d4e7a74e6d03983cfdd96e32c42c037e91cfe]
# to [270e9486850b1af0ca0a68799bc7b72207c08f48]
#
# patch "conf/machine/at91sam9263ek.conf"
# from [de1f41bf42f63494406ba30edb623326df2ef493]
# to [37b3bd0952c5460ffaee6ffe55a2d0bcb1a48218]
#
# patch "conf/machine/bd-neon.conf"
# from [9fa6c07cfe1ff6d86ec74eb25fb64f830946df9d]
# to [439369ac7261d620a450ea451ea0558950224dcb]
#
# patch "conf/machine/fic-gta01.conf"
# from [b884bb7e142967c6cfb71b21c05365cd18d0f886]
# to [433821750971ab00daad7e3d8a37643c2ddae10a]
#
# patch "conf/machine/gesbc-9302.conf"
# from [8aeacd090eb3f72b84ac45925eb0315d117f1c1d]
# to [01af8f7dc52ca36b5cc7e523777c89597bde5b4b]
#
# patch "conf/machine/include/motorola-ezx-base.inc"
# from [d5cfb7d52855969fe44f35731389ab20bbe67a0e]
# to [110c709cf7f23dd101d3f5d0637d361d93fa163a]
#
# patch "conf/machine/omap1510inn.conf"
# from [b16fd3d2cd68c0834a6426702d4caab37f6072ca]
# to [8c17377309d00fdb256c779a5c747775d94253a8]
#
# patch "conf/machine/omap1610h2.conf"
# from [b16fd3d2cd68c0834a6426702d4caab37f6072ca]
# to [8c17377309d00fdb256c779a5c747775d94253a8]
#
# patch "conf/machine/omap1710h3.conf"
# from [cb830228728963e9421a6a7521641fafa6d3d11e]
# to [a6b802ed2d322e8cb455acaa1c577b5e4ea18d8d]
#
# patch "conf/machine/omap2420h4.conf"
# from [2854c32466fdb67a8e9782d56215753a34407d6c]
# to [7d0d66886ecf2be6ecb4712295977d8e671093ef]
#
# patch "conf/machine/omap2430sdp.conf"
# from [9eef79d6524729bfa7de111047f0e9ab82373353]
# to [cddcd4d01970087121700bf0cbdd356415ed34c7]
#
# patch "conf/machine/omap5912osk.conf"
# from [e1b832be81c4577a78b18536406e78bab2ffa518]
# to [0e95b09a1be375036ac3d8c2bde78501405ef4e3]
#
# patch "conf/machine/shark.conf"
# from [8a744b9daf9db02c05297d317225e9f6d6cb012e]
# to [8e4aeeb70530e6ab7d774480479debf77ecd4f85]
#
# patch "conf/machine/triton.conf"
# from [85b820f8c11f485586f8ddf9fe57eda723faa37a]
# to [564d2e8d50e5fc5bf8ad74d0fdbfb2a2535283ac]
#
# patch "conf/machine/xxs1500.conf"
# from [5a7873168cad2f8e5d64454b4ee4685f6f3928d4]
# to [e1fef73d3c073f86870109d0104a53e35515b27e]
#
============================================================
--- conf/machine/at32stk1000.conf f879f3d6c973dc116c1b2c1f62ef587d4b4906fe
+++ conf/machine/at32stk1000.conf 994d60f948a5739d6823d08b129b0b578c266e6b
@@ -17,6 +17,7 @@ SERIAL_CONSOLE = "115200"
SERIAL_CONSOLE = "115200"
# used by some images
+IMAGE_FSTYPES ?= "jffs2"
ROOT_FLASH_SIZE = "8"
EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
============================================================
--- conf/machine/at91sam9260ek.conf ccdf7373c8151b655be9d0e00012b96f491fda02
+++ conf/machine/at91sam9260ek.conf 198beed11366de7d9f545e7bfda78eb9cf0ce095
@@ -17,6 +17,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
require conf/machine/include/tune-arm926ejs.inc
============================================================
--- conf/machine/at91sam9261ek.conf 082d4e7a74e6d03983cfdd96e32c42c037e91cfe
+++ conf/machine/at91sam9261ek.conf 270e9486850b1af0ca0a68799bc7b72207c08f48
@@ -17,6 +17,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
require conf/machine/include/tune-arm926ejs.inc
============================================================
--- conf/machine/at91sam9263ek.conf de1f41bf42f63494406ba30edb623326df2ef493
+++ conf/machine/at91sam9263ek.conf 37b3bd0952c5460ffaee6ffe55a2d0bcb1a48218
@@ -15,7 +15,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
-
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
require conf/machine/include/tune-arm926ejs.inc
============================================================
--- conf/machine/bd-neon.conf 9fa6c07cfe1ff6d86ec74eb25fb64f830946df9d
+++ conf/machine/bd-neon.conf 439369ac7261d620a450ea451ea0558950224dcb
@@ -41,6 +41,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
kernel-module-af-key \
kernel-module-i2c-pxa"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x40000 --pad=32243712; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
============================================================
--- conf/machine/fic-gta01.conf b884bb7e142967c6cfb71b21c05365cd18d0f886
+++ conf/machine/fic-gta01.conf 433821750971ab00daad7e3d8a37643c2ddae10a
@@ -36,6 +36,7 @@ ROOT_FLASH_SIZE = "60"
ROOT_FLASH_SIZE = "60"
# extra jffs2 tweaks
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
# build / upload tools
============================================================
--- conf/machine/gesbc-9302.conf 8aeacd090eb3f72b84ac45925eb0315d117f1c1d
+++ conf/machine/gesbc-9302.conf 01af8f7dc52ca36b5cc7e523777c89597bde5b4b
@@ -19,6 +19,7 @@ ROOT_FLASH_SIZE = "8"
# used by some images
ROOT_FLASH_SIZE = "8"
#extra jffs2 tweaks
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
#tune for ep93xx cpus
============================================================
--- conf/machine/include/motorola-ezx-base.inc d5cfb7d52855969fe44f35731389ab20bbe67a0e
+++ conf/machine/include/motorola-ezx-base.inc 110c709cf7f23dd101d3f5d0637d361d93fa163a
@@ -22,6 +22,7 @@ ROOT_FLASH_SIZE = "24"
ROOT_FLASH_SIZE = "24"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
============================================================
--- conf/machine/omap1510inn.conf b16fd3d2cd68c0834a6426702d4caab37f6072ca
+++ conf/machine/omap1510inn.conf 8c17377309d00fdb256c779a5c747775d94253a8
@@ -12,6 +12,7 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
require conf/machine/include/tune-arm926ejs.inc
============================================================
--- conf/machine/omap1610h2.conf b16fd3d2cd68c0834a6426702d4caab37f6072ca
+++ conf/machine/omap1610h2.conf 8c17377309d00fdb256c779a5c747775d94253a8
@@ -12,6 +12,7 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
require conf/machine/include/tune-arm926ejs.inc
============================================================
--- conf/machine/omap1710h3.conf cb830228728963e9421a6a7521641fafa6d3d11e
+++ conf/machine/omap1710h3.conf a6b802ed2d322e8cb455acaa1c577b5e4ea18d8d
@@ -12,6 +12,7 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
require conf/machine/include/tune-arm926ejs.inc
============================================================
--- conf/machine/omap2420h4.conf 2854c32466fdb67a8e9782d56215753a34407d6c
+++ conf/machine/omap2420h4.conf 7d0d66886ecf2be6ecb4712295977d8e671093ef
@@ -9,6 +9,7 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
PREFERRED_VERSION_u-boot = "1.1.4"
SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
MACHINE_FEATURES = "kernel26"
============================================================
--- conf/machine/omap2430sdp.conf 9eef79d6524729bfa7de111047f0e9ab82373353
+++ conf/machine/omap2430sdp.conf cddcd4d01970087121700bf0cbdd356415ed34c7
@@ -9,6 +9,7 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
PREFERRED_VERSION_u-boot = "1.1.4"
SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
MACHINE_FEATURES = "kernel26"
============================================================
--- conf/machine/omap5912osk.conf e1b832be81c4577a78b18536406e78bab2ffa518
+++ conf/machine/omap5912osk.conf 0e95b09a1be375036ac3d8c2bde78501405ef4e3
@@ -11,6 +11,7 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
# PREFERRED_VERSION_u-boot = "1.1.6"
SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
ROOT_FLASH_SIZE = "29"
============================================================
--- conf/machine/shark.conf 8a744b9daf9db02c05297d317225e9f6d6cb012e
+++ conf/machine/shark.conf 8e4aeeb70530e6ab7d774480479debf77ecd4f85
@@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-z"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
EXTRA_IMAGEDEPENDS = ""
SERIAL_CONSOLE = "ttySA0 115200 vt100"
============================================================
--- conf/machine/triton.conf 85b820f8c11f485586f8ddf9fe57eda723faa37a
+++ conf/machine/triton.conf 564d2e8d50e5fc5bf8ad74d0fdbfb2a2535283ac
@@ -8,6 +8,7 @@ BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kern
BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad=0x1dc0000 --little-endian --eraseblock=0x40000 -n"
EXTRA_IMAGEDEPENDS = ""
SERIAL_CONSOLE = "38400 ttyS0"
============================================================
--- conf/machine/xxs1500.conf 5a7873168cad2f8e5d64454b4ee4685f6f3928d4
+++ conf/machine/xxs1500.conf e1fef73d3c073f86870109d0104a53e35515b27e
@@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
PREFERRED_PROVIDER_virtual/kernel = "linux-xxs1500"
+IMAGE_FSTYPES ?= "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad=0xa00000 --little-endian --eraseblock=0x20000 -n"
# does not gain any speed and just creates problems:
More information about the Openembedded-commits
mailing list