[oe-commits] org.oe.dev merge of '208f1ed94f96d48ebd0a914e436fb7a6e203f681'
mickeyl commit
oe at amethyst.openembedded.net
Sun Jul 20 22:18:10 UTC 2008
merge of '208f1ed94f96d48ebd0a914e436fb7a6e203f681'
and '377e4d7bcf91440bd806ee920d1b7ff72c44b991'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 6481fc52af8f37795f4f9da352a4f298c12f4e8a
ViewMTN: http://monotone.openembedded.org/revision/info/6481fc52af8f37795f4f9da352a4f298c12f4e8a
Files:
1
packages/alsa/files/libio.patch
packages/alsa/alsa-oss_1.0.15.bb
packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
packages/u-boot/u-boot-openmoko_svn.bb
packages/u-boot/u-boot-openmoko.inc
conf/distro/include/sane-srcrevs.inc
packages/linux/linux-openmoko-devel/defconfig-oe
packages/linux/linux-openmoko-devel_git.bb
packages/u-boot/u-boot-openmoko-devel_git.bb
Diffs:
#
# mt diff -r208f1ed94f96d48ebd0a914e436fb7a6e203f681 -r6481fc52af8f37795f4f9da352a4f298c12f4e8a
#
#
#
# add_file "packages/alsa/files/libio.patch"
# content [30802aa19da7dcd1632c7665450df841a03f3eda]
#
# patch "packages/alsa/alsa-oss_1.0.15.bb"
# from [7ca8c991dd2976fe24201983328f2b96c073e203]
# to [aae010357d2d0209e7df3dcae5dbf441fc4029be]
#
============================================================
--- packages/alsa/files/libio.patch 30802aa19da7dcd1632c7665450df841a03f3eda
+++ packages/alsa/files/libio.patch 30802aa19da7dcd1632c7665450df841a03f3eda
@@ -0,0 +1,43 @@
+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
+@@ -37,7 +37,9 @@
+ #endif
+
+ #include <stdio.h>
++#ifdef HAVE_LIBIO_H
+ #include <libio.h>
++#endif
+
+ struct fd_cookie {
+ int fd;
+@@ -99,7 +101,11 @@
+
+ if (open_mode && fdc->fd > 0) {
+ result = fopencookie (fdc,"w", fns);
++#ifdef HAVE_FILENO
+ result->_fileno = fdc->fd; /* ugly patchy slimy kludgy hack */
++else
++ result->_filedes = fdc->fd;
++#endif
+ }
+ return result;
+ }
+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
+@@ -33,6 +33,12 @@
+ LIBS="$OLD_LIBS"
+ fi
+
++AC_CHECK_HEADERS_ONCE([libio.h])
++
++AC_CHECK_MEMBER([struct _IO_FILE._fileno],
++ [AC_DEFINE([HAVE_FILENO], [1],[Define if _fileno exists.])],
++ [],[])
++
+ AC_OUTPUT(Makefile alsa/Makefile alsa/aoss alsa/aoss.old \
+ oss-redir/Makefile test/Makefile \
+ alsa/testaoss test/testaoss)
============================================================
--- packages/alsa/alsa-oss_1.0.15.bb 7ca8c991dd2976fe24201983328f2b96c073e203
+++ packages/alsa/alsa-oss_1.0.15.bb aae010357d2d0209e7df3dcae5dbf441fc4029be
@@ -2,8 +2,11 @@ DEPENDS = "alsa-lib"
SECTION = "libs/multimedia"
LICENSE = "GPL"
DEPENDS = "alsa-lib"
+PR = "1"
-SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
+ file://libio.patch;patch=1 \
+ "
inherit autotools
#
# mt diff -r377e4d7bcf91440bd806ee920d1b7ff72c44b991 -r6481fc52af8f37795f4f9da352a4f298c12f4e8a
#
#
#
# delete "packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb"
#
# delete "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
#
# delete "packages/u-boot/u-boot-openmoko_svn.bb"
#
# add_file "packages/u-boot/u-boot-openmoko.inc"
# content [20f6306e25d09075105ebae1cea97ed1cff65ca5]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [cd4d9a24621db28587ab53e1d344cbea50c5e8fb]
# to [3f7f64ecffb3a08b7d6d6b1dcbb873b77c474243]
#
# patch "packages/linux/linux-openmoko-devel/defconfig-oe"
# from [2718a78fdc1b4bb16308b28db21353815d3900c9]
# to [ae215bbbd3ec8aef67ee264a2c5037e23e5cc743]
#
# patch "packages/linux/linux-openmoko-devel_git.bb"
# from [a558ba890553e9ff9d3cb9f68b07df41b7dea683]
# to [9a21ddc614d014bdc54366bd1abd41b077008279]
#
# patch "packages/u-boot/u-boot-openmoko-devel_git.bb"
# from [3f3b61ce6d5f6076fd65a8304d08f6a13b5c2719]
# to [86254e6c66bd76fc8b47aa0114e6c26646cee6f0]
#
============================================================
--- packages/u-boot/u-boot-openmoko.inc 20f6306e25d09075105ebae1cea97ed1cff65ca5
+++ packages/u-boot/u-boot-openmoko.inc 20f6306e25d09075105ebae1cea97ed1cff65ca5
@@ -0,0 +1,62 @@
+DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
+AUTHOR = "Harald Welte <laforge at openmoko.org> et. al."
+LICENSE = "GPL"
+SECTION = "bootloader"
+PRIORITY = "optional"
+PROVIDES = "virtual/bootloader"
+LOCALVERSION = "+gitr${SRCREV}"
+PV = "1.3.1${LOCALVERSION}"
+PR = "r0"
+
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5"
+
+DEFAULT_PREFERENCE = "-1"
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+TARGET_LDFLAGS = ""
+
+do_svnrev() {
+ mv -f tools/setlocalversion tools/setlocalversion.old
+ echo "echo ${LOCALVERSION}" >>tools/setlocalversion
+}
+
+do_compile () {
+ chmod +x board/neo1973/gta*/split_by_variant.sh
+ for mach in ${UBOOT_MACHINES}
+ do
+ oe_runmake ${mach}_config
+ oe_runmake clean
+ find board -name lowlevel_foo.bin -exec rm '{}' \;
+ oe_runmake all
+ oe_runmake u-boot.udfu
+ if [ -f u-boot.udfu ]; then
+ mv u-boot.udfu u-boot_${mach}.bin
+ else
+ mv u-boot.bin u-boot_${mach}.bin
+ fi
+ if [ -f board/${mach}/lowlevel_foo.bin ]; then
+ mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin
+ else
+ find board -name lowlevel_foo.bin -exec mv '{}' lowlevel_foo_${mach}.bin \;
+ fi
+ done
+}
+
+do_deploy () {
+ install -d ${DEPLOY_DIR_IMAGE}
+ for mach in ${UBOOT_MACHINES}
+ do
+ install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin
+ ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin
+ if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
+ install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin
+ ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin
+ fi
+ done
+ install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
+}
+
+do_deploy[dirs] = "${S}"
+addtask deploy before do_package after do_install
+addtask quilt before do_patch after do_unpack
+addtask svnrev before do_patch after do_quilt
============================================================
--- conf/distro/include/sane-srcrevs.inc cd4d9a24621db28587ab53e1d344cbea50c5e8fb
+++ conf/distro/include/sane-srcrevs.inc 3f7f64ecffb3a08b7d6d6b1dcbb873b77c474243
@@ -166,7 +166,7 @@ SRCREV_pn-tmut ?= "60"
SRCREV_pn-sjf2410-linux-native ?= "4268"
SRCREV_pn-sphyrna ?= "45"
SRCREV_pn-tmut ?= "60"
-SRCREV_pn-u-boot-openmoko ?= "4297"
+SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
SRCREV_pn-usbpath ?= "3172"
SRCREV_pn-usbpath-native ?= "3172"
============================================================
--- packages/linux/linux-openmoko-devel/defconfig-oe 2718a78fdc1b4bb16308b28db21353815d3900c9
+++ packages/linux/linux-openmoko-devel/defconfig-oe ae215bbbd3ec8aef67ee264a2c5037e23e5cc743
@@ -1484,7 +1484,7 @@ CONFIG_RTC_DRV_S3C=m
#
# File systems
#
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=y
============================================================
--- packages/linux/linux-openmoko-devel_git.bb a558ba890553e9ff9d3cb9f68b07df41b7dea683
+++ packages/linux/linux-openmoko-devel_git.bb 9a21ddc614d014bdc54366bd1abd41b077008279
@@ -9,7 +9,7 @@ PV = "${KERNEL_RELEASE}+gitr${SRCREV}"
# If you use a rc, you will need to use this:
PV = "${KERNEL_RELEASE}+gitr${SRCREV}"
-PR = "r2"
+PR = "r3"
KERNEL_IMAGETYPE = "uImage"
UBOOT_ENTRYPOINT = "30008000"
============================================================
--- packages/u-boot/u-boot-openmoko-devel_git.bb 3f3b61ce6d5f6076fd65a8304d08f6a13b5c2719
+++ packages/u-boot/u-boot-openmoko-devel_git.bb 86254e6c66bd76fc8b47aa0114e6c26646cee6f0
@@ -1,72 +1,8 @@
-DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
-AUTHOR = "Harald Welte <laforge at openmoko.org>"
-LICENSE = "GPL"
-SECTION = "bootloader"
-PRIORITY = "optional"
-PROVIDES = "virtual/bootloader"
-LOCALVERSION = "+git${SRCREV}"
-PV = "1.3.1${LOCALVERSION}"
-PR = "r1"
+require u-boot-openmoko.inc
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRCREV_FORMAT = "git.openmoko.org"
-
-SRCREV = "1dd080c17b105da5cd4720307fa62de38276796a"
-
-SRC_URI = "git://git.openmoko.org/git/u-boot.git;protocol=git;branch=andy \
- file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+SRC_URI = "\
+ git://git.openmoko.org/git/u-boot.git;protocol=git;branch=andy \
file://makefile-no-dirafter.patch;patch=1 \
"
S = "${WORKDIR}/git"
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-TARGET_LDFLAGS = ""
-
-do_svnrev() {
- mv -f tools/setlocalversion tools/setlocalversion.old
- echo "echo ${LOCALVERSION}" >>tools/setlocalversion
-}
-
-do_compile () {
- chmod +x board/neo1973/gta*/split_by_variant.sh
- for mach in ${UBOOT_MACHINES}
- do
- oe_runmake ${mach}_config
- oe_runmake clean
- find board -name lowlevel_foo.bin -exec rm '{}' \;
- oe_runmake all
- oe_runmake u-boot.udfu
- if [ -f u-boot.udfu ]; then
- mv u-boot.udfu u-boot_${mach}.bin
- else
- mv u-boot.bin u-boot_${mach}.bin
- fi
- if [ -f board/${mach}/lowlevel_foo.bin ]; then
- mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin
- else
- find board -name lowlevel_foo.bin -exec mv '{}' lowlevel_foo_${mach}.bin \;
- fi
- done
-}
-
-do_deploy () {
- install -d ${DEPLOY_DIR_IMAGE}
- for mach in ${UBOOT_MACHINES}
- do
- install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin
- ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin
- if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
- install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin
- ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin
- fi
- done
- install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
-}
-
-do_deploy[dirs] = "${S}"
-addtask deploy before do_package after do_install
-addtask quilt before do_patch after do_unpack
-addtask svnrev before do_patch after do_quilt
More information about the Openembedded-commits
mailing list