[oe-commits] org.oe.dev merge of '3e3e5c3190f2cb2e6fbed584c5049e73df49c04e'
mickeyl commit
oe at amethyst.openembedded.net
Mon Jul 21 22:58:58 UTC 2008
merge of '3e3e5c3190f2cb2e6fbed584c5049e73df49c04e'
and 'b7c57ac566ade9b73a2dc88a9400d0667d979c84'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7235543953cf5b68de17cb866a0f3ba5dc88ab8e
ViewMTN: http://monotone.openembedded.org/revision/info/7235543953cf5b68de17cb866a0f3ba5dc88ab8e
Files:
1
packages/openmoko-projects/illume
packages/openmoko-projects/tangogps
packages/openmoko-projects/tangogps/global-config-h.patch
packages/openmoko-projects/tangogps_0.7.bb
packages/freesmartphone/frameworkd_git.bb
packages/openmoko-projects/illume_svn.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/alsa/alsa-oss_1.0.15.bb
packages/alsa/files/libio.patch
packages/ffmpeg/omapfbplay/fbplay-static.diff
Diffs:
#
# mt diff -r3e3e5c3190f2cb2e6fbed584c5049e73df49c04e -r7235543953cf5b68de17cb866a0f3ba5dc88ab8e
#
#
#
# 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"
#
# patch "packages/freesmartphone/frameworkd_git.bb"
# from [15a3b887f127384bdbff89c3ca2e0a3b4441274f]
# to [d7bc43957414c34d3f5aac03b45f32b0b23d6d86]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [41cb95294e1a667cc99602223ca04eb2f2fe895a]
# to [a832f6689fb7f2bfda076fac8149931f17a55a87]
#
============================================================
--- packages/freesmartphone/frameworkd_git.bb 15a3b887f127384bdbff89c3ca2e0a3b4441274f
+++ packages/freesmartphone/frameworkd_git.bb d7bc43957414c34d3f5aac03b45f32b0b23d6d86
@@ -5,7 +5,7 @@ PV = "0.8.1+gitr${SRCREV}"
DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPL"
PV = "0.8.1+gitr${SRCREV}"
-PR = "r9"
+PR = "r10"
inherit distutils update-rc.d
@@ -34,7 +34,16 @@ RDEPENDS_${PN} += "\
python-pyyaml \
python-shell \
python-syslog \
+ \
+ ${PN}-config \
"
-FILES_${PN} += "${sysconfdir} ${datadir}"
+
+PACKAGES =+ "${PN}-config"
+
+PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}"
+FILES_${PN}-config = "${sysconfdir}"
+
+PACKAGE_ARCH_${PN} = "${BASE_PACKAGE_ARCH}"
+FILES_${PN} += "${datadir}"
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/framework/subsystems/*/.debug"
============================================================
--- packages/openmoko-projects/illume_svn.bb 41cb95294e1a667cc99602223ca04eb2f2fe895a
+++ packages/openmoko-projects/illume_svn.bb a832f6689fb7f2bfda076fac8149931f17a55a87
@@ -1,25 +1,50 @@
-DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
-HOMEPAGE = "http://illume.projects.openmoko.org/"
+DESCRIPTION = "Illume - A mobile UI module for the Enlightenment Window Manager"
+HOMEPAGE = "http://illume.projects.openmoko.org"
+AUTHOR = "Rasterman"
LICENSE = "MIT/BSD"
DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
-RRECOMMENDS = "wamerican"
PV = "0.0+svnr${SRCREV}"
-PR = "r6"
+PR = "r7"
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https"
-
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http"
S = "${WORKDIR}/${PN}"
inherit autotools pkgconfig
-EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
- --x-libraries=${STAGING_LIBDIR} \
- --enable-simple-x11 \
- --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+EXTRA_OECONF = "\
+ --x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-simple-x11 \
+ --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+"
-FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj \
- ${libdir}/enlightenment/modules/*/*.desktop \
- ${libdir}/enlightenment/modules/*/*/* \
- ${datadir}/enlightenment/data/config/*/* \
- ${datadir}/${PN} "
+RRECOMMENDS_${PN} = "\
+ wamerican \
+ ${PN}-config \
+ ${PN}-dicts-default \
+ ${PN}-keyboards-default \
+ ${PN}-keyboards-numbers \
+"
+
+PACKAGES =+ "\
+ ${PN}-config \
+ ${PN}-dicts-default \
+ ${PN}-keyboards-default \
+ ${PN}-keyboards-numbers \
+"
+PACKAGE_ARCH_${PN}-config = "all"
+PACKAGE_ARCH_${PN}-dicts-default = "all"
+PACKAGE_ARCH_${PN}-keyboards-default = "all"
+PACKAGE_ARCH_${PN}-keyboards-numbers = "all"
+
+FILES_${PN}-config = "${datadir}/enlightenment/data/config/*/* ${datadir}/illume"
+FILES_${PN}-dicts-default = "${libdir}/enlightenment/modules/illume/dicts/Default.dic"
+FILES_${PN}-keyboards-default = "${libdir}/enlightenment/modules/illume/keyboards/Default.kbd"
+FILES_${PN}-keyboards-numbers = "${libdir}/enlightenment/modules/illume/keyboards/Numbers.kbd"
+
+FILES_${PN} = "\
+ ${libdir}/enlightenment/modules/*/*.edj \
+ ${libdir}/enlightenment/modules/*/*.desktop \
+ ${libdir}/enlightenment/modules/*/*/* \
+"
FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
#
# mt diff -rb7c57ac566ade9b73a2dc88a9400d0667d979c84 -r7235543953cf5b68de17cb866a0f3ba5dc88ab8e
#
#
#
# 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]
#
# 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]
#
============================================================
--- 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/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
More information about the Openembedded-commits
mailing list