[oe-commits] org.oe.dev merge of 'a1ae39784d60dda6b344012a273c0a4f2a339a97'

mickeyl commit oe at amethyst.openembedded.net
Mon Sep 1 18:13:13 UTC 2008


merge of 'a1ae39784d60dda6b344012a273c0a4f2a339a97'
     and 'e5687f708388bd5700f6433bd38eecc7e0f1ebd1'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3b0f014f1b02d9fd50cff57686aa707a6d1569d8
ViewMTN: http://monotone.openembedded.org/revision/info/3b0f014f1b02d9fd50cff57686aa707a6d1569d8
Files:
1
packages/maemo/hildon-home
packages/nonworking/maemo/hildon-home
packages/maemo/hildon-home_0.8.20-2.bb
packages/nonworking/maemo/hildon-home_0.8.20-2.bb
packages/gpe-memo
packages/nonworking/maemo
packages/u-boot/u-boot-git/akita
packages/u-boot/u-boot-git/c7x0
packages/atd/atd_0.80.bb
packages/gpe-memo/gpe-memo_0.2.bb
packages/nandlogical/nandlogical-static_1.0.0.bb
packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch
packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch
packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch
packages/u-boot/u-boot-git/pdaXrom-u-boot.patch
packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch
MAINTAINERS
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc
packages/apt/apt-native_0.6.46.2.bb
packages/apt/apt-native_0.7.2.bb
packages/apt/apt-native_0.7.3.bb
packages/apt/apt-package.inc
packages/apt/apt_0.5.28.6.bb
packages/apt/apt_0.6.25.bb
packages/apt/apt_0.6.46.2.bb
packages/apt/apt_0.7.2.bb
packages/apt/apt_0.7.3.bb
packages/dhcp/dhcp_3.0.1.bb
packages/dhcp/dhcp_3.0.2.bb
packages/maemo4/osso-gnome-vfs2_2.16.3.bb
packages/nandlogical/nandlogical_1.0.0.bb
packages/python/python-pycap_0.1.6.bb
packages/tangogps/tangogps-fso_0.9.2.bb
packages/u-boot/u-boot_git.bb
packages/sysstat
packages/sysstat/sysstat_8.1.5.bb
packages/images/fso-image.bb
Diffs:

#
# mt diff -ra1ae39784d60dda6b344012a273c0a4f2a339a97 -r3b0f014f1b02d9fd50cff57686aa707a6d1569d8
#
#
#
# rename "packages/maemo/hildon-home"
#     to "packages/nonworking/maemo/hildon-home"
# 
# rename "packages/maemo/hildon-home_0.8.20-2.bb"
#     to "packages/nonworking/maemo/hildon-home_0.8.20-2.bb"
# 
# add_dir "packages/gpe-memo"
# 
# add_dir "packages/nonworking/maemo"
# 
# add_dir "packages/u-boot/u-boot-git/akita"
# 
# add_dir "packages/u-boot/u-boot-git/c7x0"
# 
# add_file "packages/atd/atd_0.80.bb"
#  content [ce5c151d027312306ae72407176c902fd5e2df01]
# 
# add_file "packages/gpe-memo/gpe-memo_0.2.bb"
#  content [388b2fac728542b4c47ba5fa38942475892fd5e8]
# 
# add_file "packages/nandlogical/nandlogical-static_1.0.0.bb"
#  content [c6eb029366961e0afd263bbe27cd2e6cd0078dcf]
# 
# add_file "packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch"
#  content [1745cb136349f6b3095458128c6e4db6076b8864]
# 
# add_file "packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch"
#  content [f9b0e2ea1193aa2d42961d5d2fe27de32a578a5f]
# 
# add_file "packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch"
#  content [fa75eafa60d12fff0eb8e9f9e840878fc43cfbb2]
# 
# add_file "packages/u-boot/u-boot-git/pdaXrom-u-boot.patch"
#  content [4408ce632dc8396c6b94f28eef04221966d57e5f]
# 
# add_file "packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch"
#  content [fc8a7fd372731a45ff3a96eb8e871e75b8f11f48]
# 
# patch "MAINTAINERS"
#  from [86c3ad4586fdf8bb08b7b9755791703eda5da5bf]
#    to [28764cdcfdb341b03a06748138a4f33addd9a882]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [03774e09909d289cb199f67da23c9d23a86db032]
#    to [cbbb69b48411373416615825a20788cb411d02dc]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [3695a9c6c8bc8f564bfab557a07a7e454aa63eb3]
#    to [cf047c3c8c3891be3a3ebe03a25ca6e2f491fb49]
# 
# patch "packages/apt/apt-native_0.6.46.2.bb"
#  from [df9f37be753866b1cc3ed597d51f32c1b95bfb30]
#    to [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
# 
# patch "packages/apt/apt-native_0.7.2.bb"
#  from [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
#    to [b0989d5e0870cc4e217b461d8365a97faa3193c6]
# 
# patch "packages/apt/apt-native_0.7.3.bb"
#  from [b0989d5e0870cc4e217b461d8365a97faa3193c6]
#    to [b296813333921222120126bf76051ba8dcbd29cd]
# 
# patch "packages/apt/apt-package.inc"
#  from [776b438ed4e20204678a1baba2ed113b69e73334]
#    to [82aefdf060f85e22aa8a3f790687444c01de80c1]
# 
# patch "packages/apt/apt_0.5.28.6.bb"
#  from [97cef0ebac33a0363846bc944cb9e768a614e2fa]
#    to [dd4e71e08d5ca242b3f590ca87ea5d555a20bce4]
# 
# patch "packages/apt/apt_0.6.25.bb"
#  from [0f3a5a95b1f9de3a0c08c450223a098240be0e11]
#    to [16d6cbc9351adceca7f15831bf0bfba0c2c82c12]
# 
# patch "packages/apt/apt_0.6.46.2.bb"
#  from [f19c6a43f30f0f7b3b2bb4f99efa8133afc8082c]
#    to [ae7a0357c0bb8db7bbe66b435fc016d45fb1db98]
# 
# patch "packages/apt/apt_0.7.2.bb"
#  from [63322e840f089261ba0cacb99e97bda6eb5b1998]
#    to [4c83441a8d95f0cfcd8f51265118cf5956ff58ae]
# 
# patch "packages/apt/apt_0.7.3.bb"
#  from [b35d540f7bc7597c24ad2ee48b326f68b11b2a73]
#    to [4c83441a8d95f0cfcd8f51265118cf5956ff58ae]
# 
# patch "packages/dhcp/dhcp_3.0.1.bb"
#  from [508e25e8ed777c42989948a97808577033112e60]
#    to [561093eb489c489029221984b0556f3de883d7c2]
# 
# patch "packages/dhcp/dhcp_3.0.2.bb"
#  from [22a60b2567e7a2cf31517547c1c7800734714419]
#    to [ec84b1ca88bad4389f98262e2bbcb8f313bd2556]
# 
# patch "packages/maemo4/osso-gnome-vfs2_2.16.3.bb"
#  from [3665eb673cea6a75e2df36a17daa87464aeb50c4]
#    to [7586b901cf335cd8829daea1fe516b43468ba635]
# 
# patch "packages/nandlogical/nandlogical_1.0.0.bb"
#  from [f493f382978d1edc9d0c042c782c35c2142ae57c]
#    to [e8d8e415634193d69b9888bc2a858b0cda67e6d9]
# 
# patch "packages/python/python-pycap_0.1.6.bb"
#  from [5c95e2aad4740b75fcf55cd0d2136e6caf2dff31]
#    to [5968e263ec11a89dcdc59e13683ea260e4e27f45]
# 
# patch "packages/tangogps/tangogps-fso_0.9.2.bb"
#  from [5cbb978159e893365e050b41da156f5424b7d760]
#    to [625bd01843b531550ed8c10bb2dd04c1d9fab151]
# 
# patch "packages/u-boot/u-boot_git.bb"
#  from [dd5c9df20b550f8e184483944ba911d7de096d98]
#    to [d93f9d9cf79035943fc20dd1da8a9819c287ce12]
#
============================================================
--- packages/atd/atd_0.80.bb	ce5c151d027312306ae72407176c902fd5e2df01
+++ packages/atd/atd_0.80.bb	ce5c151d027312306ae72407176c902fd5e2df01
@@ -0,0 +1,14 @@
+DESCRIPTION = "Lightweight At Daemon"
+SECTION = "base"
+LICENSE = "GPLV2"
+RCONFLICTS = "at"
+RREPLACES = "at"
+
+PR = "r0"
+
+SRC_URI = "http://projects.linuxtogo.org/frs/download.php/222/${P}.tar.gz"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "atd"
+INITSCRIPT_PARAMS = "defaults 97"
============================================================
--- packages/gpe-memo/gpe-memo_0.2.bb	388b2fac728542b4c47ba5fa38942475892fd5e8
+++ packages/gpe-memo/gpe-memo_0.2.bb	388b2fac728542b4c47ba5fa38942475892fd5e8
@@ -0,0 +1,9 @@
+DESCRIPTION = "GPE Voice Notes Recorder"
+SECTION = "gpe/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget libgsm gpe-soundserver"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe autotools
+
============================================================
--- packages/nandlogical/nandlogical-static_1.0.0.bb	c6eb029366961e0afd263bbe27cd2e6cd0078dcf
+++ packages/nandlogical/nandlogical-static_1.0.0.bb	c6eb029366961e0afd263bbe27cd2e6cd0078dcf
@@ -0,0 +1,5 @@
+require nandlogical_${PV}.bb
+
+do_compile () {
+	${CC} -o nandlogical ${WORKDIR}/nandlogical.c -static
+}
============================================================
--- packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch	1745cb136349f6b3095458128c6e4db6076b8864
+++ packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch	1745cb136349f6b3095458128c6e4db6076b8864
@@ -0,0 +1,18 @@
+--- tangogps-0.9.2/src/gps_functions.c~	2008-08-15 05:54:26.000000000 +0930
++++ tangogps-0.9.2/src/gps_functions.c	2008-08-15 23:29:19.000000000 +0930
+@@ -649,6 +649,7 @@
+ 		int timestamp, double latitude, double longitude, double altitude, void *user_data)
+ {
+ 	if (gpsdata->valid) {
++		gpsdata->fix.time = timestamp;
+ 		gpsdata->fix.latitude = latitude;
+ 		gpsdata->fix.longitude = longitude;
+ 		gpsdata->fix.altitude = altitude;
+@@ -664,6 +665,7 @@
+ static void on_course_changed(GypsyCourse *course, GypsyCourseFields fields_set,
+ 		int timestamp, double speed, double direction, double climb, void *user_data)
+ {
++	gpsdata->fix.time = timestamp;
+ 	gpsdata->fix.speed = speed/3.6;
+ 	gpsdata->fix.track = direction;
+ }
============================================================
--- packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch	f9b0e2ea1193aa2d42961d5d2fe27de32a578a5f
+++ packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch	f9b0e2ea1193aa2d42961d5d2fe27de32a578a5f
@@ -0,0 +1,112 @@
+--- git/include/configs/akita.h	2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/akita.h	2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ 	"if testkey 101 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x00060000 0x00540000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home); " \
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 2 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 18 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; "	 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; "	 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 3 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; "	 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; "	 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"nand read.logical 0xa1000000 0x005a0000 0x00160000; "								\
+-	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " 	\
++	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home); " \
+ 	"bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND	"" // "run boot_flash"
+ #endif
+ 
+-#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192"
++#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG	 1	/* enable passing of ATAGs	*/
+ #define CONFIG_INITRD_TAG	 1
+@@ -302,9 +302,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+ 
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT		"nand0=laze-0"
++#define MTDIDS_DEFAULT		"nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT	"mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT	"mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT	"mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home)"
+ 
+ /*
+  * SHARP SL NAND logical partition
+--- git/include/configs/akita.h	2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/akita.h	2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ 	"if testkey 101 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x00060000 0x00540000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " \
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 2 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 18 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; "	 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; "	 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 3 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; "	 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; "	 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"nand read.logical 0xa1000000 0x005a0000 0x00160000; "								\
+-	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " 	\
++	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " \
+ 	"bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND	"" // "run boot_flash"
+ #endif
+ 
+-#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192"
++#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG	 1	/* enable passing of ATAGs	*/
+ #define CONFIG_INITRD_TAG	 1
+@@ -302,9 +302,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+ 
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT		"nand0=laze-0"
++#define MTDIDS_DEFAULT		"nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT	"mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT	"mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT	"mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home)"
+ 
+ /*
+  * SHARP SL NAND logical partition
============================================================
--- packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch	fa75eafa60d12fff0eb8e9f9e840878fc43cfbb2
+++ packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch	fa75eafa60d12fff0eb8e9f9e840878fc43cfbb2
@@ -0,0 +1,112 @@
+--- git/include/configs/corgi.h 2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/corgi.h	2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ 	"if testkey 101 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x00060000 0x00540000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192; " 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home); " 		\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 2 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1; " 				\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait; " 			\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 18 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1; "			 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait; "			 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 3 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1; "			 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait; "			 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"nand read.logical 0xa0800000 0x005a0000 0x00160000; "								\
+-	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2; " 			\
++	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home); " 	\
+	"bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND	"" // "run boot_flash"
+ #endif
+ 
+-#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192"
++#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG	 1	/* enable passing of ATAGs	*/
+ #define CONFIG_INITRD_TAG	 1
+@@ -304,9 +304,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+ 
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT		"nand0=laze-0"
++#define MTDIDS_DEFAULT		"nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT	"mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT	"mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT	"mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home)"
+ 
+ /*
+  * SHARP SL NAND logical partition
+--- git/include/configs/corgi.h 2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/corgi.h	2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ 	"if testkey 101 ; "					%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -re5687f708388bd5700f6433bd38eecc7e0f1ebd1 -r3b0f014f1b02d9fd50cff57686aa707a6d1569d8
#
#
#
# add_dir "packages/sysstat"
# 
# add_file "packages/sysstat/sysstat_8.1.5.bb"
#  content [0dad3525c7cdc27d60bff198bc7631736117ea7d]
# 
# patch "packages/images/fso-image.bb"
#  from [c1ef8880079b495bdb218a51113abbbd36449724]
#    to [c8a13bba7a46ab4c7fb795f650086b0a34e45787]
#
============================================================
--- packages/sysstat/sysstat_8.1.5.bb	0dad3525c7cdc27d60bff198bc7631736117ea7d
+++ packages/sysstat/sysstat_8.1.5.bb	0dad3525c7cdc27d60bff198bc7631736117ea7d
@@ -0,0 +1,15 @@
+DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux."
+HOMEPAGE = "http://pagesperso-orange.fr/sebastien.godard/"
+LICENSE = "GPL"
+SECTION = "console/utils"
+
+SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz"
+
+inherit autotools
+
+do_configure_prepend() {
+	sed -i s,'-g $(MAN_GROUP)','', Makefile.in
+}
+
+FILES_${PN} += "${libdir}/sa"
+
============================================================
--- packages/images/fso-image.bb	c1ef8880079b495bdb218a51113abbbd36449724
+++ packages/images/fso-image.bb	c8a13bba7a46ab4c7fb795f650086b0a34e45787
@@ -50,6 +50,7 @@ TOOLS_INSTALL = "\
   nano \
   powertop \
   s3c24xx-gpio \
+  sysstat \
 "
 
 # audio






More information about the Openembedded-commits mailing list