[oe-commits] org.oe.dev merge of '25f2070b6ff7c016172c18ddcbea754aeb7d159e'
koen commit
oe at amethyst.openembedded.net
Tue Jul 22 09:28:44 UTC 2008
merge of '25f2070b6ff7c016172c18ddcbea754aeb7d159e'
and '719f01c7bedccc565279537ecbfdbf8a61bd9a4b'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: e05bfb9fe41a1ce0682dada0e04dbd35ed6db6ad
ViewMTN: http://monotone.openembedded.org/revision/info/e05bfb9fe41a1ce0682dada0e04dbd35ed6db6ad
Files:
1
packages/mythtv/mythtv
packages/mythtv/mythtv/configure.patch
packages/mythtv/mythtv_0.21.bb
packages/mythtv/mythtv_svn.bb
packages/mythtv/mythtv.inc
packages/openmoko-projects/illume
packages/openmoko-projects/tangogps
packages/openmoko-projects/tangogps/global-config-h.patch
packages/openmoko-projects/tangogps_0.7.bb
packages/iscsi-target
packages/iscsi-target/files
packages/iscsi-target/files/ietd.conf
packages/iscsi-target/files/init
packages/iscsi-target/files/libs.patch
packages/iscsi-target/iscsi-target_0.4.16.bb
packages/iscsi-target/iscsi-target_svn.bb
packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
packages/alsa/alsa-oss_1.0.15.bb
packages/alsa/files/libio.patch
packages/ffmpeg/omapfbplay/fbplay-static.diff
packages/freesmartphone/frameworkd_git.bb
packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-08.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-09.patch
packages/linux/linux-omap2_git.bb
packages/openmoko-projects/illume_svn.bb
Diffs:
#
# mt diff -r25f2070b6ff7c016172c18ddcbea754aeb7d159e -re05bfb9fe41a1ce0682dada0e04dbd35ed6db6ad
#
#
#
# add_dir "packages/mythtv/mythtv"
#
# add_file "packages/mythtv/mythtv/configure.patch"
# content [7b3ee821f461fa62bac40df67d49b3192eedb52f]
#
# add_file "packages/mythtv/mythtv_0.21.bb"
# content [f29d4a96714e9f178504e26dc9f419a4b3f33db5]
#
# add_file "packages/mythtv/mythtv_svn.bb"
# content [3f0a3f18b7951f987c766de30111c8bf330990e1]
#
# patch "packages/mythtv/mythtv.inc"
# from [8018345c29d1b148d50191a1778ff38d9acf1886]
# to [51e744d181f35e5c30426c6ee9fbac41c2d48a05]
#
============================================================
--- packages/mythtv/mythtv/configure.patch 7b3ee821f461fa62bac40df67d49b3192eedb52f
+++ packages/mythtv/mythtv/configure.patch 7b3ee821f461fa62bac40df67d49b3192eedb52f
@@ -0,0 +1,47 @@
+--- /tmp/configure 2008-07-22 10:27:56.000000000 +0200
++++ mythtv/configure 2008-07-22 10:54:24.000000000 +0200
+@@ -1714,7 +1714,7 @@
+
+ has_library()
+ {
+- if test -f /etc/ld.so.conf ; then
++ if test -f /etc/ld.so.conf && disabled cross_compile ; then
+ LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
+ else
+ LIBPATHS=''
+@@ -1725,7 +1725,7 @@
+ LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
+
+ # recurse down just one level, should be enough in most cases
+- if test -f /etc/ld.so.conf ; then
++ if test -f /etc/ld.so.conf && disabled cross_compile ; then
+ INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"`
+ SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
+ for x in $SRCH ; do
+@@ -1734,7 +1734,7 @@
+ done
+ fi
+
+- LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
++ enabled cross_compile || LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
+
+ HAS_IT="no"
+ for LIBPATH in $LIBPATHS ; do
+@@ -2254,7 +2254,7 @@
+ EOF
+
+ if $cc $CFLAGS $ECFLAGS -o $TMPE $TMPC 2>/dev/null ; then
+-$TMPE && cpuclipspositive="yes"
++enabled cross_compile || $TMPE && cpuclipspositive="yes"
+ fi
+
+ # test negative wrap
+@@ -2269,7 +2269,7 @@
+ EOF
+
+ if $cc $CFLAGS $ECFLAGS -o $TMPE $TMPC 2>/dev/null ; then
+-$TMPE && cpuclipsnegative="yes"
++enabled cross_compile || $TMPE && cpuclipsnegative="yes"
+ fi
+
+ # test for distcc
============================================================
--- packages/mythtv/mythtv_0.21.bb f29d4a96714e9f178504e26dc9f419a4b3f33db5
+++ packages/mythtv/mythtv_0.21.bb f29d4a96714e9f178504e26dc9f419a4b3f33db5
@@ -0,0 +1,68 @@
+require mythtv.inc
+
+PR = "r0"
+
+#SRC_URI += "file://configure.patch;patch=1 \
+# file://libmyth-libdir.patch;patch=1"
+
+# Seen on the mythtv web page:
+# http://www.mythtv.org/mc/fix-mythweb-in-0.20.diff;patch=1
+
+QMAKE_PROFILES = "mythtv.pro"
+
+mythlibs = "mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
+PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
+
+FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode"
+FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf"
+RDEPENDS_mythtv-frontend = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats"
+FILES_mythtv-bin = "${bindir}"
+FILES_mythtv-filters = "${libdir}/mythtv/filters"
+FILES_mythtv-data = "${datadir}"
+RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
+ALLOW_EMPTY_${PN} = "1"
+
+PACKAGES_DYNAMIC = "mythtv-theme-*"
+
+python __anonymous () {
+ import bb
+
+ mythlibs = bb.data.getVar('mythlibs', d).split()
+ pv = bb.data.expand(bb.data.getVar("PV", d), d)
+
+ for m in mythlibs:
+ bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d)
+ bb.data.setVar("FILES_lib%s%s-dev" % (m, pv), "${libdir}/lib%s-%s.*" % (m, pv), d)
+
+ packages = " ".join(map(lambda x: "lib%s%s lib%s%s-dev" % (x, pv, x, pv), mythlibs) + bb.data.getVar("PACKAGES", d).split())
+
+ bb.data.setVar("PACKAGES", packages, d)
+}
+do_configure_prepend() {
+# it's not autotools anyway, so we call ./configure directly
+ find . -name "Makefile"|xargs rm -f
+ ./configure --prefix=/usr \
+ --mandir=/usr/man \
+ --cpu=${MYTHTV_ARCH} \
+ --disable-altivec \
+ --enable-v4l \
+ --enable-audio-oss \
+ --enable-proc-opt \
+ --enable-dvb \
+ --cross-compile \
+ --dvb-path=${STAGING_INCDIR}
+
+ sed 's!PREFIX =.*!PREFIX = ${prefix}!;/INCLUDEPATH += $${PREFIX}\/include/d' < settings.pro > settings.pro.new
+ mv settings.pro.new settings.pro
+}
+
+python populate_packages_prepend () {
+ new_packages = []
+
+ def the_hook(file, pkg, pattern, format, basename):
+ new_packages.append(pkg)
+
+ do_split_packages(d, root=bb.data.expand('${datadir}/mythtv/themes', d), file_regex='(.*)', output_pattern='mythtv-theme-%s', description='MythTV theme %s', allow_dirs=True, hook=the_hook, prepend=True)
+
+ bb.data.setVar("RDEPENDS_${PN}", "%s %s" % (bb.data.getVar("RDEPENDS_${PN}", d), " ".join(new_packages)), d)
+}
============================================================
--- packages/mythtv/mythtv_svn.bb 3f0a3f18b7951f987c766de30111c8bf330990e1
+++ packages/mythtv/mythtv_svn.bb 3f0a3f18b7951f987c766de30111c8bf330990e1
@@ -0,0 +1,74 @@
+require mythtv.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.21+svnr${SRCREV}"
+PR = "r0"
+
+SRCREV = "17880"
+SRC_URI = "svn://svn.mythtv.org/svn/trunk;module=mythtv;proto=http"
+
+SRC_URI += "file://configure.patch;patch=1 \
+ "
+
+S = "${WORKDIR}/mythtv"
+
+QMAKE_PROFILES = "mythtv.pro"
+
+mythlibs = "mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
+PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
+
+FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode"
+FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf"
+RDEPENDS_mythtv-frontend = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats"
+FILES_mythtv-bin = "${bindir}"
+FILES_mythtv-filters = "${libdir}/mythtv/filters"
+FILES_mythtv-data = "${datadir}"
+RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
+ALLOW_EMPTY_${PN} = "1"
+
+PACKAGES_DYNAMIC = "mythtv-theme-*"
+
+python __anonymous () {
+ import bb
+
+ mythlibs = bb.data.getVar('mythlibs', d).split()
+ pv = bb.data.expand(bb.data.getVar("PV", d), d)
+
+ for m in mythlibs:
+ bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d)
+ bb.data.setVar("FILES_lib%s%s-dev" % (m, pv), "${libdir}/lib%s-%s.*" % (m, pv), d)
+
+ packages = " ".join(map(lambda x: "lib%s%s lib%s%s-dev" % (x, pv, x, pv), mythlibs) + bb.data.getVar("PACKAGES", d).split())
+
+ bb.data.setVar("PACKAGES", packages, d)
+}
+do_configure_prepend() {
+# it's not autotools anyway, so we call ./configure directly
+ find . -name "Makefile"|xargs rm -f
+ ./configure --prefix=/usr \
+ --mandir=/usr/man \
+ --cpu=${MYTHTV_ARCH} \
+ --disable-altivec \
+ --enable-v4l \
+ --enable-audio-oss \
+ --enable-proc-opt \
+ --enable-dvb \
+ --enable-libmp3lame \
+ --cross-compile \
+ --dvb-path=${STAGING_INCDIR}
+
+ sed 's!PREFIX =.*!PREFIX = ${prefix}!;/INCLUDEPATH += $${PREFIX}\/include/d' < settings.pro > settings.pro.new
+ mv settings.pro.new settings.pro
+}
+
+python populate_packages_prepend () {
+ new_packages = []
+
+ def the_hook(file, pkg, pattern, format, basename):
+ new_packages.append(pkg)
+
+ do_split_packages(d, root=bb.data.expand('${datadir}/mythtv/themes', d), file_regex='(.*)', output_pattern='mythtv-theme-%s', description='MythTV theme %s', allow_dirs=True, hook=the_hook, prepend=True)
+
+ bb.data.setVar("RDEPENDS_${PN}", "%s %s" % (bb.data.getVar("RDEPENDS_${PN}", d), " ".join(new_packages)), d)
+}
============================================================
--- packages/mythtv/mythtv.inc 8018345c29d1b148d50191a1778ff38d9acf1886
+++ packages/mythtv/mythtv.inc 51e744d181f35e5c30426c6ee9fbac41c2d48a05
@@ -2,15 +2,13 @@ SECTION = "x11/multimedia"
HOMEPAGE = "http://www.mythtv.org"
LICENSE = "GPL"
SECTION = "x11/multimedia"
-DEPENDS = "libxinerama lame libxv libxxf86vm libxvmc lirc qt-x11-free"
+DEPENDS = "libxinerama libxv libxxf86vm libxvmc lirc qt-x11-free"
RDEPENDS_${PN} = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats"
SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
-inherit qmake qt3x11
+inherit qmake2 qt3x11
-# there is a -march=586 somewhere in the source tree
-COMPATIBLE_HOST = 'i.86.*-linux'
QMAKE_PROFILES = "mythtv.pro"
@@ -22,7 +20,7 @@ def mythtv_arch(d):
elif arch == "x86_64":
arch = "x86"
elif arch == "arm":
- arch = "armv4l"
+ arch = "${BASE_PACKAGE_ARCH}"
return arch
MYTHTV_ARCH := "${@mythtv_arch(d)}"
#
# mt diff -r719f01c7bedccc565279537ecbfdbf8a61bd9a4b -re05bfb9fe41a1ce0682dada0e04dbd35ed6db6ad
#
#
#
# delete "packages/openmoko-projects/illume"
#
# delete "packages/openmoko-projects/tangogps"
#
# delete "packages/openmoko-projects/tangogps/global-config-h.patch"
#
# delete "packages/openmoko-projects/tangogps_0.7.bb"
#
# add_dir "packages/iscsi-target"
#
# add_dir "packages/iscsi-target/files"
#
# add_file "packages/iscsi-target/files/ietd.conf"
# content [482017042fde4f6bbf3ad43f1e451c0d27a03f79]
#
# add_file "packages/iscsi-target/files/init"
# content [a14fa377d1df7ff8a2872ecb69723ba820253a3e]
#
# add_file "packages/iscsi-target/files/libs.patch"
# content [4aa33e1259bd175ff5a59ebd5190c7d1d09f2afd]
#
# add_file "packages/iscsi-target/iscsi-target_0.4.16.bb"
# content [4fee2645dd9baa27c488e53b1dd4867b4f6390bb]
#
# add_file "packages/iscsi-target/iscsi-target_svn.bb"
# content [d5fef34c3f39efd3c8fac839013fd4f6d7e70afa]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff"
# content [05766144d6796d91cb3a002e2a3c75ce6a1b1d7d]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff"
# content [016a4086941bdeb321b7ce106b8f205a88b4e6af]
#
# patch "packages/alsa/alsa-oss_1.0.15.bb"
# from [aae010357d2d0209e7df3dcae5dbf441fc4029be]
# to [131b85f2ac85c3b64ae4f066cd08b28a5881c06e]
#
# patch "packages/alsa/files/libio.patch"
# from [30802aa19da7dcd1632c7665450df841a03f3eda]
# to [b7e11939325fbc71a057929e20052a4c75b56195]
#
# patch "packages/ffmpeg/omapfbplay/fbplay-static.diff"
# from [39aa924c731660c6f60aa4bee0e0f16bbba80123]
# to [bc801bc032ee70aebeee097eaace65a5470f24cf]
#
# patch "packages/freesmartphone/frameworkd_git.bb"
# from [15a3b887f127384bdbff89c3ca2e0a3b4441274f]
# to [d7bc43957414c34d3f5aac03b45f32b0b23d6d86]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch"
# from [da576d5a0b54b0da52d31f95bc08b102a95ca3b2]
# to [6a99b66e76c84c87ab1e45c0985c879d94ac4438]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch"
# from [72af4f60c26f56679e95fc24ef3b7f5acabed0cf]
# to [e3286f230c7de114a1dc14e192a3d5fb80b022b3]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch"
# from [6284906123018747a79c7343545a7dd996b0ec39]
# to [34273fa2d5c071e18ac2f1197909967578e2126b]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch"
# from [656d89877fe629bfe6899289054c523bb7eb2e91]
# to [47336c0b4a7118b621d9068d065d0201488d3a04]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch"
# from [a89f99c1ea6b938b377f1ea97035e448fcbdb3b1]
# to [9d7d91c5387f06371065d98fc3632c2efe185142]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch"
# from [01cb8404a54532d68de3d2db4af14c4da5e5a109]
# to [e8d46bcc68305ac90e83b4f46d23d32adcdab421]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch"
# from [a280d8f500e253c8816899f5b34ce803e200faee]
# to [895c76bf663506910934a26ad8c6d73b5705ea3a]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-08.patch"
# from [d2d7e987a7124b50a4c43b41bbbb6b26c7e49e0b]
# to [efca04cf74065a39ac2b695ab2934b6a9740530f]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-09.patch"
# from [851122d7278bafa9d271aa4d3fdb81f61afeae01]
# to [fd71a971dae7541610ffbe920df2edbf747ee0b5]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [824775d9f3efae0925325c500da99a9741527658]
# to [43ac6aa586b248d87d01286575371b1800bb3d2a]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [41cb95294e1a667cc99602223ca04eb2f2fe895a]
# to [a832f6689fb7f2bfda076fac8149931f17a55a87]
#
============================================================
--- packages/iscsi-target/files/ietd.conf 482017042fde4f6bbf3ad43f1e451c0d27a03f79
+++ packages/iscsi-target/files/ietd.conf 482017042fde4f6bbf3ad43f1e451c0d27a03f79
@@ -0,0 +1,17 @@
+Target iqn.2007-01.org.foonas:iSCSI.sda.target1
+ Lun 0 Path=/dev/sda,Type=blockio
+ MaxConnections 1
+ HeaderDigest None
+ DataDigest None
+ InitialR2T Yes
+ ImmediateData No
+ MaxRecvDataSegmentLength 8192
+ MaxXmitDataSegmentLength 8192
+ MaxBurstLength 262144
+ FirstBurstLength 65536
+ DefaultTime2Wait 2
+ DefaultTime2Retain 20
+ MaxOutstandingR2T 8
+ DataPDUInOrder Yes
+ DataSequenceInOrder Yes
+ ErrorRecoveryLevel 0
============================================================
--- packages/iscsi-target/files/init a14fa377d1df7ff8a2872ecb69723ba820253a3e
+++ packages/iscsi-target/files/init a14fa377d1df7ff8a2872ecb69723ba820253a3e
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Start the iSCSI Enterprise Target.
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+start_server()
+{
+ modprobe -q crc32c
+ modprobe iscsi_trgt
+ start-stop-daemon --start --quiet --pidfile /var/run/iscsi_trgt.pid --exec /sbin/ietd
+}
+
+stop_server()
+{
+ ietadm --op delete
+ start-stop-daemon --stop --quiet --pidfile /var/run/iscsi_trgt.pid --exec /sbin/ietd
+ sleep 1
+ modprobe -r iscsi_trgt
+}
+
+case "$1" in
+ start)
+ start_server
+ ;;
+ stop)
+ stop_server
+ ;;
+ *)
+ echo "Usage: {start|stop}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/iscsi-target/files/libs.patch 4aa33e1259bd175ff5a59ebd5190c7d1d09f2afd
+++ packages/iscsi-target/files/libs.patch 4aa33e1259bd175ff5a59ebd5190c7d1d09f2afd
@@ -0,0 +1,11 @@
+diff -urN iscsitarget-0.4.15/usr/Makefile iscsitarget-0.4.15.new/usr/Makefile
+--- iscsitarget-0.4.15/usr/Makefile 2006-07-03 14:09:30.000000000 +0000
++++ iscsitarget-0.4.15.new/usr/Makefile 2007-07-29 23:16:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g -I../include
+ PROGRAMS = ietd ietadm
+-LIBS = -lcrypto
++LIBS = -lcrypto $(LDFLAGS)
+
+ all: $(PROGRAMS)
+
============================================================
--- packages/iscsi-target/iscsi-target_0.4.16.bb 4fee2645dd9baa27c488e53b1dd4867b4f6390bb
+++ packages/iscsi-target/iscsi-target_0.4.16.bb 4fee2645dd9baa27c488e53b1dd4867b4f6390bb
@@ -0,0 +1,43 @@
+
+DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux"
+HOMEPAGE = "http://iscsitarget.sourceforge.net/"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \
+ file://libs.patch;patch=1 \
+ file://init \
+ "
+
+DEPENDS = " openssl"
+S = "${WORKDIR}/iscsitarget-${PV}"
+
+inherit module
+
+do_configure() {
+}
+
+CFLAGS = "-isystem${STAGING_KERNEL_DIR}/include -I${STAGING_INCDIR} -L${STAGING_LIBDIR}"
+LDFLAGS = "-L${STAGING_LIBDIR}"
+FILES_${PN} += " ${base_sbindir}"
+
+do_compile() {
+ oe_runmake KSRC=${STAGING_KERNEL_DIR} CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'
+}
+
+do_install() {
+ # Module
+ install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi
+ install -m 0644 kernel/iscsi_trgt.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi/iscsi_trgt.ko
+
+ # Userspace utilities
+ install -d ${D}${base_sbindir}
+ install -m 0755 usr/ietd ${D}${base_sbindir}/ietd
+ install -m 0755 usr/ietadm ${D}${base_sbindir}/ietadm
+
+ # Config files, init scripts
+ mkdir -p ${D}${sysconfdir}/init.d
+ install -m 0755 ../init ${D}${sysconfdir}/init.d/iscsi-target
+ install -m 0644 etc/initiators.allow ${D}${sysconfdir}/
+ install -m 0644 etc/initiators.deny ${D}${sysconfdir}/
+}
============================================================
--- packages/iscsi-target/iscsi-target_svn.bb d5fef34c3f39efd3c8fac839013fd4f6d7e70afa
+++ packages/iscsi-target/iscsi-target_svn.bb d5fef34c3f39efd3c8fac839013fd4f6d7e70afa
@@ -0,0 +1,46 @@
+DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux"
+HOMEPAGE = "http://iscsitarget.sourceforge.net/"
+LICENSE = "GPL"
+PR = "r12"
+
+SRC_URI = "svn://svn.berlios.de/iscsitarget/;module=trunk;rev=HEAD \
+ file://libs.patch;patch=1 \
+ file://init \
+ file://ietd.conf \
+ "
+
+DEPENDS = " openssl"
+RDEPENDS = "kernel-module-crc32c kernel-module-libcrc32c"
+
+S = "${WORKDIR}/trunk"
+
+inherit module
+
+do_configure() {
+}
+
+CFLAGS = "-isystem${STAGING_KERNEL_DIR}/include -I${STAGING_INCDIR} -L${STAGING_LIBDIR}"
+LDFLAGS = "-L${STAGING_LIBDIR}"
+FILES_${PN} += " ${base_sbindir}"
+
+do_compile() {
+ oe_runmake KSRC=${STAGING_KERNEL_DIR} CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'
+}
+
+do_install() {
+ # Module
+ install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi
+ install -m 0644 kernel/iscsi_trgt.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi/iscsi_trgt.ko
+
+ # Userspace utilities
+ install -d ${D}${base_sbindir}
+ install -m 0755 usr/ietd ${D}${base_sbindir}/ietd
+ install -m 0755 usr/ietadm ${D}${base_sbindir}/ietadm
+
+ # Config files, init scripts
+ mkdir -p ${D}${sysconfdir}/init.d
+ install -m 0755 ../init ${D}${sysconfdir}/init.d/iscsi-target
+ install -m 0644 ${WORKDIR}/ietd.conf ${D}${sysconfdir}/
+ install -m 0644 etc/initiators.allow ${D}${sysconfdir}/
+ install -m 0644 etc/initiators.deny ${D}${sysconfdir}/
+}
============================================================
--- packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff 05766144d6796d91cb3a002e2a3c75ce6a1b1d7d
+++ packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff 05766144d6796d91cb3a002e2a3c75ce6a1b1d7d
@@ -0,0 +1,25 @@
+From: Mans Rullgard <mans at mansr.com>
+Date: Tue, 22 Jul 2008 00:31:11 +0000 (+0100)
+Subject: ARM: OMAP: make dpll4_m4_ck programmable with clk_set_rate()
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=edc6cd29284f64f524dd410fdc5e6133bc177a8f
+
+ARM: OMAP: make dpll4_m4_ck programmable with clk_set_rate()
+
+Filling the set_rate and round_rate fields of dpll4_m4_ck makes
+this clock programmable through clk_set_rate(). This is needed
+to give omapfb control over the dss1_alwon_fck rate.
+---
+
+diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
+index 161da12..876eb13 100644
+--- a/arch/arm/mach-omap2/clock34xx.h
++++ b/arch/arm/mach-omap2/clock34xx.h
+@@ -815,6 +815,8 @@ static struct clk dpll4_m4_ck = {
+ .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES |
+ PARENT_CONTROLS_CLOCK,
+ .recalc = &omap2_clksel_recalc,
++ .set_rate = &omap2_clksel_set_rate,
++ .round_rate = &omap2_clksel_round_rate,
+ };
+
+ /* The PWRDN bit is apparently only available on 3430ES2 and above */
============================================================
--- packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff 016a4086941bdeb321b7ce106b8f205a88b4e6af
+++ packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff 016a4086941bdeb321b7ce106b8f205a88b4e6af
@@ -0,0 +1,62 @@
+From: Mans Rullgard <mans at mansr.com>
+Date: Tue, 22 Jul 2008 00:58:18 +0000 (+0100)
+Subject: ARM: OMAP: add clk_get_parent() for OMAP2/3
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=76a35ce79194b60e3697378e726e1e510c9349d1
+
+ARM: OMAP: add clk_get_parent() for OMAP2/3
+
+Signed-off-by: Mans Rullgard <mans at mansr.com>
+---
+
+diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
+index 577be44..28aec36 100644
+--- a/arch/arm/mach-omap2/clock.c
++++ b/arch/arm/mach-omap2/clock.c
+@@ -824,6 +824,11 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
+ return 0;
+ }
+
++struct clk *omap2_clk_get_parent(struct clk *clk)
++{
++ return clk->parent;
++}
++
+ /* DPLL rate rounding code */
+
+ /**
+diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
+index 49245f7..4aa69d5 100644
+--- a/arch/arm/mach-omap2/clock.h
++++ b/arch/arm/mach-omap2/clock.h
+@@ -29,6 +29,7 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate);
+ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent);
+ int omap2_dpll_set_rate_tolerance(struct clk *clk, unsigned int tolerance);
+ long omap2_dpll_round_rate(struct clk *clk, unsigned long target_rate);
++struct clk *omap2_clk_get_parent(struct clk *clk);
+
+ #ifdef CONFIG_OMAP_RESET_CLOCKS
+ void omap2_clk_disable_unused(struct clk *clk);
+diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
+index 54cc6e1..ed7af21 100644
+--- a/arch/arm/mach-omap2/clock24xx.c
++++ b/arch/arm/mach-omap2/clock24xx.c
+@@ -422,6 +422,7 @@ static struct clk_functions omap2_clk_functions = {
+ .clk_round_rate = omap2_clk_round_rate,
+ .clk_set_rate = omap2_clk_set_rate,
+ .clk_set_parent = omap2_clk_set_parent,
++ .clk_get_parent = omap2_clk_get_parent,
+ .clk_disable_unused = omap2_clk_disable_unused,
+ #ifdef CONFIG_CPU_FREQ
+ .clk_init_cpufreq_table = omap2_clk_init_cpufreq_table,
+diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
+index 04dedec..08c8c46 100644
+--- a/arch/arm/mach-omap2/clock34xx.c
++++ b/arch/arm/mach-omap2/clock34xx.c
+@@ -541,6 +541,7 @@ static struct clk_functions omap2_clk_functions = {
+ .clk_round_rate = omap2_clk_round_rate,
+ .clk_set_rate = omap2_clk_set_rate,
+ .clk_set_parent = omap2_clk_set_parent,
++ .clk_get_parent = omap2_clk_get_parent,
+ .clk_disable_unused = omap2_clk_disable_unused,
+ };
+
============================================================
--- packages/alsa/alsa-oss_1.0.15.bb aae010357d2d0209e7df3dcae5dbf441fc4029be
+++ packages/alsa/alsa-oss_1.0.15.bb 131b85f2ac85c3b64ae4f066cd08b28a5881c06e
@@ -2,7 +2,7 @@ DEPENDS = "alsa-lib"
SECTION = "libs/multimedia"
LICENSE = "GPL"
DEPENDS = "alsa-lib"
-PR = "1"
+PR = "r2"
SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
file://libio.patch;patch=1 \
@@ -10,6 +10,8 @@ inherit autotools
inherit autotools
+LEAD_SONAME = "libaoss.so.0"
+
do_configure_prepend () {
touch NEWS README AUTHORS ChangeLog
}
============================================================
--- packages/alsa/files/libio.patch 30802aa19da7dcd1632c7665450df841a03f3eda
+++ packages/alsa/files/libio.patch b7e11939325fbc71a057929e20052a4c75b56195
@@ -1,7 +1,7 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c
Index: alsa-oss-1.0.15/alsa/stdioemu.c
===================================================================
--- alsa-oss-1.0.15.orig/alsa/stdioemu.c 2007-10-15 10:50:40.000000000 +0200
-+++ alsa-oss-1.0.15/alsa/stdioemu.c 2008-07-20 22:29:46.767474560 +0200
++++ alsa-oss-1.0.15/alsa/stdioemu.c 2008-07-21 22:17:06.303161438 +0200
@@ -37,7 +37,9 @@
#endif
@@ -18,8 +18,8 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c
result = fopencookie (fdc,"w", fns);
+#ifdef HAVE_FILENO
result->_fileno = fdc->fd; /* ugly patchy slimy kludgy hack */
-+else
-+ result->_filedes = fdc->fd;
++#else
++ result->__filedes = fdc->fd;
+#endif
}
return result;
@@ -27,7 +27,7 @@ Index: alsa-oss-1.0.15/configure.in
Index: alsa-oss-1.0.15/configure.in
===================================================================
--- alsa-oss-1.0.15.orig/configure.in 2007-10-15 10:50:40.000000000 +0200
-+++ alsa-oss-1.0.15/configure.in 2008-07-20 22:49:45.455837502 +0200
++++ alsa-oss-1.0.15/configure.in 2008-07-21 22:16:11.719837298 +0200
@@ -33,6 +33,12 @@
LIBS="$OLD_LIBS"
fi
============================================================
--- packages/ffmpeg/omapfbplay/fbplay-static.diff 39aa924c731660c6f60aa4bee0e0f16bbba80123
+++ packages/ffmpeg/omapfbplay/fbplay-static.diff bc801bc032ee70aebeee097eaace65a5470f24cf
@@ -1,10 +1,10 @@
---- /tmp/Makefile 2008-07-10 12:59:00.000000000 +0200
-+++ git/Makefile 2008-07-10 12:57:38.723198000 +0200
+--- /tmp/Makefile 2008-07-21 22:08:58.000000000 +0200
++++ git/Makefile 2008-07-21 22:10:08.023198000 +0200
@@ -5,6 +5,6 @@
CFLAGS = -O3 -Wall -fomit-frame-pointer -mcpu=cortex-a8 -mfpu=neon \
-I$(LINUX)/include -I$(FFMPEG)
LDFLAGS = -L$(FFMPEG)/libavcodec -L$(FFMPEG)/libavformat -L$(FFMPEG)/libavutil
--LDLIBS = -lavformat -lavcodec -lavutil -lm -lz -lpthread
-+LDLIBS = -lavformat -lavcodec -lavutil -lz -ldl -lbz2 -lfaac -lgsm -lmp3lame -lm -lpthread
+-LDLIBS = -lavformat -lavcodec -lavutil -lm -lz -lpthread -lrt
++LDLIBS = -lavformat -lavcodec -lavutil -lz -ldl -lbz2 -lfaac -lgsm -lmp3lame -lm -lpthread -lrt
all: omapfbplay
============================================================
--- packages/freesmartphone/frameworkd_git.bb 15a3b887f127384bdbff89c3ca2e0a3b4441274f
+++ packages/freesmartphone/frameworkd_git.bb d7bc43957414c34d3f5aac03b45f32b0b23d6d86
@@ -5,%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list