diff options
-rw-r--r-- | packages/alsa/alsa-oss_1.0.15.bb | 4 | ||||
-rw-r--r-- | packages/alsa/files/libio.patch | 8 | ||||
-rw-r--r-- | packages/ffmpeg/omapfbplay/fbplay-static.diff | 8 | ||||
-rw-r--r-- | packages/iscsi-target/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/iscsi-target/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/iscsi-target/files/ietd.conf | 17 | ||||
-rw-r--r-- | packages/iscsi-target/files/init | 36 | ||||
-rw-r--r-- | packages/iscsi-target/files/libs.patch | 11 | ||||
-rw-r--r-- | packages/iscsi-target/iscsi-target_0.4.16.bb | 43 | ||||
-rw-r--r-- | packages/iscsi-target/iscsi-target_svn.bb | 46 |
10 files changed, 164 insertions, 9 deletions
diff --git a/packages/alsa/alsa-oss_1.0.15.bb b/packages/alsa/alsa-oss_1.0.15.bb index 3cfe886d61..de840e73fe 100644 --- a/packages/alsa/alsa-oss_1.0.15.bb +++ b/packages/alsa/alsa-oss_1.0.15.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa OSS Compatibility Package" 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 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ inherit autotools +LEAD_SONAME = "libaoss.so.0" + do_configure_prepend () { touch NEWS README AUTHORS ChangeLog } diff --git a/packages/alsa/files/libio.patch b/packages/alsa/files/libio.patch index 83345a98d3..a053e4c604 100644 --- a/packages/alsa/files/libio.patch +++ b/packages/alsa/files/libio.patch @@ -1,7 +1,7 @@ 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/alsa/stdioemu.c 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 diff --git a/packages/ffmpeg/omapfbplay/fbplay-static.diff b/packages/ffmpeg/omapfbplay/fbplay-static.diff index 439fc6e6bb..f1f7015c2a 100644 --- a/packages/ffmpeg/omapfbplay/fbplay-static.diff +++ b/packages/ffmpeg/omapfbplay/fbplay-static.diff @@ -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 diff --git a/packages/iscsi-target/.mtn2git_empty b/packages/iscsi-target/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/iscsi-target/.mtn2git_empty diff --git a/packages/iscsi-target/files/.mtn2git_empty b/packages/iscsi-target/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/iscsi-target/files/.mtn2git_empty diff --git a/packages/iscsi-target/files/ietd.conf b/packages/iscsi-target/files/ietd.conf new file mode 100644 index 0000000000..0a100ac664 --- /dev/null +++ b/packages/iscsi-target/files/ietd.conf @@ -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 diff --git a/packages/iscsi-target/files/init b/packages/iscsi-target/files/init new file mode 100644 index 0000000000..d000adfe3c --- /dev/null +++ b/packages/iscsi-target/files/init @@ -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 diff --git a/packages/iscsi-target/files/libs.patch b/packages/iscsi-target/files/libs.patch new file mode 100644 index 0000000000..5108027cc4 --- /dev/null +++ b/packages/iscsi-target/files/libs.patch @@ -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) + diff --git a/packages/iscsi-target/iscsi-target_0.4.16.bb b/packages/iscsi-target/iscsi-target_0.4.16.bb new file mode 100644 index 0000000000..0e50bfe22b --- /dev/null +++ b/packages/iscsi-target/iscsi-target_0.4.16.bb @@ -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}/ +} diff --git a/packages/iscsi-target/iscsi-target_svn.bb b/packages/iscsi-target/iscsi-target_svn.bb new file mode 100644 index 0000000000..6671934c48 --- /dev/null +++ b/packages/iscsi-target/iscsi-target_svn.bb @@ -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}/ +} |