[oe-commits] org.oe.dev merge of '4a88a5ffedd700d28476cfaa227e1fde7e0a2fed'
coredump2 commit
openembedded-commits at lists.openembedded.org
Sun Dec 23 15:03:29 UTC 2007
merge of '4a88a5ffedd700d28476cfaa227e1fde7e0a2fed'
and '7cacda73f6295d69f1f1e7f92b77d847df223b1b'
Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: dea29cf1273bb4cfff36b29c045addf8da667a98
ViewMTN: http://monotone.openembedded.org/revision/info/dea29cf1273bb4cfff36b29c045addf8da667a98
Files:
1
packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
packages/meta/unslung-binary-kernel-packages.bb
packages/linux/linux-handhelds-2.6
packages/linux/linux-handhelds-2.6-2.6.21
packages/apex/files/find-apex-partition.patch
packages/images/nas-server-image.bb
packages/meta/meta-nas-server.bb
packages/tasks/task-nas-server.bb
conf/distro/angstrom-2007.1.conf
conf/machine/h2200.conf
conf/machine/h5000.conf
conf/machine/hx4700.conf
contrib/angstrom/build-feeds.sh
contrib/angstrom/build-release.sh
contrib/mtn2cl/mtn2cl.sh
packages/apex/apex-env_1.5.8.bb
packages/emacs/emacs-x11_20060801.bb
packages/emacs/emacs-x11_cvs.bb
packages/emacs/emacs_20060801.bb
packages/emacs/emacs_cvs.bb
packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/linux/linux-handhelds-2.6_cvs.bb
packages/tasks/task-base.bb
packages/tzdata/tzdata_2007e.bb
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
Diffs:
#
# mt diff -r4a88a5ffedd700d28476cfaa227e1fde7e0a2fed -rdea29cf1273bb4cfff36b29c045addf8da667a98
#
#
#
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb"
#
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb"
#
# delete "packages/meta/unslung-binary-kernel-packages.bb"
#
# rename "packages/linux/linux-handhelds-2.6"
# to "packages/linux/linux-handhelds-2.6-2.6.21"
#
# add_file "packages/apex/files/find-apex-partition.patch"
# content [a1985a204e000e121aa7918bb0754ef375def89a]
#
# add_file "packages/images/nas-server-image.bb"
# content [4a3d731bbbd71dc410b89cd730fedb91cfa12035]
#
# add_file "packages/meta/meta-nas-server.bb"
# content [9c2144c3cf312ea4f3c3d49d14faace452af7137]
#
# add_file "packages/tasks/task-nas-server.bb"
# content [62167ff91124b6983115d92bd330e863aac1d877]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [f9c15c2c88454482d0a24c83a7c22662378223a2]
# to [6496adbe7d3ff5fdeb0d8698e9a86d70c2d8fa29]
#
# patch "conf/machine/h2200.conf"
# from [631917e12eef6e20330b4c190ce6f535a9eb3ed3]
# to [73636ed45d256967ed2b6da85adaf7af07cc9fb4]
#
# patch "conf/machine/h5000.conf"
# from [e3be93bf378f53331316ca75535d32465f86f9b0]
# to [fc55c08e143a46f2863d188a7c378b8cc3ee2f2c]
#
# patch "conf/machine/hx4700.conf"
# from [8a9b68dd63f3be8457ae064682536c7c1912b241]
# to [537fcae072d2c76e87e7f1e735e333ccae1bb34a]
#
# patch "contrib/angstrom/build-feeds.sh"
# from [efb9672fb85bdd8c252fe8d9bf0529ecb3281647]
# to [e970609068ec55dfd2d83caf4f29f6981ac2defe]
#
# patch "contrib/angstrom/build-release.sh"
# from [47b470ed8a0841c920889e9c992dc07dc4334413]
# to [9d5f537d764ff8ed751baf7c1ba2d41b8829d875]
#
# patch "contrib/mtn2cl/mtn2cl.sh"
# from [0d004fb6d3ce380462f24c195693e3753e5445c0]
# to [ea613a6b9c807fd6939677392252634926996ebf]
#
# patch "packages/apex/apex-env_1.5.8.bb"
# from [fdbc0b6132572b780b950c96db6cdd6c7f609f7d]
# to [802ae62b74a85155710d25eb4ad8101aab3c8f44]
#
# patch "packages/emacs/emacs-x11_20060801.bb"
# from [3457ad840b0a38bfeae7e4a3897f212239fa70ce]
# to [965432a87967e099882c8d5767b456e842a1cb0c]
#
# patch "packages/emacs/emacs-x11_cvs.bb"
# from [e2638065bea198c09881bfdf17fc0eb51453f52e]
# to [322f28739cb2678d3893ad38afada26290e8a22c]
#
# patch "packages/emacs/emacs_20060801.bb"
# from [8060faa2c6603fe0867d73fd9f4b767a982fc6ee]
# to [797283b86be34c26ed52e37b9e07109226c07cce]
#
# patch "packages/emacs/emacs_cvs.bb"
# from [d51efb8e267b4e8787cb7949c043ba6a32691233]
# to [3aa46cad86255469e86d4335acb761ff26758023]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig"
# from [1f28f885c5d38a58e7286ab2b6ac1002fdb25919]
# to [c986d1a87b8fa694e045a150e5c8b3f104bb912d]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig"
# from [be44aaf3fb8180bec1b20f704ddcf5310f388c1a]
# to [c2c9b620fd8246b79cf6fc9a248a93d13926b09b]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig"
# from [5eb86eec70dcb5cd7849c55d2c30f3fa150c699d]
# to [3eab7d807a91664c39d9797521f5e001eb532dc1]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig"
# from [46081d5ce43fbed774749aa007f415e38a84c459]
# to [d9f8a03872694e2c0be6681f854850597378c1ae]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig"
# from [d4ecc27e27fe31f1162de33855d5f470a667f155]
# to [e91cf692230fcbdd091ac4f03bd76d0a90f4d76d]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
# from [08b3c80cfa2998d235449d22eebca4323d6fc861]
# to [8516de814611730a6b8838cd1e514bfc74949359]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig"
# from [3371e00777176fc053ef6c639da693ff9bd8177f]
# to [b38e2b0e42d029892edfbdd98314146994a3fd95]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig"
# from [ccabe93146ef341f44e458dc87655fa5b6672b04]
# to [584d8e5084b8a6299e7ccec18f2ca07bddb5a2b2]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig"
# from [ffc92b049046023011e9edc3be646f0a7171412e]
# to [d4532b4e939e3d7de2b696337dbc347880be34e4]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig"
# from [f8c89b6ee9fd85b9f73616125173acb08dcd876f]
# to [a11092b9b193dec862b1bdf2619df7c3b2dd7074]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig"
# from [a4b32acece2cb8b3cabcfdf0bfb966fbcc84f727]
# to [bbd3533d10c6c745448c5e92c3799fb591b10dc0]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig"
# from [28a648c7ed768cc6d1893808d60c138957994101]
# to [916c7fb59ffee9d08c8eea9927fb2f5087fe3bed]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig"
# from [728952328872977446a2a1f5c5d517fd85b77fe6]
# to [928f2aee6999e7fb23171cb5d087888c4378daa2]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig"
# from [d0b072fcacb3d1198cf6492b6a8d9f4842a8deb6]
# to [2c150fb9e8042a7b8f19d820d120b42df5744f45]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig"
# from [4298a8b960bf2bbbf29d0117be20cc2ddcc2dbfc]
# to [4be5cf341de440a0b942bfbab818e10554d0f2eb]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig"
# from [a0b1e58b136d82b046c1f9f09ea54fe319ef7b9e]
# to [02d4621765d3dc9cbfedebf028cb011d88a63c5d]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig"
# from [6be07a550a272c9438b89e3aa72f0077a228b33a]
# to [cfc4330f5746e2b1c98989d3fdbfea4800fb7667]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig"
# from [4f4cc6cbb707682abc20f3d4f416354fb10ec460]
# to [1102b410bd3d8153c18f41afde3028d699c7d85f]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig"
# from [69f3e1be12eb511255b730a73ceca46476781aa1]
# to [d7e0bd9a6211fe5fefee01e67b04e6bf6356f45a]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig"
# from [dcb72d61b8285f06ef5d4ffb05edddde96c8e41a]
# to [f228f1ef12b6ad82b61392c2ea58bf1a534bf43c]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig"
# from [e4fc3f28dfd712bf9f578ff39add76ad21b7a470]
# to [f7e08d2a55df3845c408e8966ff07f2aa83bd5b7]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig"
# from [1c3f28a4f54b40982eb1d7a668d725f8fc66b212]
# to [89afc38bbd5dfffdce8dc5baa7471f4648de4b87]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig"
# from [2df0b2e984871d4e1a64dec9c4d294029b78f2ec]
# to [ccae20c3f62e40debe77a7fbe0a1c9cf01b17fb1]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig"
# from [a539effd5649afcb400b289746fa35d7cde586e8]
# to [941f436760a2e74c042122f4fd22e0da0880480c]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb"
# from [49685f54bf88b77f0c58a25c20ad416690435f97]
# to [75393e4feb74ea7e937ef54139a105955ca45032]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb"
# from [252b9c26ddd2fda4271f4352999ce0facbfece99]
# to [149a069ee31e27ea584bde100650235a4afbbee0]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
# from [252b9c26ddd2fda4271f4352999ce0facbfece99]
# to [f6bafabbd68cd660896b99cd7c0e97e772393a05]
#
# patch "packages/linux/linux-handhelds-2.6_cvs.bb"
# from [cde5e382dd8c6dd8cc444aa1729ad55e47f7e066]
# to [632168097c40dba491d572a468f18dac758475fb]
#
# patch "packages/tasks/task-base.bb"
# from [4872be5529c6ad0d60f8e5da1753a0fb845910a0]
# to [d85d25ffbe37f18e4269777fa917583cd172c2e0]
#
# patch "packages/tzdata/tzdata_2007e.bb"
# from [4cec1441747911151c67dda8bbb5631ff1c92169]
# to [372c0e1baf2b1ab4f6293f9fb5d4903e37f0f381]
#
============================================================
--- packages/apex/files/find-apex-partition.patch a1985a204e000e121aa7918bb0754ef375def89a
+++ packages/apex/files/find-apex-partition.patch a1985a204e000e121aa7918bb0754ef375def89a
@@ -0,0 +1,34 @@
+*** usr/link.cc.orig Sun Dec 23 20:31:49 2007
+--- usr/link.cc Sun Dec 23 20:32:46 2007
+***************
+*** 278,285 ****
+ fixed-up env_link structure, scanning for the environment variables
+ and their defaults, and opening the flash instance of the
+ environment. It first looks for the "Loader" partition. If there
+! is none, it uses the first partition with the assumption that APEX
+! may be the primary boot loader.
+
+ */
+
+--- 278,286 ----
+ fixed-up env_link structure, scanning for the environment variables
+ and their defaults, and opening the flash instance of the
+ environment. It first looks for the "Loader" partition. If there
+! is none, it then looks for the "apex" partition. If there is none,
+! it uses the first partition with the assumption that APEX may be
+! the primary boot loader.
+
+ */
+
+***************
+*** 289,294 ****
+--- 290,298 ----
+ MTDPartition mtd = MTDPartition::find ("Loader");
+
+ if (!mtd.is ())
++ mtd = MTDPartition::find ("apex");
++
++ if (!mtd.is ())
+ mtd = MTDPartition::first ();
+
+ bool fFound = mtd.is () && open_apex (mtd);
============================================================
--- packages/images/nas-server-image.bb 4a3d731bbbd71dc410b89cd730fedb91cfa12035
+++ packages/images/nas-server-image.bb 4a3d731bbbd71dc410b89cd730fedb91cfa12035
@@ -0,0 +1,47 @@
+# This image is intended to provide a configuration
+# for a network attached storage server device.
+
+# Key features are:
+#
+# 1) Must be able to mount attached storage devices like
+# internal disks, external USB disks, etc. Should support
+# various filesystem choices, but ext2 at a minimum.
+#
+# 2) Must be able to boot from internal flash, or directly
+# from a filesystem stored on the attached storage.
+#
+# 3) Must be able to share that storage across the network
+# using various protocols like Samba, NFS, etc.
+#
+# 4) Bonus points for being able to support other central
+# network services like a central gateway machine might.
+
+# Although it is tested with the Angstrom distro, it is
+# intended to be distro-agnostic.
+
+DISTRO_SSH_DAEMON ?= "dropbear"
+DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+
+DEPENDS = "task-boot task-base-apex \
+ task-distro-base task-machine-base \
+ ${DISTRO_SSH_DAEMON} \
+ ${DISTRO_PACKAGE_MANAGER} \
+ task-base-usbhost task-base-ext2 \
+ task-nas-server-everything \
+ "
+
+IMAGE_INSTALL_TASKS = "\
+ task-nas-server-everything \
+ "
+
+IMAGE_INSTALL = "task-boot task-base-apex \
+ ${DISTRO_SSH_DAEMON} \
+ ${DISTRO_PACKAGE_MANAGER} \
+ task-base-usbhost task-base-ext2 \
+ ${IMAGE_INSTALL_TASKS} \
+ "
+
+export IMAGE_BASENAME = "nas-server-image"
+IMAGE_LINGUAS = ""
+
+inherit image
============================================================
--- packages/meta/meta-nas-server.bb 9c2144c3cf312ea4f3c3d49d14faace452af7137
+++ packages/meta/meta-nas-server.bb 9c2144c3cf312ea4f3c3d49d14faace452af7137
@@ -0,0 +1,10 @@
+DESCRIPTION = "Meta-package for a network attached storage server"
+LICENSE = "MIT"
+PR = "r0"
+
+RDEPENDS = "\
+ task-nas-server-everything \
+ "
+
+inherit meta
+
============================================================
--- packages/tasks/task-nas-server.bb 62167ff91124b6983115d92bd330e863aac1d877
+++ packages/tasks/task-nas-server.bb 62167ff91124b6983115d92bd330e863aac1d877
@@ -0,0 +1,94 @@
+DESCRIPTION = "Tasks for a Network Attached Storage server"
+LICENSE = "MIT"
+PROVIDES = "task-nas-server-everything"
+PR = "r0"
+
+inherit task
+
+PACKAGES = "\
+ task-nas-server-everything \
+ ${NAS_SERVER_PACKAGES} \
+"
+
+NAS_SERVER_PACKAGES = "\
+ task-nas-server-base \
+ task-nas-server-samba \
+ task-nas-server-dnsmasq \
+ task-nas-server-iptables \
+ task-nas-server-tzdata \
+ task-nas-server-nfs \
+ task-nas-server-vfat \
+ task-nas-server-ntfs \
+ task-nas-server-ext3 \
+ task-nas-server-reiserfs \
+"
+
+RDEPENDS_task-nas-server-everything = "${NAS_SERVER_PACKAGES}"
+
+DESCRIPTION_task-nas-server-base = "NAS-Server: Base Packages"
+RDEPENDS_task-nas-server-base = "\
+"
+RRECOMMENDS_task-nas-server-base = "\
+"
+
+DESCRIPTION_task-nas-server-samba = "NAS-Server: Samba Server"
+RDEPENDS_task-nas-server-samba = "\
+ samba swat \
+"
+RRECOMMENDS_task-nas-server-samba = "\
+"
+
+DESCRIPTION_task-nas-server-dnsmasq = "NAS-Server: DNS/DHCP Server"
+RDEPENDS_task-nas-server-dnsmasq = "\
+ dnsmasq \
+"
+RRECOMMENDS_task-nas-server-dnsmasq = "\
+"
+
+DESCRIPTION_task-nas-server-iptables = "NAS-Server: Netfilter/Iptables Support"
+RDEPENDS_task-nas-server-iptables = "\
+ iptables \
+"
+RRECOMMENDS_task-nas-server-iptables = "\
+ kernel-module-iptable-nat \
+ kernel-module-iptable-mangle \
+ kernel-module-ipt-masquerade \
+"
+
+DESCRIPTION_task-nas-server-tzdata = "NAS-Server: Timezone Support"
+RDEPENDS_task-nas-server-tzdata = "\
+ tzdata \
+"
+RRECOMMENDS_task-nas-server-tzdata = "\
+"
+
+DESCRIPTION_task-nas-server-nfs = "NAS-Server: NFS Server"
+RDEPENDS_task-nas-server-nfs = "\
+ nfs-utils portmap \
+"
+RRECOMMENDS_task-nas-server-nfs = "\
+"
+
+DESCRIPTION_task-nas-server-vfat = "NAS-Server: FAT Filesystem"
+RDEPENDS_task-nas-server-vfat = "\
+"
+RRECOMMENDS_task-nas-server-vfat = "\
+"
+
+DESCRIPTION_task-nas-server-ntfs = "NAS-Server: NTFS Filesystem"
+RDEPENDS_task-nas-server-ntfs = "\
+"
+RRECOMMENDS_task-nas-server-ntfs = "\
+"
+
+DESCRIPTION_task-nas-server-ext3 = "NAS-Server: EXT3 Filesystem"
+RDEPENDS_task-nas-server-ext3 = "\
+"
+RRECOMMENDS_task-nas-server-ext3 = "\
+"
+
+DESCRIPTION_task-nas-server-reiserfs = "NAS-Server: ReiserFS Filesystem"
+RDEPENDS_task-nas-server-reiserfs = "\
+"
+RRECOMMENDS_task-nas-server-reiserfs = "\
+"
============================================================
--- conf/distro/angstrom-2007.1.conf f9c15c2c88454482d0a24c83a7c22662378223a2
+++ conf/distro/angstrom-2007.1.conf 6496adbe7d3ff5fdeb0d8698e9a86d70c2d8fa29
@@ -7,7 +7,7 @@
#@--------------------------------------------------------------------
# The release will the 2007.12
-DISTRO_VERSION = "2007.11RC2"
+DISTRO_VERSION = "2007.11RC2.1"
DISTRO_REVISION = "51"
require conf/distro/include/sane-srcdates.inc
============================================================
--- conf/machine/h2200.conf 631917e12eef6e20330b4c190ce6f535a9eb3ed3
+++ conf/machine/h2200.conf 73636ed45d256967ed2b6da85adaf7af07cc9fb4
@@ -40,7 +40,7 @@ module_autoload_snd-mixer-oss = "snd-mix
#
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-h2000-audio = "snd-h2000-audio"
+module_autoload_snd-h2200-audio = "snd-h2200-audio"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
============================================================
--- conf/machine/h5000.conf e3be93bf378f53331316ca75535d32465f86f9b0
+++ conf/machine/h5000.conf fc55c08e143a46f2863d188a7c378b8cc3ee2f2c
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te h5xxx"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
require conf/machine/include/tune-xscale.inc
@@ -31,5 +31,9 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
#
# Modules autoload and other boot properties
#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_g_ether = "g_ether"
+
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
============================================================
--- conf/machine/hx4700.conf 8a9b68dd63f3be8457ae064682536c7c1912b241
+++ conf/machine/hx4700.conf 537fcae072d2c76e87e7f1e735e333ccae1bb34a
@@ -21,7 +21,7 @@ MACHINE_DISPLAY_PPI = "200"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
MACHINE_DISPLAY_PPI = "200"
-MACHINE_FEATURES = "alsa apm bluetooth irda pcmcia screen touchscreen usbgadget wifi vfat"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 pcmcia screen touchscreen usbgadget wifi vfat"
MACHINE_FEATURES += "iwmmxt"
#
============================================================
--- contrib/angstrom/build-feeds.sh efb9672fb85bdd8c252fe8d9bf0529ecb3281647
+++ contrib/angstrom/build-feeds.sh e970609068ec55dfd2d83caf4f29f6981ac2defe
@@ -32,27 +32,29 @@ do_report_success() {
echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
}
-for machine in ep93xx gumstix-connex%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r7cacda73f6295d69f1f1e7f92b77d847df223b1b -rdea29cf1273bb4cfff36b29c045addf8da667a98
#
#
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [df64576fea94c73841caa9d194cca699ddf9575e]
# to [3414afa63a3d12e6a4cd900e882c8a621de05e1a]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [cf372a56d0952ca445d801dd6b169d120224b6f2]
# to [4e7ce92476e14eae15da3323c9fee7f76494fe15]
#
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh df64576fea94c73841caa9d194cca699ddf9575e
+++ packages/zaurus-updater/zaurus-updater/updater.sh 3414afa63a3d12e6a4cd900e882c8a621de05e1a
@@ -34,6 +34,11 @@
# - Reformatted file - please use spaces not tabs
# - "version check" is only on Tosa and Poodle - breaks other machines
#
+# 2007.12.23 Matthias 'CoreDump' Hentges
+# - Fix kernel install on spitz machines
+# - Unify format of do_flashing()...
+# - Display ${PR} of zaurus-updater.bb to the user
+# - Polish HDD installer messages
DATAPATH=$1
TMPPATH=/tmp/update
@@ -120,16 +125,19 @@ do_rootfs_extraction()
do_rootfs_extraction()
{
UNPACKED_ROOTFS=1
- echo 'HDD root file system'
+ echo 'Installing HDD root file system'
if [ ! -f /hdd1/NotAvailable ]; then
umount /hdd1
fi
- echo 'Now formatting...'
+ echo -n '* Now formatting...'
mke2fs $MKE2FSOPT /dev/${IDE1}1 > /dev/null 2>&1
e2fsck -p /dev/${IDE1}1 > /dev/null
if [ "$?" != "0" ]; then
+ echo "FAILED"
echo "Error: Unable to create filesystem on microdrive!"
exit "$?"
+ else
+ echo "Done"
fi
mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
@@ -139,14 +147,17 @@ do_rootfs_extraction()
fi
cd /hdd1
- echo 'Now extracting...'
+ echo -n '* Now extracting (this can take over 5m)...'
gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
if [ "$?" != "0" ]; then
+ echo "FAILED"
echo "Error: Unable to extract root filesystem archive!"
exit "$?"
+ else
+ echo "Done"
fi
- echo 'Done.'
+ echo 'HDD Installation Finished.'
# remount as RO
cd /
@@ -156,60 +167,67 @@ do_flashing()
do_flashing()
{
- if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
- then
- echo "Error: File is too big to flash!"
- echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
- return
- fi
+ if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
+ then
+ echo "Error: File is too big to flash!"
+ echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
+ return
+ fi
- if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
- then
- #check version
- /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
- if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
- then
- #no version info...
- rm -f $TMPHEAD > /dev/null 2>&1
- DATAPOS=0
- fi
- fi
+ if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
+ then
+ #check version
+ /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
+
+ if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
+ then
+ #no version info...
+ rm -f $TMPHEAD > /dev/null 2>&1
+ DATAPOS=0
+ fi
+ fi
- if [ $ISFORMATTED = 0 ]
- then
- /sbin/eraseall $TARGET_MTD > /dev/null 2>&1
- ISFORMATTED=1
- fi
+ if [ $ISFORMATTED = 0 ]
+ then
+ /sbin/eraseall $TARGET_MTD > /dev/null 2>&1
+ ISFORMATTED=1
+ fi
- echo ''
- echo '0% 100%'
- PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
- PROGSTEP=`expr 25 / $PROGSTEP`
- if [ $PROGSTEP = 0 ]
- then
- PROGSTEP=1
- fi
+ if [ -e $TMPHEAD ]
+ then
+ VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
+ MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
+ /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
- if [ -e $TMPHEAD ]
- then
- VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
- MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
- /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
- /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+ /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
+ /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
+ fi
- /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
- /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
- fi
-
- # Looks like Akita is quite unique when it comes to kernel flashing
+ # Looks like Akita and Spitz are unique when it comes to kernel flashing
- if [ "$ZAURUS" = "akita" ] && [ $FLASH_TYPE = kernel ]; then
- echo $TARGETFILE':'$DATASIZE'bytes'
- echo ' ' > /tmp/data
- /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
- /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
- /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1
- else
+ if [ "$ZAURUS" = "akita" -o "$ZAURUS" = "c3x00" ] && [ "$FLASH_TYPE" = "kernel" ]
+ then
+# echo $TARGETFILE':'$DATASIZE'bytes'
+ echo ""
+ echo -n "Installing SL-Cxx00 kernel..."
+ echo ' ' > /tmp/data
+ test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
+ test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1
+ echo "Done"
+ else
+
+ echo ''
+ echo '0% 100%'
+ PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
+ PROGSTEP=`expr 25 / $PROGSTEP`
+
+ if [ $PROGSTEP = 0 ]
+ then
+ PROGSTEP=1
+ fi
+
#loop
while [ $DATAPOS -lt $DATASIZE ]
do
@@ -246,27 +264,29 @@ do_flashing()
done
done
fi
- echo ''
+ echo ''
- #finish
- rm -f $TMPPATH/*.bin > /dev/null 2>&1
+ #finish
+ rm -f $TMPPATH/*.bin > /dev/null 2>&1
- if [ $RESULT = 0 ]
- then
- if [ -e $VTMPNAME ]
- then
- /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
- rm -f $VTMPNAME > /dev/null 2>&1
- fi
- if [ -e $MTMPNAME ]
- then
- /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
- rm -f $MTMPNAME > /dev/null 2>&1
- fi
- echo 'Done.'
- else
- echo 'Error!'
- fi
+ if [ $RESULT = 0 ]
+ then
+ if [ -e $VTMPNAME ]
+ then
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+ rm -f $VTMPNAME > /dev/null 2>&1
+ fi
+
+ if [ -e $MTMPNAME ]
+ then
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+ rm -f $MTMPNAME > /dev/null 2>&1
+ fi
+
+ [ "$FLASH_TYPE" != "kernel" ] && echo 'Done.'
+ else
+ echo 'Error!'
+ fi
}
### Check model ###
@@ -300,6 +320,8 @@ esac
;;
esac
+clear
+echo "---- Universal Zaurus Updater ZAURUS_UPDATER_VERSION ----"
echo 'MODEL: '$MODEL' ('$ZAURUS')'
mkdir -p $TMPPATH > /dev/null 2>&1
============================================================
--- packages/zaurus-updater/zaurus-updater.bb cf372a56d0952ca445d801dd6b169d120224b6f2
+++ packages/zaurus-updater/zaurus-updater.bb 4e7ce92476e14eae15da3323c9fee7f76494fe15
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r18"
+PR = "r19"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -11,6 +11,11 @@ S = "${WORKDIR}"
file://gnu-tar.gz"
S = "${WORKDIR}"
+do_configure() {
+ cat "${S}/updater.sh" | sed "s/ZAURUS_UPDATER_VERSION/${PR}/" > "${S}/updater.sh_"
+ mv "${S}/updater.sh_" "${S}/updater.sh"
+}
+
do_compile() {
encdec-updater -e updater.sh
}
More information about the Openembedded-commits
mailing list