[oe-commits] org.oe.dev merge of '13f44cdbfe324214f1eaf83010654d1baabf59c2'
coredump2 commit
openembedded-commits at lists.openembedded.org
Fri Dec 28 16:34:47 UTC 2007
merge of '13f44cdbfe324214f1eaf83010654d1baabf59c2'
and 'be0c074741a0dccdd6fa957ac43f2c44be640046'
Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 4afe7a39abef322799f31bedff527afcc6c16d7f
ViewMTN: http://monotone.openembedded.org/revision/info/4afe7a39abef322799f31bedff527afcc6c16d7f
Files:
1
packages/settings-daemon/settings-daemon_svn.bb
packages/uboot
packages/u-boot
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/uboot/uboot-openmoko_svn.bb
packages/u-boot/u-boot-openmoko_svn.bb
packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch
packages/linux/linux-rp_2.6.23.bb
packages/linux/linux_2.6.23.bb
packages/meta/slugos-packages.bb
Diffs:
#
# mt diff -r13f44cdbfe324214f1eaf83010654d1baabf59c2 -r4afe7a39abef322799f31bedff527afcc6c16d7f
#
#
#
# patch "packages/settings-daemon/settings-daemon_svn.bb"
# from [645f5cd35518ca1a4b650a7c494a2bed8154ac61]
# to [f266cffda5f763fbd31050c83eb2c9e97bfcaaac]
#
============================================================
--- packages/settings-daemon/settings-daemon_svn.bb 645f5cd35518ca1a4b650a7c494a2bed8154ac61
+++ packages/settings-daemon/settings-daemon_svn.bb f266cffda5f763fbd31050c83eb2c9e97bfcaaac
@@ -1,10 +1,12 @@ LICENSE = "GPL"
DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings"
LICENSE = "GPL"
-DEPENDS = "gconf glib-2.0"
+DEPENDS = "gconf glib-2.0 gtk+"
RDEPENDS = "xrdb"
SECTION = "x11"
PV = "0.0+svnr${SRCREV}"
+PR = "r1"
+
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
file://70settings-daemon"
#
# mt diff -rbe0c074741a0dccdd6fa957ac43f2c44be640046 -r4afe7a39abef322799f31bedff527afcc6c16d7f
#
#
#
# rename "packages/uboot"
# to "packages/u-boot"
#
# rename "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
# to "packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
#
# rename "packages/uboot/uboot-openmoko_svn.bb"
# to "packages/u-boot/u-boot-openmoko_svn.bb"
#
# add_file "packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch"
# content [f687bd2f045dfad3693848409d187f63acdfd151]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [1f5858f24a5615fa3a5a1901c638b63a94ffa9db]
# to [2664bd077fcfc9c3ad9ebf64134d131fb4e95679]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [2281487e8d175d81a3be60da3addf3d79106de70]
# to [f8ca05a376ad8770405546e8c39e711d2fcbb477]
#
# patch "packages/meta/slugos-packages.bb"
# from [c730d6f5cb0b4b5cace51f9bb454525ef5c59ab8]
# to [58d718f42f82fb421411dd42902041d9826d43d7]
#
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
# from [8a7b89b1fde79e94c6ddfbc706a42b171be5f547]
# to [67ec27434d36f171aedd9fb4e06f390505792635]
#
============================================================
--- packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch f687bd2f045dfad3693848409d187f63acdfd151
+++ packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch f687bd2f045dfad3693848409d187f63acdfd151
@@ -0,0 +1,29 @@
+--- git.orig/drivers/video/cfb_console.c 2007-12-27 00:59:35.000000000 -0800
++++ git/drivers/video/cfb_console.c 2007-12-27 08:23:42.000000000 -0800
+@@ -141,6 +141,14 @@
+ #endif
+
+ /*****************************************************************************/
++/* Defines for the S3C2410 driver */
++/*****************************************************************************/
++#ifdef CONFIG_VIDEO_S3C2410
++/* it actually is little-endian, but the host CPU, too ! */
++//#define VIDEO_FB_LITTLE_ENDIAN
++#endif
++
++/*****************************************************************************/
+ /* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc */
+ /*****************************************************************************/
+ #include <video_fb.h>
+@@ -309,6 +317,11 @@
+ #define SHORTSWAP32(x) (x)
+ #endif
+
++#ifdef CONFIG_VIDEO_S3C2410
++#undef SHORTSWAP32
++#define SHORTSWAP32(x) ((((x) & 0xffff) << 16) | (((x) >> 16) & 0xffff))
++#endif
++
+ #if defined(DEBUG) || defined(DEBUG_CFB_CONSOLE)
+ #define PRINTD(x) printf(x)
+ #else
============================================================
--- packages/linux/linux-rp_2.6.23.bb 1f5858f24a5615fa3a5a1901c638b63a94ffa9db
+++ packages/linux/linux-rp_2.6.23.bb 2664bd077fcfc9c3ad9ebf64134d131fb4e95679
@@ -1,10 +1,9 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r13"
+PR = "r14"
DEFAULT_PREFERENCE_qemuarm = "-1"
DEFAULT_PREFERENCE_qemux86 = "-1"
-DEFAULT_PREFERENCE_poodle = "-99"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -41,6 +40,8 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
${RPSRC}/w100_extmem-r1.patch;patch=1 \
${RPSRC}/spitzkbd_fix-r0.patch;patch=1 \
${RPSRC}/export_atags-r0.patch;patch=1 \
+ ${RPSRC}/pxa25x_suspend_fixes-r0.patch;patch=1 \
+ ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \
file://w100fb-unused-var.patch;patch=1 \
file://hostap-monitor-mode.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
============================================================
--- packages/linux/linux_2.6.23.bb 2281487e8d175d81a3be60da3addf3d79106de70
+++ packages/linux/linux_2.6.23.bb f8ca05a376ad8770405546e8c39e711d2fcbb477
@@ -9,13 +9,20 @@ DEPENDS_append_mpc8323e-rdb = " dtc-nati
DEPENDS_append_mpc8313e-rdb = " dtc-native"
DEPENDS_append_mpc8323e-rdb = " dtc-native"
-PR = "r8"
+PR = "r9"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
file://binutils-buildid-arm.patch;patch=1 \
file://defconfig \
"
+# Bug fixes on the 2.6.23.x stable branch
+SRC_URI += "http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.23.12.bz2;patch=1"
+# Add support for squashfs-lzma (a highly compressed read-only filesystem)
+SRC_URI += "http://kamikaze.waninkoko.info/patches/2.6.23/klight1/broken-out/squashfs-lzma-2.6.23.patch;patch=1"
+# Completely fair scheduler
+SRC_URI += "http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.23.12-v24.1.patch;patch=1"
+
SRC_URI_append_cm-x270 = "\
file://0001-cm-x270-base2.patch;patch=1 \
file://0002-cm-x270-match-type.patch;patch=1 \
@@ -88,3 +95,4 @@ addtask devicetree_image after do_deploy
addtask compulab_image after do_deploy before do_package
addtask devicetree_image after do_deploy before do_package
+
============================================================
--- packages/meta/slugos-packages.bb c730d6f5cb0b4b5cace51f9bb454525ef5c59ab8
+++ packages/meta/slugos-packages.bb 58d718f42f82fb421411dd42902041d9826d43d7
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r43"
+PR = "r44"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2"
@@ -250,6 +250,8 @@ DEPENDS = "\
DEPENDS = "\
slugos-image \
slugos-native \
+ task-nas-server-everything \
+ task-proper-tools \
${SLUGOS_PACKAGES} \
${SLUGOS_EXTRA_PACKAGES} \
package-index \
============================================================
--- packages/uboot/uboot-openmoko_svn.bb 8a7b89b1fde79e94c6ddfbc706a42b171be5f547
+++ packages/u-boot/u-boot-openmoko_svn.bb 67ec27434d36f171aedd9fb4e06f390505792635
@@ -6,7 +6,7 @@ PV = "1.3.1${LOCALVERSION}"
PROVIDES = "virtual/bootloader"
LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
PV = "1.3.1${LOCALVERSION}"
-PR = "r1"
+PR = "r2"
SRCREV_FORMAT = "patches"
@@ -20,6 +20,7 @@ SRC_URI = "\
file://uboot-eabi-fix-HACK.patch \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
file://makefile-no-dirafter.patch;patch=1 \
+ file://boot-menu-gfx-fix-openmoko-bug-1140.patch;patch=1 \
"
S = "${WORKDIR}/git"
@@ -27,14 +28,13 @@ do_quilt() {
TARGET_LDFLAGS = ""
do_quilt() {
- mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
- rm -Rf patches .pc
+ mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+ rm -Rf patches .pc
}
do_svnrev() {
mv -f tools/setlocalversion tools/setlocalversion.old
- echo -n "echo " >>tools/setlocalversion
- echo ${PV} >>tools/setlocalversion
+ echo "echo ${LOCALVERSION}" >>tools/setlocalversion
}
do_configure_prepend() {
@@ -44,27 +44,25 @@ do_compile () {
}
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
+ 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 () {
More information about the Openembedded-commits
mailing list