[oe-commits] org.oe.dev merge of '2ea9f4ae40e1a9b07744e81b924d464d9e450aba'
hrw commit
openembedded-commits at lists.openembedded.org
Tue Nov 27 11:06:35 UTC 2007
merge of '2ea9f4ae40e1a9b07744e81b924d464d9e450aba'
and 'be33ed116b217c668a13a0dae151271036541f73'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 7b04765c94afb788dc59f2a111e90fc43a46c4a4
ViewMTN: http://monotone.openembedded.org/revision/info/7b04765c94afb788dc59f2a111e90fc43a46c4a4
Files:
1
packages/keylaunch/files/80chvt-SUID
packages/keylaunch/keylaunch-conf/80chvt-SUID
packages/keylaunch/files/akita
packages/keylaunch/keylaunch-conf/akita
packages/keylaunch/files/c7x0
packages/keylaunch/keylaunch-conf/c7x0
packages/keylaunch/files/collie
packages/keylaunch/keylaunch-conf/collie
packages/keylaunch/files/corgie
packages/keylaunch/keylaunch-conf/corgie
packages/keylaunch/files/husky
packages/keylaunch/keylaunch-conf/husky
packages/keylaunch/files/keylaunchrc
packages/keylaunch/keylaunch-conf/keylaunchrc
packages/keylaunch/files/shepherd
packages/keylaunch/keylaunch-conf/shepherd
packages/keylaunch/files/spitz
packages/keylaunch/keylaunch-conf/spitz
packages/linux/linux-hackndev-2.6_svn.bb
packages/linux/linux-hackndev-2.6_git.bb
packages/inotify-tools/files
packages/keylaunch/keylaunch-conf
packages/gcc/gcc-4.1.0/pr34130.patch
packages/gcc/gcc-4.1.1/pr34130.patch
packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch
packages/gpe-login/files/lock-on-supend.patch
packages/inotify-tools/files/no-tests.patch
packages/inotify-tools/inotify-tools_3.12.bb
packages/keylaunch/files/unbreak-keyevents.patch
packages/keylaunch/keylaunch-conf_2.0.10.bb
packages/klibc/files/fstype-sane-and-vfat.patch
packages/klibc/klibc-utils-fstype_1.1.1.bb
conf/machine/include/zaurus-2.6.inc
packages/busybox/busybox-1.2.1/slugos/defconfig
packages/busybox/busybox_1.2.1.bb
packages/gpe-login/gpe-login_0.90.bb
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/initramfs-jffs2_0.1.bb
packages/initrdscripts/initramfs-module-block_1.0.bb
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-module-initfs_1.0.bb
packages/initrdscripts/initramfs-module-loop_1.0.bb
packages/initrdscripts/initramfs-module-nfs_1.0.bb
packages/initrdscripts/initramfs-uniboot_1.0.bb
packages/keylaunch/keylaunch_2.0.10.bb
packages/klibc/klibc.inc
packages/klibc/klibc_1.1.1.bb
packages/linux/ixp4xx-kernel/2.6.21/defconfig
packages/linux/ixp4xx-kernel_2.6.21.6.bb
packages/linux/linux-handhelds-2.6.inc
packages/maemo4/hildon-libs_0.15.1.bb
Diffs:
#
# mt diff -r2ea9f4ae40e1a9b07744e81b924d464d9e450aba -r7b04765c94afb788dc59f2a111e90fc43a46c4a4
#
#
#
# rename "packages/keylaunch/files/80chvt-SUID"
# to "packages/keylaunch/keylaunch-conf/80chvt-SUID"
#
# rename "packages/keylaunch/files/akita"
# to "packages/keylaunch/keylaunch-conf/akita"
#
# rename "packages/keylaunch/files/c7x0"
# to "packages/keylaunch/keylaunch-conf/c7x0"
#
# rename "packages/keylaunch/files/collie"
# to "packages/keylaunch/keylaunch-conf/collie"
#
# rename "packages/keylaunch/files/corgie"
# to "packages/keylaunch/keylaunch-conf/corgie"
#
# rename "packages/keylaunch/files/husky"
# to "packages/keylaunch/keylaunch-conf/husky"
#
# rename "packages/keylaunch/files/keylaunchrc"
# to "packages/keylaunch/keylaunch-conf/keylaunchrc"
#
# rename "packages/keylaunch/files/shepherd"
# to "packages/keylaunch/keylaunch-conf/shepherd"
#
# rename "packages/keylaunch/files/spitz"
# to "packages/keylaunch/keylaunch-conf/spitz"
#
# rename "packages/linux/linux-hackndev-2.6_svn.bb"
# to "packages/linux/linux-hackndev-2.6_git.bb"
#
# add_dir "packages/inotify-tools/files"
#
# add_dir "packages/keylaunch/keylaunch-conf"
#
# add_file "packages/gcc/gcc-4.1.0/pr34130.patch"
# content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
#
# add_file "packages/gcc/gcc-4.1.1/pr34130.patch"
# content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
#
# add_file "packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch"
# content [6fa3a2c1e0cb701a608210a0843aabcb82734d4d]
#
# add_file "packages/gpe-login/files/lock-on-supend.patch"
# content [20c5d7dd021d07ef26f5bd6ac589a5a43f3e2ea9]
#
# add_file "packages/inotify-tools/files/no-tests.patch"
# content [b129a0d5d40b2462f017c71aad8910e3a0e5a3df]
#
# add_file "packages/inotify-tools/inotify-tools_3.12.bb"
# content [a9474ce08f3f156053ea4090f1a5c01f28d42d80]
#
# add_file "packages/keylaunch/files/unbreak-keyevents.patch"
# content [2adb5ed37a6c319f1de6d797029f20c67ba92bb6]
#
# add_file "packages/keylaunch/keylaunch-conf_2.0.10.bb"
# content [b8e18f25c3e21dde6097c8016a88909f2ea48c7a]
#
# add_file "packages/klibc/files/fstype-sane-and-vfat.patch"
# content [d4a15a94ce1fcbe5660e3ae975c493c18920219b]
#
# add_file "packages/klibc/klibc-utils-fstype_1.1.1.bb"
# content [aee9890849d771d8cb3019aa6ec1ac6af845eea7]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [dd6df1661a3592e1baef87d454ec3ce4f0987d2c]
# to [6cb1d601b80af4a29b59dd760b6939447fa49736]
#
# patch "packages/busybox/busybox-1.2.1/slugos/defconfig"
# from [d05e36cad8733615a19b494f57903f96e9824fb4]
# to [14df10da19af8808910351fc6d18084ce0b9c571]
#
# patch "packages/busybox/busybox_1.2.1.bb"
# from [b96488a91da7518ee196271962642b690a836f43]
# to [160317aa572262fe79f5bcad397356e713e225e0]
#
# patch "packages/gpe-login/gpe-login_0.90.bb"
# from [4d169c1528607b9f2057c1d7e854efa1a2448ec5]
# to [0fe6a61cab9e7e30dadcb5a8368e7aacb96a5d56]
#
# patch "packages/initrdscripts/files/30-bootmenu.sh"
# from [dcac7a351d81139c5e5c42d7115e7df562f936a1]
# to [f75b0281709f790d2341265a880b463f53e674d2]
#
# patch "packages/initrdscripts/initramfs-jffs2_0.1.bb"
# from [c14984bd01bbc92b79ac05b95049083c923091ed]
# to [5aa300aee47241c48d2ebc06f8457bbfdb4f1676]
#
# patch "packages/initrdscripts/initramfs-module-block_1.0.bb"
# from [877659cf4df66f5a8a377c2289bd1de30d995e18]
# to [1d63081f1074144e693737bd6ca954bd64c1b1a2]
#
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
# from [8f8e42c6e5c128c065b336db59a056006457d5b6]
# to [3be3bf803a686aab18297d3d48a928bc8c6d1084]
#
# patch "packages/initrdscripts/initramfs-module-initfs_1.0.bb"
# from [7ccc0b4a92ee8e901d4342bc7763cc3a48728c54]
# to [e8b2ca5b6f8808155c08371d32e7b42f94caa7bb]
#
# patch "packages/initrdscripts/initramfs-module-loop_1.0.bb"
# from [8855abd2b8aa026fd8fc30621bc4c14f7b85a907]
# to [47c6ca05257d38036fdfc7794cb088db81ea3307]
#
# patch "packages/initrdscripts/initramfs-module-nfs_1.0.bb"
# from [a0732aae921a74765b68a2e86421a61b8a519701]
# to [a46327b66f6eefb73d7e3e8e77a789f623b67d4f]
#
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
# from [64d8e47ab51e813d995200750f5b07ab0cd181fe]
# to [716f3127ca0421f8c9920adbb82ec03ace9a4717]
#
# patch "packages/keylaunch/keylaunch-conf/keylaunchrc"
# from [6117316ec809d55beff3bb360c399f7dded21c6c]
# to [e2005a89201848e8b5c4c793489abd7124070665]
#
# patch "packages/keylaunch/keylaunch_2.0.10.bb"
# from [a826322be029da6f070361e625bdf06ea694f78d]
# to [dec61b8c4a861af63c9030b9c3b0c339915e5760]
#
# patch "packages/klibc/klibc.inc"
# from [a0ab0badeee4660b2c4c719d6f5bf971ad4809d5]
# to [3837324054705bf9be0ea462126a47814f334e24]
#
# patch "packages/klibc/klibc_1.1.1.bb"
# from [97da9235f69cc035927d6566f0dc0ed7585a8ec4]
# to [d52cd890178b463fedaaf708ec6a0221604c1c9c]
#
# patch "packages/linux/ixp4xx-kernel/2.6.21/defconfig"
# from [fb757ce6c7a72d4a879fe68c61d72b80b0a43d8a]
# to [c8f2393bacd7f497d9c1c712cfe77848122b86d2]
#
# patch "packages/linux/ixp4xx-kernel_2.6.21.6.bb"
# from [6c2da58d1d1b58181b79e443296d131572a0291c]
# to [7bbe02dab1ee9d96582a4664a0beeacbae289c13]
#
# patch "packages/linux/linux-hackndev-2.6_git.bb"
# from [d44ac26422caf12e88dfe59add0418269bcdba54]
# to [6f841a8bfb7536428c828e53fad2e3687efc976f]
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [bf65d013040f24c7cbef7958c4ba9b8e703ac03f]
# to [8fd391c5dea2011084315e312146757e2c5bfea7]
#
============================================================
--- packages/gcc/gcc-4.1.0/pr34130.patch 23564cf74db7c5330d103f2b44e167ad2ef97eba
+++ packages/gcc/gcc-4.1.0/pr34130.patch 23564cf74db7c5330d103f2b44e167ad2ef97eba
@@ -0,0 +1,16 @@
+Index: gcc-4.1.2/gcc/fold-const.c
+===================================================================
+--- gcc-4.1.2.orig/gcc/fold-const.c 2007-11-21 18:53:42.000000000 +0100
++++ gcc-4.1.2/gcc/fold-const.c 2007-11-21 18:56:26.000000000 +0100
+@@ -5339,7 +5339,10 @@
+ }
+ break;
+ }
+- /* FALLTHROUGH */
++ /* If the constant is negative, we cannot simplify this. */
++ if (tree_int_cst_sgn (c) == -1)
++ break;
++ /* FALLTHROUGH */
+ case NEGATE_EXPR:
+ if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
+ return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
============================================================
--- packages/gcc/gcc-4.1.1/pr34130.patch 23564cf74db7c5330d103f2b44e167ad2ef97eba
+++ packages/gcc/gcc-4.1.1/pr34130.patch 23564cf74db7c5330d103f2b44e167ad2ef97eba
@@ -0,0 +1,16 @@
+Index: gcc-4.1.2/gcc/fold-const.c
+===================================================================
+--- gcc-4.1.2.orig/gcc/fold-const.c 2007-11-21 18:53:42.000000000 +0100
++++ gcc-4.1.2/gcc/fold-const.c 2007-11-21 18:56:26.000000000 +0100
+@@ -5339,7 +5339,10 @@
+ }
+ break;
+ }
+- /* FALLTHROUGH */
++ /* If the constant is negative, we cannot simplify this. */
++ if (tree_int_cst_sgn (c) == -1)
++ break;
++ /* FALLTHROUGH */
+ case NEGATE_EXPR:
+ if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
+ return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
============================================================
--- packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch 6fa3a2c1e0cb701a608210a0843aabcb82734d4d
+++ packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch 6fa3a2c1e0cb701a608210a0843aabcb82734d4d
@@ -0,0 +1,8 @@
+diff -r 976c01632fea gpe-login.keylaunchrc
+--- a/gpe-login.keylaunchrc Sun Nov 25 22:39:23 2007 +0200
++++ b/gpe-login.keylaunchrc Mon Nov 26 01:12:14 2007 +0200
+@@ -1,3 +1,3 @@ key=????XF86AudioRecord:xcalibrate:/usr/
+-key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
++key=????XF86AudioRecord:xcalibrate:/usr/bin/xtscal
+ key=????XF86PowerDown:-:/usr/bin/apm --suspend
+ key=????Held XF86PowerDown:-:bl toggle
============================================================
--- packages/gpe-login/files/lock-on-supend.patch 20c5d7dd021d07ef26f5bd6ac589a5a43f3e2ea9
+++ packages/gpe-login/files/lock-on-supend.patch 20c5d7dd021d07ef26f5bd6ac589a5a43f3e2ea9
@@ -0,0 +1,14 @@
+Lock screen when device goes to suspend, not after some time has passed
+since resume and they stole your data from the unprotected screen.
+
+--- gpe-login-0.90/Makefile.am.org 2007-04-02 15:46:52.000000000 +0300
++++ gpe-login-0.90/Makefile.am 2007-11-24 22:41:24.000000000 +0200
+@@ -17,7 +17,7 @@
+ x11_SCRIPTS = gpe-login.setup X11/gpe-login.pre-session
+ x11_DATA = gpe-login.keylaunchrc X11/gpe-login.gtkrc
+
+-apmdir = $(sysconfdir)/apm/resume.d
++apmdir = $(sysconfdir)/apm/suspend.d
+ apm_SCRIPTS = gpe-login.suspend
+
+ xsessiondir = $(sysconfdir)/X11/Xsession.d
============================================================
--- packages/inotify-tools/files/no-tests.patch b129a0d5d40b2462f017c71aad8910e3a0e5a3df
+++ packages/inotify-tools/files/no-tests.patch b129a0d5d40b2462f017c71aad8910e3a0e5a3df
@@ -0,0 +1,31 @@
+Index: inotify-tools-3.12/configure.ac
+===================================================================
+--- inotify-tools-3.12.orig/configure.ac 2007-11-26 22:23:15.000000000 +0100
++++ inotify-tools-3.12/configure.ac 2007-11-26 22:23:29.000000000 +0100
+@@ -42,16 +42,16 @@
+
+
+ # Checks for header files.
+-AC_CHECK_HEADERS([sys/inotify.h mcheck.h])
+-AC_LANG(C)
+-AC_MSG_CHECKING([whether sys/inotify.h actually works])
+-AC_RUN_IFELSE(
+- AC_LANG_PROGRAM([[#include <sys/inotify.h>]],
+- [[return (-1 == inotify_init());]]
+- ),
+- [AC_MSG_RESULT([yup]); AC_DEFINE([SYS_INOTIFY_H_EXISTS_AND_WORKS],[1],[sys/inotify.h exists and works correctly])],
+- [AC_MSG_RESULT([nope, using own inotify headers])]
+-)
++#AC_CHECK_HEADERS([sys/inotify.h mcheck.h])
++#AC_LANG(C)
++#AC_MSG_CHECKING([whether sys/inotify.h actually works])
++#AC_RUN_IFELSE(
++# AC_LANG_PROGRAM([[#include <sys/inotify.h>]],
++# [[return (-1 == inotify_init());]]
++# ),
++# [AC_MSG_RESULT([yup]); AC_DEFINE([SYS_INOTIFY_H_EXISTS_AND_WORKS],[1],[sys/inotify.h exists and works correctly])],
++# [AC_MSG_RESULT([nope, using own inotify headers])]
++#)
+
+
+
============================================================
--- packages/inotify-tools/inotify-tools_3.12.bb a9474ce08f3f156053ea4090f1a5c01f28d42d80
+++ packages/inotify-tools/inotify-tools_3.12.bb a9474ce08f3f156053ea4090f1a5c01f28d42d80
@@ -0,0 +1,14 @@
+DESCRIPTION = "inotify-tools is a set of command line utilities for the \
+Linux inotify filesystem change notification system."
+LICENSE = "GPL"
+AUTHOR = "Rohan McGovern"
+HOMEPAGE = "http://inotify-tools.sourceforge.net/"
+PR = "r0"
+
+EXTRA_OECONF = "--disable-doxygen"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/inotify-tools/inotify-tools-3.12.tar.gz \
+file://no-tests.patch;patch=1"
+
+inherit autotools
+
============================================================
--- packages/keylaunch/files/unbreak-keyevents.patch 2adb5ed37a6c319f1de6d797029f20c67ba92bb6
+++ packages/keylaunch/files/unbreak-keyevents.patch 2adb5ed37a6c319f1de6d797029f20c67ba92bb6
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User "Paul Sokolovsky <pfalcon at users.sourceforge.net>"
+# Date 1196027570 -7200
+# Node ID 282176e5c55dba673756b4707716f06a5c8b37e2
+# Parent 833c989472a7987681ea3b8cbd6f9eb77293177a
+We of course still want to receive key events even after subscribing to
+property events. This fixes when keylaunch doesn't receive forwarded
+power buttons events from gpe-login --autolock in its locked state.
+In plain words: now power button works with autolock screen.
+
+diff -r 833c989472a7 -r 282176e5c55d keylaunch.c
+--- a/keylaunch.c Sun Nov 25 22:04:29 2007 +0200
++++ b/keylaunch.c Sun Nov 25 23:52:50 2007 +0200
+@@ -682,7 +682,7 @@ main (int argc, char *argv[])
+ {
+ initialize (argc, argv);
+
+- XSelectInput (dpy, DefaultRootWindow (dpy), PropertyChangeMask);
++ XSelectInput (dpy, DefaultRootWindow (dpy), PropertyChangeMask | KeyPressMask | KeyReleaseMask);
+ gpe_launch_monitor_display (dpy);
+
+ signal (SIGCHLD, SIG_IGN);
============================================================
--- packages/keylaunch/keylaunch-conf_2.0.10.bb b8e18f25c3e21dde6097c8016a88909f2ea48c7a
+++ packages/keylaunch/keylaunch-conf_2.0.10.bb b8e18f25c3e21dde6097c8016a88909f2ea48c7a
@@ -0,0 +1,27 @@
+RDEPENDS_append_spitz = " display-brightness"
+RDEPENDS_append_akita = " display-brightness"
+RDEPENDS_append_c7x0 = " display-brightness"
+
+SECTION = "gpe"
+LICENSE = "GPL"
+DESCRIPTION = "Device-specific keylaunch configuration"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PR = "r2"
+
+SRC_URI = " file://keylaunchrc"
+SRC_URI += " file://80chvt-SUID"
+
+do_install () {
+ install -d ${D}${sysconfdir}
+ install -d ${D}${sysconfdir}/X11/Xinit.d
+ install -m 0644 ${WORKDIR}/keylaunchrc ${D}${sysconfdir}/keylaunchrc.matchbox
+ install ${WORKDIR}/80chvt-SUID ${D}${sysconfdir}/X11/Xinit.d
+}
+
+pkg_postinst_${PN}() {
+ update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.matchbox 10
+}
+
+pkg_postrm_${PN}() {
+ update-alternatives --remove keylaunchrc /etc/keylaunchrc.matchbox
+}
============================================================
--- packages/klibc/files/fstype-sane-and-vfat.patch d4a15a94ce1fcbe5660e3ae975c493c18920219b
+++ packages/klibc/files/fstype-sane-and-vfat.patch d4a15a94ce1fcbe5660e3ae975c493c18920219b
@@ -0,0 +1,60 @@
+Patch to compile fstype util against "normal" libc (glibc/uclicb), and to
+add vfat detection.
+
+--- klibc-1.1.1/utils/fstype.c.org 2005-09-06 23:49:34.000000000 +0300
++++ klibc-1.1.1/utils/fstype.c 2007-11-24 01:07:26.000000000 +0200
+@@ -13,11 +13,18 @@
+ */
+
+ #include <sys/types.h>
++#include <linux/types.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <endian.h>
+ #include <netinet/in.h>
++#if __BYTE_ORDER == __BIG_ENDIAN
++#include <linux/byteorder/big_endian.h>
++#else
++#include <linux/byteorder/little_endian.h>
++#endif
++
+
+ #define cpu_to_be32(x) __cpu_to_be32(x) /* Needed by romfs_fs.h */
+
+@@ -105,6 +112,18 @@
+ return 0;
+ }
+
++static int vfat_image(const unsigned char *buf, unsigned long *blocks)
++{
++ const struct romfs_super_block *sb =
++ (const struct romfs_super_block *)buf;
++ if (!strncmp(buf + 54, "FAT12 ", 8)
++ || !strncmp(buf + 54, "FAT16 ", 8)
++ || !strncmp(buf + 82, "FAT32 ", 8))
++ return 1;
++
++ return 0;
++}
++
+ static int minix_image(const unsigned char *buf, unsigned long *blocks)
+ {
+ const struct minix_super_block *sb =
+@@ -167,8 +186,6 @@
+ (const struct xfs_sb *)buf;
+
+ if (__be32_to_cpu(sb->sb_magicnum) == XFS_SB_MAGIC) {
+- *blocks = __be64_to_cpu(sb->sb_dblocks) *
+- (__be32_to_cpu(sb->sb_blocksize) / BLOCK_SIZE);
+ return 1;
+ }
+ return 0;
+@@ -184,6 +201,7 @@
+ { 0, "gzip", gzip_image },
+ { 0, "cramfs", cramfs_image },
+ { 0, "romfs", romfs_image },
++ { 0, "vfat", vfat_image },
+ { 0, "xfs", xfs_image },
+ { 1, "minix", minix_image },
+ { 1, "ext3", ext3_image },
============================================================
--- packages/klibc/klibc-utils-fstype_1.1.1.bb aee9890849d771d8cb3019aa6ec1ac6af845eea7
+++ packages/klibc/klibc-utils-fstype_1.1.1.bb aee9890849d771d8cb3019aa6ec1ac6af845eea7
@@ -0,0 +1,14 @@
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2"
+SRC_URI += "file://fstype-sane-and-vfat.patch;patch=1"
+PR = "r0"
+
+S = "${WORKDIR}/klibc-${PV}"
+
+do_compile() {
+ ${CC} -o fstype utils/fstype.c -static
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -m 0755 fstype ${D}${bindir}/
+}
============================================================
--- conf/machine/include/zaurus-2.6.inc dd6df1661a3592e1baef87d454ec3ce4f0987d2c
+++ conf/machine/include/zaurus-2.6.inc 6cb1d601b80af4a29b59dd760b6939447fa49736
@@ -55,7 +55,7 @@ zaurus_make_installkit () {
cp gnu-tar ${IMAGE_NAME}-installkit/
cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
else
- cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+ [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
fi
# All zaurus machines except collie need updater.sh
============================================================
--- packages/busybox/busybo%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rbe33ed116b217c668a13a0dae151271036541f73 -r7b04765c94afb788dc59f2a111e90fc43a46c4a4
#
#
#
# patch "packages/maemo4/hildon-libs_0.15.1.bb"
# from [82121928acd0b7f4806d37f69289f023e88e6773]
# to [24694015d14a42572f39bd8fb6bfa0f236dc3725]
#
============================================================
--- packages/maemo4/hildon-libs_0.15.1.bb 82121928acd0b7f4806d37f69289f023e88e6773
+++ packages/maemo4/hildon-libs_0.15.1.bb 24694015d14a42572f39bd8fb6bfa0f236dc3725
@@ -1,7 +1,7 @@ DESCRIPTION = "Nokia hildon librares"
LICENSE = "LGPL"
DESCRIPTION = "Nokia hildon librares"
-DEPENDS = "gtk-doc-native libosso"
+DEPENDS = "gtk-doc-native libosso libmatchbox"
PR = "r0"
More information about the Openembedded-commits
mailing list