[oe-commits] org.oe.dev merge of 'd5e892324794fc60bc2f9d3d05e2463b239b42e6'
hrw commit
openembedded-commits at lists.openembedded.org
Mon Dec 31 00:04:26 UTC 2007
merge of 'd5e892324794fc60bc2f9d3d05e2463b239b42e6'
and 'fec9ba8dd1d3f080f4ff412cd91e24d939767c8c'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 7f2527bb5dab1af46f76cf7659235bfe2e2afa0d
ViewMTN: http://monotone.openembedded.org/revision/info/7f2527bb5dab1af46f76cf7659235bfe2e2afa0d
Files:
1
packages/linux/linux-rp-2.6.23/hrw-add-wcf11-to-hostap.patch
packages/linux/linux-rp_2.6.23.bb
packages/ixp4xx/ixp4xx-npe-2.4
packages/ixp4xx/ixp4xx-npe-2.4/Intel
classes/openmoko-base.bbclass
packages/gpe-nmf/gpe-nmf.inc
packages/gpe-nmf/gpe-nmf_0.22.bb
packages/ixp4xx/ixp4xx-npe_2.4.bb
packages/nslu2-binary-only/unslung-rootfs/NOTES
packages/nslu2-binary-only/unslung-rootfs/README
packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
packages/vlc/vlc-gpe_0.7.2.bb
packages/vlc/vlc-gpe_0.8.1.bb
packages/vlc/vlc-gpe_0.8.4.bb
Diffs:
#
# mt diff -rd5e892324794fc60bc2f9d3d05e2463b239b42e6 -r7f2527bb5dab1af46f76cf7659235bfe2e2afa0d
#
#
#
# add_file "packages/linux/linux-rp-2.6.23/hrw-add-wcf11-to-hostap.patch"
# content [153189a76a51142fd7ddc71a5f22d17e03aa0009]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [8669211af91c2e92da225af2d5f701fedd90c4d1]
# to [603e0da5a4842a65698a8cd0d2464f9e910f9f52]
#
============================================================
--- packages/linux/linux-rp-2.6.23/hrw-add-wcf11-to-hostap.patch 153189a76a51142fd7ddc71a5f22d17e03aa0009
+++ packages/linux/linux-rp-2.6.23/hrw-add-wcf11-to-hostap.patch 153189a76a51142fd7ddc71a5f22d17e03aa0009
@@ -0,0 +1,31 @@
+From: Marcin Juszkiewicz <openembedded at haerwu.biz>
+
+Linksys WCF11 submitted by Ångström user.
+
+"The Linksys Group, Inc.", "Wireless Network CF Card", "ISL37300P", "RevA",
+0xa5f472c2, 0x9c05598d, 0xc9049a39, 0x57a66194
+manfid: 0x0274, 0x3301
+
+Signed-off-by: Marcin Juszkiewicz <openembedded at haerwu.biz>
+Acked-by: Pavel Roskin <proski at gnu.org>
+
+---
+ drivers/net/wireless/hostap/hostap_cs.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- linux-2.6.23.orig/drivers/net/wireless/hostap/hostap_cs.c
++++ linux-2.6.23/drivers/net/wireless/hostap/hostap_cs.c
+@@ -887,10 +887,13 @@ static struct pcmcia_device_id hostap_cs
+ "Ver. 1.00",
+ 0x5cd01705, 0x4271660f, 0x9d08ee12),
+ PCMCIA_DEVICE_PROD_ID123(
+ "corega", "WL PCCL-11", "ISL37300P",
+ 0xa21501a, 0x59868926, 0xc9049a39),
++ PCMCIA_DEVICE_PROD_ID1234(
++ "The Linksys Group, Inc.", "Wireless Network CF Card", "ISL37300P",
++ 0xa5f472c2, 0x9c05598d, 0xc9049a39),
+ PCMCIA_DEVICE_NULL
+ };
+ MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
+
+
============================================================
--- packages/linux/linux-rp_2.6.23.bb 8669211af91c2e92da225af2d5f701fedd90c4d1
+++ packages/linux/linux-rp_2.6.23.bb 603e0da5a4842a65698a8cd0d2464f9e910f9f52
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r17"
+PR = "r18"
DEFAULT_PREFERENCE_qemuarm = "-1"
DEFAULT_PREFERENCE_qemux86 = "-1"
@@ -17,6 +17,7 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
# Patches submitted upstream are towards top of this list
# Hacks should clearly named and at the bottom
SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
+ file://hrw-add-wcf11-to-hostap.patch;patch=1;status=pending \
${RPSRC}/lzo_jffs2-r3.patch;patch=1 \
${RPSRC}/lzo_crypto-r2.patch;patch=1 \
${RPSRC}/lzo_jffs2_lzomode-r1.patch;patch=1 \
#
# mt diff -rfec9ba8dd1d3f080f4ff412cd91e24d939767c8c -r7f2527bb5dab1af46f76cf7659235bfe2e2afa0d
#
#
#
# add_dir "packages/ixp4xx/ixp4xx-npe-2.4"
#
# add_file "packages/ixp4xx/ixp4xx-npe-2.4/Intel"
# content [d7972e8b3ee1055b25a24c37c281268309bfa0e9]
#
# patch "classes/openmoko-base.bbclass"
# from [ad268b1283c424f167a62d88d466d50839c0b122]
# to [190482ff2527b65694d5c8a5a5efdb494547d661]
#
# patch "packages/gpe-nmf/gpe-nmf.inc"
# from [ba981daced296eea8b6ca437c8cabbfad9f14a66]
# to [2286a8989425e34e062eab16ec8742ed834924b7]
#
# patch "packages/gpe-nmf/gpe-nmf_0.22.bb"
# from [c13653a8065274c3c6d84de81b28b2b4c60b555b]
# to [33c7ba42d42cca0c3fbfb011980b7f7f860a74b1]
#
# patch "packages/ixp4xx/ixp4xx-npe_2.4.bb"
# from [96a7443ad2d24af9c5148c5c0108ab76d9ef1cdc]
# to [6b2f094d5f9c1beaef5b08d10275a3e1608b209e]
#
# patch "packages/nslu2-binary-only/unslung-rootfs/NOTES"
# from [1018d616738e4db8f4052776eefe6e68335785d1]
# to [1175fa063822e35cb7d37f1902fc899b93d427b0]
#
# patch "packages/nslu2-binary-only/unslung-rootfs/README"
# from [7317daabbdc813eacd82e1fed65976d665bbeb95]
# to [9333318f5c1cdd9d9bf5875ae94c1d975edfc071]
#
# patch "packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb"
# from [0645c1c97b8a92be945e7b8f0378c21a210c9f69]
# to [2a4b9747404f4ddaab6c5c9ed40dbcc4e0caa0b6]
#
# patch "packages/vlc/vlc-gpe_0.7.2.bb"
# from [3c9277948892c71f4ecf8f446f6f4419372bd7d6]
# to [5a720c2280e73410764a91f1ae52aa2369eda69a]
#
# patch "packages/vlc/vlc-gpe_0.8.1.bb"
# from [b9d7c2e75d06396e824c28fcda06b6861dd1ab86]
# to [736acaacd779791ccd8e1b461cd5c5348517bd92]
#
# patch "packages/vlc/vlc-gpe_0.8.4.bb"
# from [be71590e015f8a11016c5f2d7743ba31cc9541df]
# to [affbdb48d0b8f91851b97653ee6cdc84a3cf71e8]
#
============================================================
--- packages/ixp4xx/ixp4xx-npe-2.4/Intel d7972e8b3ee1055b25a24c37c281268309bfa0e9
+++ packages/ixp4xx/ixp4xx-npe-2.4/Intel d7972e8b3ee1055b25a24c37c281268309bfa0e9
@@ -0,0 +1,40 @@
+The ixp4xx-npe package (which installs unmodified Intel NPE microcode
+files in /lib/firmware/NPE-B and /lib/firmware/NPE-C) is licensed
+according to the following Intel Software License Agreement:
+
+INTEL SOFTWARE LICENSE AGREEMENT
+
+Copyright (c) 2007, Intel Corporation.
+All rights reserved.
+
+Redistribution. Redistribution and use in binary form, without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions must reproduce the above copyright notice and the
+following disclaimer in the documentation and/or other materials
+provided with the distribution.
+* Neither the name of Intel Corporation nor the names of its suppliers
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+* No reverse engineering, decompilation, or disassembly of this software is permitted.
+
+Limited patent license. Intel Corporation grants a world-wide,
+royalty-free, non-exclusive license under patents it now or hereafter
+owns or controls to make, have made, use, import, offer to sell and
+sell (.Utilize.) this software, but solely to the extent that any such
+patent is necessary to Utilize the software alone. The patent license
+shall not apply to any combinations which include this software. No
+hardware per se is licensed hereunder.
+
+DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
============================================================
--- classes/openmoko-base.bbclass ad268b1283c424f167a62d88d466d50839c0b122
+++ classes/openmoko-base.bbclass 190482ff2527b65694d5c8a5a5efdb494547d661
@@ -1,6 +1,6 @@ LICENSE ?= "GPL"
HOMEPAGE = "http://www.openmoko.org"
LICENSE ?= "GPL"
-OPENMOKO_RELEASE ?= "OM-2007"
+OPENMOKO_RELEASE ?= "OM-2007.2"
OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk"
def openmoko_base_get_subdir(d):
============================================================
--- packages/gpe-nmf/gpe-nmf.inc ba981daced296eea8b6ca437c8cabbfad9f14a66
+++ packages/gpe-nmf/gpe-nmf.inc 2286a8989425e34e062eab16ec8742ed834924b7
@@ -1,5 +1,5 @@ DESCRIPTION = "GPE audio player"
DESCRIPTION = "GPE audio player"
-SECTION = "gpe"
+SECTION = "gpe/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins"
============================================================
--- packages/gpe-nmf/gpe-nmf_0.22.bb c13653a8065274c3c6d84de81b28b2b4c60b555b
+++ packages/gpe-nmf/gpe-nmf_0.22.bb 33c7ba42d42cca0c3fbfb011980b7f7f860a74b1
@@ -1,8 +1,8 @@ RRECOMMENDS += "gst-plugin-ivorbis gst-p
require gpe-nmf.inc
RDEPENDS += "gst-plugin-decodebin"
RRECOMMENDS += "gst-plugin-ivorbis gst-plugin-tcp"
-PR = "r2"
+PR = "r3"
SRC_URI += " file://playlist-segfault.patch;patch=1;pnum=0 \
file://fix-includepath.patch;patch=1"
============================================================
--- packages/ixp4xx/ixp4xx-npe_2.4.bb 96a7443ad2d24af9c5148c5c0108ab76d9ef1cdc
+++ packages/ixp4xx/ixp4xx-npe_2.4.bb 6b2f094d5f9c1beaef5b08d10275a3e1608b209e
@@ -1,6 +1,6 @@ DESCRIPTION = "NPE firmware for the IXP4
DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
-LICENSE = "Intel Software Licence Agreement"
-PR = "r0"
+LICENSE = "Intel"
+PR = "r1"
DEPENDS = "ixp4xx-npe-native"
# You need to download the IPL_ixp400NpeLibrary-2_4.zip file (without crypto) from:
@@ -9,7 +9,8 @@ DEPENDS = "ixp4xx-npe-native"
# and put it in your downloads directory so bitbake will find it.
# Make sure you *read* and accept the license - it is not a standard one.
-SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip"
+SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip \
+ file://Intel"
S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
@@ -28,6 +29,8 @@ do_install() {
rm ${S}/NPE-C
mv ${S}/NPE-C.* ${S}/NPE-C
install ${S}/NPE-C ${D}/${base_libdir}/firmware/
+ install -d ${D}/${datadir}/common-licenses/
+ install -m 0644 ${WORKDIR}/Intel ${D}${datadir}/common-licenses/
}
do_populate_staging() {
============================================================
--- packages/nslu2-binary-only/unslung-rootfs/NOTES 1018d616738e4db8f4052776eefe6e68335785d1
+++ packages/nslu2-binary-only/unslung-rootfs/NOTES 1175fa063822e35cb7d37f1902fc899b93d427b0
@@ -567,3 +567,7 @@ installation and configuration processes
containing startup script, which are executed. This facilitates easy
customization of the boot for debugging purposes, or even automated
installation and configuration processes.
+
+6.10:
+
+Second beta release.
============================================================
--- packages/nslu2-binary-only/unslung-rootfs/README 7317daabbdc813eacd82e1fed65976d665bbeb95
+++ packages/nslu2-binary-only/unslung-rootfs/README 9333318f5c1cdd9d9bf5875ae94c1d975edfc071
@@ -1,370 +1,177 @@
-Unslung-6.x Family Release README INSTALLATION
+ Unslung-6.10 README
-You must follow the steps in this README *exactly*. Do not skip any steps, and
-do not skip ahead thinking you know what you are doing and that therefore you
-don't need to follow instructions step by step.
-
If at any time you have any questions concerning the installation or operation
of Unslung firmware, your first port of call should be the NSLU2-Linux wiki at:
- http://www.nslu2-linux.org
+ http://www.nslu2-linux.org
-If you are looking for further Unslung notes - including ipkg usage, diversion
-script details, or ChangeLog information, please consult the associated Unslung
-NOTES file.
+Additional information, including ChangeLog information can be found in the
+associated Unslung NOTES file as well as on the NSLU2-Linux wiki.
-------------------------------------------------------------------------------
There are three parts to completing the installation of the Unslung firmware:
- 1 - PRE-INSTALLATION CONSIDERATIONS
- 2 - FIRMWARE INSTALLATION DETAILS
- 3 - UNSLINGING DETAILS
+ 1 - PRE-INSTALLATION CONSIDERATIONS
+ 2 - FIRMWARE INSTALLATION DETAILS
+ 3 - UNSLINGING DETAILS
+1) PRE-INSTALLATION CONSIDERATIONS
-PRE-INSTALLATION CONSIDERATIONS
+a) You *must* confirm that you can enter "upgrade mode" using the Reset Button
+method. This is necessary because once you install Unslung, you will be unable
+to use the web GUI to reflash the device; the Reset Button technique will be
+required to install new firmware, upgrade, or recover from a bad flash:
-1) You *must* test telnet Redboot access first before you flash the Unslung
- firmware. Failure to do so will mean you get no sympathy at all if you
- can't access Redboot when you need to recover from a bad flash. See
+ http://www.nslu2-linux.org/wiki/HowTo/UseTheResetButtonToEnterUpgradeMode
- http://www.nslu2-linux.org/wiki/HowTo/TelnetIntoRedBoot
+To upload the firmware, use either the Sercomm Update Utility (for Windows
+users) or the UpSlug2 Utility (for Linux and MacOS X users):
- - Redboot is the bootloader that runs when the device is first started,
- loading things into memory and starting Linux. By testing your
- ability to telnet into Redboot, you are ensuring that if you injure
- your NSLU2 with a bad flash you should be able to follow the "How
- To Recover From A Bad Flash" instructions at
+ http://www.nslu2-linux.org/wiki/Main/SercommFirmwareUpdater
+ http://www.nslu2-linux.org/wiki/Main/UpSlug2
+ http://www.nslu2-linux.org/wiki/Main/UpSlug2onOSX
- http://www.nslu2-linux.org/wiki/HowTo/RecoverFromABadFlash
+b) You must have an external USB disk drive or an external USB flash device.
+There are a number of considerations to take into account in selecting the size
+and type of external device as well as which of the two USB ports to use:
-2) If you want to install any packages, then you must have an external USB
- disk drive or an external USB flash disk. It is possible to make changes
- to the root filesystem in the internal flash storage, but the space is
- very limited. In fact, just running the "ipkg update" operation on an
- NSLU2 which does not have an external storage device of some sort attached
- will most likely render the NSLU2 unusable due to filling up its internal
- flash memory (if this happens then you will need to follow the recovery
- instructions in the previous step.) So unless you are an expert, use
- an external storage device. The remainder of these instructions assume
- that you have a suitable external disk or flash disk that you will be
- using for this purpose.
+ http://www.nslu2-linux.org/wiki/Unslung/StorageBasics
+ http://www.nslu2-linux.org/wiki/Unslung/WhichUSBPortforUnslung6
- A few words on selecting which port to use:
+It is important to make sure that the device you intend to use is functional
+with the standard Linksys firmware before you attempt to use it with Unslung.
- Completely contrary to previous versions of Unslung, the preferred port
- for the Unslung external disk as of Unslung 6.x is often port 2. This
- will free up the far-more-flexible port number 1 for other uses.
+c) Review any known issues and errata:
- However, this "feature" (part of the Linksys R63 firmware) may cause some
- small consternation for users upgrading from earlier versions of Unslung.
- But in general, swapping the drives between the two ports will likely be
- the least painful solution. The basic challenge faced by upgraders is
- that *something* must change: if the drive remains in port 1, then it will
- remain mounted at "/share/hdd/..." but the drive nomenclature will change
- from "/dev/sda" to "/dev/sdb". On the other hand, if the drive is moved
- to port 2, then it will remain "/dev/sda" but it will then be mounted at
- "/share/flash/...". What difference this might make depends on each
- individual configuration; check the wiki for possible assistance for your
- particular configuration.
+ http://www.nslu2-linux.org/wiki/Unslung/KnownProblems
- For new users, the following guidelines can help:
- - if you have only a single drive that will be formatted by the NSLU2,
- use port 2.
- - if you have a single drive that will be formatted by the NSLU2, and
- all other drives or flash devices will be either FAT or NTFS, use
- port 2.
- - if you have two drives, and both will be formatted by the NSLU2, then
- unsling to the drive in port 1.
+(Hint: read the wiki pages carefully to determine the firmware release to which
+they apply; many of the pages contain information pertaining to older versions
+of Unslung, or even to other firmware entirely.)
- If you unsling to port 2, and later add a drive in port 1 that will
- be formatted by the NSLU2, it will work as expected -- however, the
- drive to be added MUST be formatted by the unslung NSLU2 in question,
- and once formatted, the drive must NOT be removed. (The Linksys code
- will move it's "conf" datafiles to the drive in port 1 during the
- format operation, and thus will become dependent upon the presence of
- both drives for proper operation.)
+2) FIRMWARE INSTALLATION DETAILS
-3) The external disk that you use as the target for package installation must
- be (or have previously been) formatted by the NSLU2.
+The installation process is simple, but each step is important. The most
+common problems reported are a result of skipping one of the steps in this
+process, so be careful. In particular, having a disk or flash device plugged
+in when it shouldn't be can mean the difference between success and failure.
- Since this point qualifies as a "frequently asked question", it is
- worth some clarification here. It is only possible to unsling to
- a disk that has been formatted by the NSLU2 - you cannot unsling to a
- FAT or NTFS disk. In fact, it is not sufficient to format the disk
- using another UNIX system -- in order to be recognized as a "Formatted
- (ext3)" disk by the NSLU2, and hence be suitable for unslinging, the
- disk must be specifically partitioned, formatted, and the partitions
- must contain a specific set of configuration files created by the
- NSLU2. So the simple rule is that if the NSLU2 web interface "Disk"
- page does not list the disk as "Formatted (ext3)", you will be unable
- to unsling to that disk.
+a) Preparation
- For upgrading users, it is possible to upgrade from all previous Unslung
- versions without reformatting your disk -- but not necessarily recommended.
- See the wiki article for recommended upgrade strategies:
+- Install either the Sercomm (Windows) or the UpSlug2 (Linux and MacOS X)
+ utilities on the system you'll be using to upload the firmware.
- http://www.nslu2-linux.org/wiki/Unslung/UpgradingToUnslung6
+- Access the Linksys web GUI, and record your network settings.
- The unsling script will not touch anything in /unslung or /opt on your
- disk, so make sure all your file modifications are in those directories,
- as you were warned in the README file in all previous Unslung versions :-)
+- Shutdown the NSLU2 and unplug all USB cables and devices.
-4) If you want to use a flash disk as the target for package installation,
- ensure that it is at least 256MB, and formatted as above via the
- Linksys web interface.
+b) Flashing the New Firmware
-5) Please verify that any disks you are going to c%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list