From dc9fb3c02f6a32615a197863173df5edf9c88342 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 25 Aug 2007 15:57:39 +0000 Subject: add liburiparser --- packages/liburiparser/.mtn2git_empty | 0 packages/liburiparser/files/.mtn2git_empty | 0 packages/liburiparser/files/autofoo.patch | 21 +++++++++++++++++++++ packages/liburiparser/liburiparser_0.5.1.bb | 15 +++++++++++++++ 4 files changed, 36 insertions(+) create mode 100644 packages/liburiparser/.mtn2git_empty create mode 100644 packages/liburiparser/files/.mtn2git_empty create mode 100644 packages/liburiparser/files/autofoo.patch create mode 100644 packages/liburiparser/liburiparser_0.5.1.bb diff --git a/packages/liburiparser/.mtn2git_empty b/packages/liburiparser/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/liburiparser/files/.mtn2git_empty b/packages/liburiparser/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/liburiparser/files/autofoo.patch b/packages/liburiparser/files/autofoo.patch new file mode 100644 index 0000000000..548867c7e7 --- /dev/null +++ b/packages/liburiparser/files/autofoo.patch @@ -0,0 +1,21 @@ +Index: uriparser-0.5.1/configure.in +=================================================================== +--- uriparser-0.5.1.orig/configure.in 2007-08-25 15:32:52.000000000 +0000 ++++ uriparser-0.5.1/configure.in 2007-08-25 15:34:56.000000000 +0000 +@@ -2,7 +2,7 @@ + AC_INIT([uriparser], [0.5.1]) + AM_INIT_AUTOMAKE([1.9 foreign]) + AM_CONFIG_HEADER(test/CppTest/config.h) +- ++AM_PROG_CC_C_O + + AC_PROG_CC + AC_PROG_CXX +@@ -10,7 +10,6 @@ + AC_HEADER_STDC + + +- + # URI_SIZEDOWN + AC_ARG_ENABLE(sizedown, [ + Extra options: diff --git a/packages/liburiparser/liburiparser_0.5.1.bb b/packages/liburiparser/liburiparser_0.5.1.bb new file mode 100644 index 0000000000..60c88cba23 --- /dev/null +++ b/packages/liburiparser/liburiparser_0.5.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "uriparser is a strictly RFC 3986 compliant URI parsing library." +HOMEPAGE = "http://uriparser.sf.net" +SECTION = "libs" +LICENSE = "BSD" + +SRC_URI = "${SOURCEFORGE_MIRROR}/uriparser/uriparser-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/uriparser-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + -- cgit v1.2.3 From 164da15153630ef62b2fd2a46fa7a86a9fa1bb83 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 25 Aug 2007 15:57:58 +0000 Subject: add libspiff --- packages/libspiff/.mtn2git_empty | 0 packages/libspiff/files/.mtn2git_empty | 0 packages/libspiff/files/autofoo.patch | 31 +++++++++++++++++++++++++++++++ packages/libspiff/libspiff_0.7.2.bb | 19 +++++++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 packages/libspiff/.mtn2git_empty create mode 100644 packages/libspiff/files/.mtn2git_empty create mode 100644 packages/libspiff/files/autofoo.patch create mode 100644 packages/libspiff/libspiff_0.7.2.bb diff --git a/packages/libspiff/.mtn2git_empty b/packages/libspiff/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libspiff/files/.mtn2git_empty b/packages/libspiff/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libspiff/files/autofoo.patch b/packages/libspiff/files/autofoo.patch new file mode 100644 index 0000000000..2fcd7ebb47 --- /dev/null +++ b/packages/libspiff/files/autofoo.patch @@ -0,0 +1,31 @@ +Index: libspiff-0.7.2/configure.in +=================================================================== +--- libspiff-0.7.2.orig/configure.in 2007-08-25 15:47:29.000000000 +0000 ++++ libspiff-0.7.2/configure.in 2007-08-25 15:47:48.000000000 +0000 +@@ -78,26 +78,6 @@ + LDFLAGS="-L${withval} ${LDFLAGS}" + ], []) + +- +- +-# Local headers must come very first. Otherwise we +-# risk including headers of an already installed +-# libSpiff version if its path is in CPPFLAGS +-CPPFLAGS="-Iinclude ${CPPFLAGS}" +- +- +- +-# Append $prefix as a fallback at the very end +-if test "x${prefix}" != "xNONE"; then +- WORKING_PREFIX=${prefix} +-else +- WORKING_PREFIX=${ac_default_prefix} +-fi +-LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib" +-CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include" +- +- +- + # Check presence + EXPAT_MISSING="Please install libexpat 1.95.8 or later. + On Ubuntu enter 'sudo apt-get install libexpat-dev'." diff --git a/packages/libspiff/libspiff_0.7.2.bb b/packages/libspiff/libspiff_0.7.2.bb new file mode 100644 index 0000000000..365c1e99bf --- /dev/null +++ b/packages/libspiff/libspiff_0.7.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "libSpiff brings XSPF playlist reading and writing support to your C++ application." +HOMEPAGE = "http://libspiff.sf.net" +SECTION = "libs" +LICENSE = "BSD" +DEPENDS = "expat liburiparser" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libspiff/libspiff-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libspiff-${PV}" + +inherit autotools pkgconfig lib_package + +EXTRA_OECONF = "\ + --with-expat=${STAGING_LIBDIR}/.. \ + --with-uriparser=${STAGING_LIBDIR}/.. \ +" + +CPPFLAGS += "-I${S}/include" + -- cgit v1.2.3 From 6acdfe530e1d1457d2d2642334217a694e33c797 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 25 Aug 2007 16:12:00 +0000 Subject: libspiff: add do-stage() --- packages/libspiff/libspiff_0.7.2.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/libspiff/libspiff_0.7.2.bb b/packages/libspiff/libspiff_0.7.2.bb index 365c1e99bf..06be4b3aa4 100644 --- a/packages/libspiff/libspiff_0.7.2.bb +++ b/packages/libspiff/libspiff_0.7.2.bb @@ -17,3 +17,7 @@ EXTRA_OECONF = "\ CPPFLAGS += "-I${S}/include" +do_stage() { + autotools_stage_all +} + -- cgit v1.2.3 From 80971f38d6137c1ba7d8b8b25170bf8d5bea0bde Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 25 Aug 2007 16:18:44 +0000 Subject: add openmoko-mediaplayer2 --- .../openmoko2/openmoko-mediaplayer2/.mtn2git_empty | 0 .../openmoko2/openmoko-mediaplayer2/autofoo.patch | 38 ++++++++++++++++++++++ .../openmoko-mediaplayer2/missing-images.patch | 13 ++++++++ packages/openmoko2/openmoko-mediaplayer2_svn.bb | 12 +++++++ 4 files changed, 63 insertions(+) create mode 100644 packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty create mode 100644 packages/openmoko2/openmoko-mediaplayer2/autofoo.patch create mode 100644 packages/openmoko2/openmoko-mediaplayer2/missing-images.patch create mode 100644 packages/openmoko2/openmoko-mediaplayer2_svn.bb diff --git a/packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty b/packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko2/openmoko-mediaplayer2/autofoo.patch b/packages/openmoko2/openmoko-mediaplayer2/autofoo.patch new file mode 100644 index 0000000000..5db5707798 --- /dev/null +++ b/packages/openmoko2/openmoko-mediaplayer2/autofoo.patch @@ -0,0 +1,38 @@ +Index: openmoko-mediaplayer2/configure.ac +=================================================================== +--- openmoko-mediaplayer2.orig/configure.ac 2007-08-25 16:05:09.000000000 +0000 ++++ openmoko-mediaplayer2/configure.ac 2007-08-25 16:05:28.000000000 +0000 +@@ -14,12 +14,6 @@ + AM_GNU_GETTEXT + AM_GNU_GETTEXT_VERSION([0.12.1]) + +- +-CFLAGS="-I${prefix}/include $CFLAGS" +-AC_SUBST(CFLAGS) +-CPPFLAGS="-I${prefix}/include $CPPFLAGS" +-AC_SUBST(CPPFLAGS) +- + # Check for GTK/GLib/GThread/Pango, dbus, OpenMoko libs, gstreamer, expat, uriparser and XSPF + + PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.4.0 gtk+-2.0 >= 2.4.0 gthread-2.0 pango],, +@@ -61,7 +55,5 @@ + Makefile + src/Makefile + images/Makefile +- po/Makefile.in +- intl/Makefile + ]) + AC_OUTPUT +Index: openmoko-mediaplayer2/Makefile.am +=================================================================== +--- openmoko-mediaplayer2.orig/Makefile.am 2007-08-25 16:07:46.000000000 +0000 ++++ openmoko-mediaplayer2/Makefile.am 2007-08-25 16:07:53.000000000 +0000 +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = foreign +-SUBDIRS = src images intl +-# po ++SUBDIRS = src images ++# po intl + + + EXTRA_DIST = openmoko-mediaplayer.desktop openmoko-mediaplayer.png diff --git a/packages/openmoko2/openmoko-mediaplayer2/missing-images.patch b/packages/openmoko2/openmoko-mediaplayer2/missing-images.patch new file mode 100644 index 0000000000..d968e474eb --- /dev/null +++ b/packages/openmoko2/openmoko-mediaplayer2/missing-images.patch @@ -0,0 +1,13 @@ +Index: openmoko-mediaplayer2/images/Makefile.am +=================================================================== +--- openmoko-mediaplayer2.orig/images/Makefile.am 2007-08-25 16:15:27.000000000 +0000 ++++ openmoko-mediaplayer2/images/Makefile.am 2007-08-25 16:15:35.000000000 +0000 +@@ -12,8 +12,6 @@ + ico-repeat-all.png \ + ico-shuffle-on.png \ + ico-shuffle-off.png \ +- ico-balance-left.png \ +- ico-balance-right.png \ + ico-tracktype-general.png \ + ind-music-eq-00.png \ + ind-music-eq-01.png \ diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb new file mode 100644 index 0000000000..a7e6711d23 --- /dev/null +++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "A media player for OpenMoko" +SECTION = "openmoko/tools" +DEPENDS = "libmokoui2 expat gstreamer libspiff" +PV = "0.1.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko2 + +SRC_URI += "\ + file://autofoo.patch;patch=1 \ + file://missing-images.patch;patch=1 \ +" -- cgit v1.2.3 From 4d7b28b363a91078f987a1294f28308c6c77b12c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 25 Aug 2007 18:00:43 +0000 Subject: libsoup: update to 2.2.100 --- packages/gnome/libsoup_2.2.100.bb | 18 ++++++++++++++++++ packages/gnome/libsoup_2.2.98.bb | 19 ------------------- 2 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 packages/gnome/libsoup_2.2.100.bb delete mode 100644 packages/gnome/libsoup_2.2.98.bb diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb new file mode 100644 index 0000000000..701ab1556d --- /dev/null +++ b/packages/gnome/libsoup_2.2.100.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "An HTTP library implementation in C" +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +DEPENDS = "glib-2.0 gnutls libxml2" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + rm -f ${PKG_CONFIG_PATH}/libsoup* + autotools_stage_all + ln -sf ${PKG_CONFIG_PATH}/libsoup.pc ${PKG_CONFIG_PATH}/libsoup-2.2.pc +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" diff --git a/packages/gnome/libsoup_2.2.98.bb b/packages/gnome/libsoup_2.2.98.bb deleted file mode 100644 index c466a3a9c9..0000000000 --- a/packages/gnome/libsoup_2.2.98.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "An HTTP library implementation in C" -LICENSE = "GPL" -SECTION = "x11/gnome/libs" - -DEPENDS = "glib-2.0 gnutls libxml2" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" - -inherit autotools pkgconfig - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir}/ ${libdir}/" -FILES_${PN}-doc = "${datadir}/" - -do_stage() { - rm -f ${PKG_CONFIG_PATH}/libsoup* - autotools_stage_all - ln -sf ${PKG_CONFIG_PATH}/libsoup.pc ${PKG_CONFIG_PATH}/libsoup-2.2.pc -} -- cgit v1.2.3 From f0a01416c3b1ebe855b2c2b90740b255c6731ee4 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sat, 25 Aug 2007 19:36:52 +0000 Subject: helloworld-image: trimmed the .bb, had second copy of itself --- packages/images/helloworld-image.bb | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/packages/images/helloworld-image.bb b/packages/images/helloworld-image.bb index 058bb7f12a..a1caf54cc5 100644 --- a/packages/images/helloworld-image.bb +++ b/packages/images/helloworld-image.bb @@ -11,18 +11,3 @@ export IMAGE_LINGUAS = "" PACKAGE_INSTALL = ${RDEPENDS} inherit image - -# Hello world image -# Contains *only* a statically linked hello world init program -LICENSE = "MIT" -PR = "r0" - -RDEPENDS = "helloworld" - -export IMAGE_BASENAME = "helloworld-image" -export IMAGE_LINGUAS = "" - -PACKAGE_INSTALL = ${RDEPENDS} - -inherit image - -- cgit v1.2.3 From e935721a564f8423d9d34a6e7028f044da841d85 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 25 Aug 2007 20:27:16 +0000 Subject: linux.inc: add PV into uboot comment --- packages/linux/linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index ae7308bb81..4a09c92975 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -64,7 +64,7 @@ do_deploy() { ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin rm -f linux.bin.gz gzip -9 linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME} Kernel for ${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin rm -f linux.bin.gz fi } -- cgit v1.2.3 From d983293f9e1a463c1fba334a2570c11028f508cc Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sat, 25 Aug 2007 20:33:21 +0000 Subject: Fixed x86-prescott and added x86-32-nocona machines. --- conf/machine/include/tune-x86-nocona.conf | 2 ++ conf/machine/x86-32-nocona.conf | 23 +++++++++++++++++++++++ conf/machine/x86-prescott.conf | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 conf/machine/include/tune-x86-nocona.conf create mode 100644 conf/machine/x86-32-nocona.conf diff --git a/conf/machine/include/tune-x86-nocona.conf b/conf/machine/include/tune-x86-nocona.conf new file mode 100644 index 0000000000..f1189a171e --- /dev/null +++ b/conf/machine/include/tune-x86-nocona.conf @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-march=nocona" +TARGET_CC_KERNEL_ARCH = "-march=nocona" diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf new file mode 100644 index 0000000000..ebb7a14b06 --- /dev/null +++ b/conf/machine/x86-32-nocona.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: x86-nocona +#@DESCRIPTION: Machine configuration for Intel 'Nocona' processor in 32-bit mode +# + +TARGET_ARCH = "i686" +MACHINE_ARCH = "x86-32-nocona" +PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686" + +require conf/machine/include/tune-x86-nocona.conf + +PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +OLDEST_KERNEL = "2.6.20" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +IMAGE_FSTYPES = "ext2.gz" + +MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" +MACHINE_TASK_PROVIDER = "task-base" + diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf index 549a949a8b..2b0ef0e922 100644 --- a/conf/machine/x86-prescott.conf +++ b/conf/machine/x86-prescott.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for a generic i686 machine TARGET_ARCH = "i686" -PACKAGE_ARCH = "x86-prescott" +MACHINE_ARCH = "x86-prescott" PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686" require conf/machine/include/tune-x86-prescott.conf -- cgit v1.2.3