From 7ba05735b3c0b79e98d3a9168c73857ec48b430f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 30 Jun 2005 09:48:23 +0000 Subject: initial nslu2-linux infrastructure checkin --- .mtn-ignore | 7 +++ .mtn2git_empty | 0 Makefile | 74 ++++++++++++++++++++++++++++++ openslug/.mt-ignore | 4 ++ openslug/.mtn2git_empty | 0 openslug/Makefile | 48 ++++++++++++++++++++ openslug/conf/.mt-ignore | 1 + openslug/conf/.mtn2git_empty | 0 openslug/conf/local.conf.template | 96 +++++++++++++++++++++++++++++++++++++++ unslung/.mt-ignore | 4 ++ unslung/.mtn2git_empty | 0 unslung/Makefile | 48 ++++++++++++++++++++ unslung/conf/.mt-ignore | 1 + unslung/conf/.mtn2git_empty | 0 unslung/conf/local.conf.template | 59 ++++++++++++++++++++++++ 15 files changed, 342 insertions(+) create mode 100644 .mtn-ignore create mode 100644 .mtn2git_empty create mode 100644 Makefile create mode 100644 openslug/.mt-ignore create mode 100644 openslug/.mtn2git_empty create mode 100644 openslug/Makefile create mode 100644 openslug/conf/.mt-ignore create mode 100644 openslug/conf/.mtn2git_empty create mode 100644 openslug/conf/local.conf.template create mode 100644 unslung/.mt-ignore create mode 100644 unslung/.mtn2git_empty create mode 100644 unslung/Makefile create mode 100644 unslung/conf/.mt-ignore create mode 100644 unslung/conf/.mtn2git_empty create mode 100644 unslung/conf/local.conf.template diff --git a/.mtn-ignore b/.mtn-ignore new file mode 100644 index 0000000000..170b9c14e8 --- /dev/null +++ b/.mtn-ignore @@ -0,0 +1,7 @@ +bitbake +downloads +monotone +oe-symlinks +openembedded +optware + diff --git a/.mtn2git_empty b/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000..c56fcbc417 --- /dev/null +++ b/Makefile @@ -0,0 +1,74 @@ +# Makefile for the NSLU2 Linux development system +# Licensed under the GPL v2 or later + +all: update build + +build: unslung-build openslug-build optware-build + +setup: monotone-setup bitbake-setup openembedded-setup oe-symlinks-setup optware-setup + +update: monotone-update bitbake-update openembedded-update oe-symlinks-update optware-update + +clobber: optware-clobber oe-symlinks-clobber openembedded-clobber bitbake-clobber + +unslung-build: + ( cd unslung ; make ) + +openslug-build: + ( cd openslug ; make ) + +optware-build: + ( cd optware ; make ) + +monotone-setup monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: + [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) + ( monotone -d monotone/nslu2-linux.db pull ewi546.ewi.utwente.nl org.openembedded ) + ( monotone -d monotone/nslu2-linux.db unset database default-server ) + ( monotone -d monotone/nslu2-linux.db unset database default-collection ) + ( monotone -d monotone/nslu2-linux.db pull mtn.nslu2-linux.org org ) + [ -e MT ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) + [ -e downloads ] || mkdir -p downloads + [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) + [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) + +monotone-update: monotone/nslu2-linux.db + monotone pull && monotone update + +bitbake-setup bitbake/bin/bitbake: + [ -e bitbake/bin/bitbake ] || ( svn co svn://svn.berlios.de/bitbake/trunk/bitbake ) + +bitbake-update: bitbake/bin/bitbake + ( cd bitbake ; svn update ) + +bitbake-clobber: + rm -rf bitbake + +openembedded-setup openembedded/conf/machine/nslu2.conf: + [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded + +openembedded-update: openembedded/conf/machine/nslu2.conf + ( cd openembedded ; monotone update ) + +openembedded-clobber: + rm -rf openembedded + +oe-symlinks-setup oe-symlinks/packages: + [ -e oe-symlinks/packages ] || ( svn co svn://svn.berlios.de/openslug/trunk/openslug/nslu2-linux oe-symlinks ) + +oe-symlinks-update: oe-symlinks/packages + ( cd oe-symlinks ; svn update ) + +oe-symlinks-clobber: + rm -rf oe-symlinks + +optware-setup optware/Makefile: + [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) + [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) + +optware-update: optware/Makefile + ( cd optware ; cvs update -d -P ) + +optware-clobber: + rm -rf optware + +# End of Makefile diff --git a/openslug/.mt-ignore b/openslug/.mt-ignore new file mode 100644 index 0000000000..dd5df82133 --- /dev/null +++ b/openslug/.mt-ignore @@ -0,0 +1,4 @@ +downloads +openslug-source.tar.gz +setup-env +tmp diff --git a/openslug/.mtn2git_empty b/openslug/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openslug/Makefile b/openslug/Makefile new file mode 100644 index 0000000000..a0c0ec1e72 --- /dev/null +++ b/openslug/Makefile @@ -0,0 +1,48 @@ +# Makefile for OpenSlug +# Licensed under the GPL v2 or later + +openslug-firmware: setup-env conf/local.conf + ( source setup-env ; bitbake openslug-packages ) + +# This does the same thing but with a clean environment +# The HOME setting prevents user environment settings +# from changing the build. CCACHE_DIR is necessary to +# prevent ccache (if installed) attempting to use a +# .cache in the home directory. +openslug-firmware-safe: setup-env conf/local.conf + env -i CCACHE_DISABLE=1 CCACHE_DIR="`pwd`/tmp/ccache" HOME=/dev/null \ + sh -c 'source setup-env; bitbake openslug-packages' + +setup-env: + [ -e bitbake ] || ( ln -s ../bitbake . ) + [ -e downloads ] || ( ln -s ../downloads . ) + [ -e openembedded ] || ( ln -s ../openembedded . ) + [ -e oe-symlinks ] || ( ln -s ../oe-symlinks . ) + echo 'OEROOT='`pwd` > setup-env + echo 'OESYS=$$OEROOT/bitbake/' >> setup-env + echo 'PKGDIR=$$OEROOT/openembedded/' >> setup-env + echo 'OEBUILD=$$OEROOT' >> setup-env + echo 'export PYTHONPATH=$$OESYS/lib' >>setup-env + echo 'export BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env + echo 'export PATH=$$OESYS/bin/:$$PATH' >> setup-env + echo 'export LD_LIBRARY_PATH=' >> setup-env + echo 'export LANG=C' >> setup-env + echo 'unset LC_CTYPE' >> setup-env + echo 'unset CC' >> setup-env + echo 'unset CXX' >> setup-env + echo 'alias bb=bitbake' >> setup-env + echo 'echo Environment set up for OpenSlug development.' >> setup-env + +conf/local.conf: + sed -e "s|%%%OEROOT%%%|`pwd`|" conf/local.conf.template > conf/local.conf + +clobber: + rm -rf tmp + +openslug-source: + tar zcvf openslug-source.tar.gz --exclude=MT Makefile bitbake conf openembedded oe-symlinks + +distclean: clobber + rm -rf setup-env conf/local.conf bitbake downloads openembedded oe-symlinks + +# End of Makefile diff --git a/openslug/conf/.mt-ignore b/openslug/conf/.mt-ignore new file mode 100644 index 0000000000..f21e1b217b --- /dev/null +++ b/openslug/conf/.mt-ignore @@ -0,0 +1 @@ +local.conf diff --git a/openslug/conf/.mtn2git_empty b/openslug/conf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openslug/conf/local.conf.template b/openslug/conf/local.conf.template new file mode 100644 index 0000000000..f5095c54c5 --- /dev/null +++ b/openslug/conf/local.conf.template @@ -0,0 +1,96 @@ +OEROOT = "%%%OEROOT%%%" + +# Use this to specify where OE should place the downloaded sources into +DL_DIR = "${OEROOT}/downloads" + +# Delete the line below. Then specify which .oe files to consider for +# your build. Typically this will be something like OEFILES = "/path/to/packages/*/*.oe" +# BBFILES := "/home/slug/openembedded/packages/*/*.bb" +BBFILES := "${OEROOT}/oe-symlinks/packages/*/*.bb" + +# Use the OEMASK below to instruct OE to _NOT_ consider some .oe files +# This is a regulary expression, so be sure to get your parenthesis balanced. +OEMASK = "" + +# Uncomment this if you want to use a prebuilt toolchain. You will need to +# provide packages for toolchain and additional libraries yourself. You also +# have to set PATH in your environment to make sure OE finds additional binaries. +# Note: You will definitely need to say: +# ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" +# to build any of two Linux 2.4 Embedix kernels, +# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget +# to rename the binaries as instructed in the Wiki. +# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc" + +# Select between multiple alternative providers, if more than one is eligible. +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +# Uncomment this to specify where OE should create its temporary files. +# Note that a full build of everything in OE will take GigaBytes of hard +# disk space, so make sure to free enough space. The default TMPDIR is +# /tmp +TMPDIR = ${OEROOT}/tmp + +# Uncomment this to specify a machine to build for. See the conf directory +# for machines currently known to OpenEmbedded. +MACHINE = "nslu2" + +# Uncomment this to select a distribution policy. See the conf directory +# for distributions currently known to OpenEmbedded. +DISTRO = "openslug" + +# Add to this any extra projects (packages) to be built with the image +# (look in openembedded/packages/openslug-packages.bb for a list of +# packages known to build with openslug.) +OPENSLUG_EXTRA_DEPENDS = "" + +# Add to this specific built .ipk package names to add to the image. +# These will be included in the root flash file system stored on the +# NSLU2. Be careful not to fill the file system, OpenSlug will not +# boot if the file system is close to full. +OPENSLUG_EXTRA_RDEPENDS = "" + +# Support for a variety of file systems is built in to the openslug +# image, programs to format disks with these file systems may be +# added or removed. By default ext2. ext3 and reiserfs supported +# is included by the following lines. +# +# These lines add support for formatting ext2 and ext3 file systems +# on a hard disk attached to the NSLU2. ext3 is the standard Linux +# file system. (OPENSLUG_EXT2_PROGS is defined in +# openembedded/conf/distro/openslug.conf) +OPENSLUG_EXTRA_DEPENDS += "e2fsprogs" +OPENSLUG_EXTRA_RDEPENDS += "${OPENSLUG_EXT2_PROGS}" + +# These lines add support for formatting reiserfs file systems on +# a hard disk. +OPENSLUG_EXTRA_DEPENDS += "reiserfsprogs" +OPENSLUG_EXTRA_RDEPENDS += "reiserfsprogs" + +# These lines add a build of the 'upslug' program which may be +# used to download the final image to an NSLU2. The program can +# be found within the tmp/work/upslug-native* directory. +OPENSLUG_EXTRA_DEPENDS += "upslug-native" + +# These lines add support for an X/Y/ZModem package called lrzsz +# (this is of use for people with modified NSLU2 hardware which +# supports a serial port.) +OPENSLUG_EXTRA_DEPENDS += "lrzsz" +OPENSLUG_EXTRA_RDEPENDS += "lrzsz" + + +# Uncomment this to disable the parse cache (not recommended). +CACHE = "${OEROOT}/tmp/cache" + +# Uncomment this if you want OE to emit the log if a build fails. +OEINCLUDELOGS = "yes" + +# Specifies a location to search for pre-generated tarballs when fetching +# a cvs:// URI. Uncomment this, if you not want to pull directly from CVS. +CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" + +# INHERIT += "src_distribute_local pkg_distribute" + +# EDIT THIS FILE and then remove the line below before using! diff --git a/unslung/.mt-ignore b/unslung/.mt-ignore new file mode 100644 index 0000000000..2cf465fead --- /dev/null +++ b/unslung/.mt-ignore @@ -0,0 +1,4 @@ +downloads +unslung-source.tar.gz +setup-env +tmp diff --git a/unslung/.mtn2git_empty b/unslung/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/unslung/Makefile b/unslung/Makefile new file mode 100644 index 0000000000..b64453007b --- /dev/null +++ b/unslung/Makefile @@ -0,0 +1,48 @@ +# Makefile for Unslung +# Licensed under the GPL v2 or later + +unslung-firmware: setup-env conf/local.conf + (source setup-env ; bitbake unslung-packages) + +# This does the same thing but with a clean environment +# The HOME setting prevents user environment settings +# from changing the build. CCACHE_DIR is necessary to +# prevent ccache (if installed) attempting to use a +# .cache in the home directory. +unslung-firmware-safe: setup-env conf/local.conf + env -i CCACHE_DISABLE=1 CCACHE_DIR="`pwd`/tmp/ccache" HOME=/dev/null \ + sh -c 'source setup-env; bitbake unslung-packages' + +setup-env: + [ -e bitbake ] || ( ln -s ../bitbake . ) + [ -e downloads ] || ( ln -s ../downloads . ) + [ -e openembedded ] || ( ln -s ../openembedded . ) + [ -e oe-symlinks ] || ( ln -s ../oe-symlinks . ) + echo 'OEROOT='`pwd` > setup-env + echo 'OESYS=$$OEROOT/bitbake/' >> setup-env + echo 'PKGDIR=$$OEROOT/openembedded/' >> setup-env + echo 'OEBUILD=$$OEROOT' >> setup-env + echo 'BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env + echo 'PATH=$$OESYS/bin/:$$PATH' >> setup-env + echo 'LD_LIBRARY_PATH=' >> setup-env + echo 'export PATH LD_LIBRARY_PATH BBPATH' >> setup-env + echo 'export LANG=C' >> setup-env + echo 'unset LC_CTYPE' >> setup-env + echo 'unset CC' >> setup-env + echo 'unset CXX' >> setup-env + echo 'alias bb=bitbake' >> setup-env + echo 'echo Environment set up for Unslung development.' >> setup-env + +conf/local.conf: + sed -e "s|%%%OEROOT%%%|`pwd`|" conf/local.conf.template > conf/local.conf + +clobber: + rm -rf tmp + +unslung-source: + tar zcvf unslung-source.tar.gz --exclude=MT Makefile bitbake conf openembedded oe-symlinks + +distclean: clobber + rm -f setup-env conf/local.conf bitbake downloads openembedded oe-symlinks + +# End of Makefile diff --git a/unslung/conf/.mt-ignore b/unslung/conf/.mt-ignore new file mode 100644 index 0000000000..f21e1b217b --- /dev/null +++ b/unslung/conf/.mt-ignore @@ -0,0 +1 @@ +local.conf diff --git a/unslung/conf/.mtn2git_empty b/unslung/conf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/unslung/conf/local.conf.template b/unslung/conf/local.conf.template new file mode 100644 index 0000000000..a13923f749 --- /dev/null +++ b/unslung/conf/local.conf.template @@ -0,0 +1,59 @@ +OEROOT = "%%%OEROOT%%%" + +# Use this to specify where OE should place the downloaded sources into +DL_DIR = "${OEROOT}/downloads" + +# Delete the line below. Then specify which .oe files to consider for +# your build. Typically this will be something like OEFILES = "/path/to/packages/*/*.oe" +# BBFILES := "/home/slug/openembedded/packages/*/*.bb" +BBFILES := "${OEROOT}/oe-symlinks/packages/*/*.bb" + +# Use the OEMASK below to instruct OE to _NOT_ consider some .oe files +# This is a regulary expression, so be sure to get your parenthesis balanced. +OEMASK = "" + +# Uncomment this if you want to use a prebuilt toolchain. You will need to +# provide packages for toolchain and additional libraries yourself. You also +# have to set PATH in your environment to make sure OE finds additional binaries. +# Note: You will definitely need to say: +# ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" +# to build any of two Linux 2.4 Embedix kernels, +# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget +# to rename the binaries as instructed in the Wiki. +# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc" + +# Select between multiple alternative providers, if more than one is eligible. +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +# Uncomment this to specify where OE should create its temporary files. +# Note that a full build of everything in OE will take GigaBytes of hard +# disk space, so make sure to free enough space. The default TMPDIR is +# /tmp +TMPDIR = ${OEROOT}/tmp + +# Uncomment this to specify a machine to build for. See the conf directory +# for machines currently known to OpenEmbedded. +MACHINE = "nslu2" + +# Uncomment this to select a distribution policy. See the conf directory +# for distributions currently known to OpenEmbedded. +DISTRO = "unslung" + +OPENSLUG_EXTRA_DEPENDS = "" +OPENSLUG_EXTRA_RDEPENDS = "" + +# Uncomment this to disable the parse cache (not recommended). +CACHE = "${OEROOT}/tmp/cache" + +# Uncomment this if you want OE to emit the log if a build fails. +OEINCLUDELOGS = "yes" + +# Specifies a location to search for pre-generated tarballs when fetching +# a cvs:// URI. Uncomment this, if you not want to pull directly from CVS. +CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" + +# INHERIT += "src_distribute_local pkg_distribute" + +# EDIT THIS FILE and then remove the line below before using! -- cgit v1.2.3 From fbf9d621ed0b800a47c2eacb01414ce50dec37b9 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 30 Jun 2005 09:56:22 +0000 Subject: Updated Makefile for new repository location --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c56fcbc417..2cb86072b8 100644 --- a/Makefile +++ b/Makefile @@ -22,10 +22,10 @@ optware-build: monotone-setup monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) - ( monotone -d monotone/nslu2-linux.db pull ewi546.ewi.utwente.nl org.openembedded ) + ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded ) ( monotone -d monotone/nslu2-linux.db unset database default-server ) ( monotone -d monotone/nslu2-linux.db unset database default-collection ) - ( monotone -d monotone/nslu2-linux.db pull mtn.nslu2-linux.org org ) + ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org ) [ -e MT ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) [ -e downloads ] || mkdir -p downloads [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) -- cgit v1.2.3 From 68e56dca371c4f1cc0ad409e2759c68ea7961774 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 2 Jul 2005 07:43:52 +0000 Subject: Renamed most targets to be active voice, and added PHONY declarations. --- Makefile | 94 +++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 61 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index 2cb86072b8..b602b15fff 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,35 @@ # Makefile for the NSLU2 Linux development system # Licensed under the GPL v2 or later +.PHONY: all all: update build -build: unslung-build openslug-build optware-build +.PHONY: build +build: build-unslung build-openslug build-optware -setup: monotone-setup bitbake-setup openembedded-setup oe-symlinks-setup optware-setup +.PHONY: setup +setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks setup-optware -update: monotone-update bitbake-update openembedded-update oe-symlinks-update optware-update +.PHONY: update +update: update-master update-bitbake update-openembedded update-oe-symlinks update-optware -clobber: optware-clobber oe-symlinks-clobber openembedded-clobber bitbake-clobber +.PHONY: clobber +clobber: clobber-optware clobber-oe-symlinks clobber-openembedded clobber-bitbake -unslung-build: +.PHONY: unslung build-unslung +unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( cd unslung ; make ) -openslug-build: +.PHONY: openslug build-openslug +openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( cd openslug ; make ) -optware-build: +.PHONY: optware build-optware +optware build-optware: optware/Makefile ( cd optware ; make ) -monotone-setup monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: +.PHONY: setup-master +setup-master monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded ) ( monotone -d monotone/nslu2-linux.db unset database default-server ) @@ -31,44 +40,63 @@ monotone-setup monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) -monotone-update: monotone/nslu2-linux.db - monotone pull && monotone update - -bitbake-setup bitbake/bin/bitbake: +.PHONY: setup-bitbake +setup-bitbake bitbake/bin/bitbake: [ -e bitbake/bin/bitbake ] || ( svn co svn://svn.berlios.de/bitbake/trunk/bitbake ) -bitbake-update: bitbake/bin/bitbake - ( cd bitbake ; svn update ) +.PHONY: setup-openembedded +setup-openembedded openembedded/conf/machine/nslu2.conf: monotone/nslu2-linux.db + [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded -bitbake-clobber: - rm -rf bitbake +.PHONY: setup-oe-symlinks +setup-oe-symlinks oe-symlinks/packages: + [ -e oe-symlinks/packages ] || ( svn co svn://svn.berlios.de/openslug/trunk/openslug/nslu2-linux oe-symlinks ) -openembedded-setup openembedded/conf/machine/nslu2.conf: - [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded +.PHONY: setup-optware +setup-optware optware/Makefile: + [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) + [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) -openembedded-update: openembedded/conf/machine/nslu2.conf - ( cd openembedded ; monotone update ) +.PHONY: update-master +update-master: monotone/nslu2-linux.db + monotone pull && monotone update -openembedded-clobber: - rm -rf openembedded +.PHONY: update-bitbake +update-bitbake: bitbake/bin/bitbake + ( cd bitbake ; svn update ) -oe-symlinks-setup oe-symlinks/packages: - [ -e oe-symlinks/packages ] || ( svn co svn://svn.berlios.de/openslug/trunk/openslug/nslu2-linux oe-symlinks ) +.PHONY: update-openembedded +update-openembedded: openembedded/conf/machine/nslu2.conf + ( cd openembedded ; monotone pull && monotone update ) -oe-symlinks-update: oe-symlinks/packages +.PHONY: update-oe-symlinks +update-oe-symlinks: oe-symlinks/packages ( cd oe-symlinks ; svn update ) -oe-symlinks-clobber: - rm -rf oe-symlinks +.PHONY: update-optware +update-optware: optware/Makefile + ( cd optware ; cvs update -d -P ) -optware-setup optware/Makefile: - [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) - [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) +.PHONY: clobber-bitbake +clobber-bitbake: + rm -rf bitbake -optware-update: optware/Makefile - ( cd optware ; cvs update -d -P ) +.PHONY: clobber-openembedded +clobber-openembedded: + rm -rf openembedded + +.PHONY: clobber-oe-symlinks +clobber-oe-symlinks: + rm -rf oe-symlinks -optware-clobber: +.PHONY: clobber-optware +clobber-optware: rm -rf optware +# Deprecated targets + +unslung-build : build-unslung +openslug-build : build-openslug +optware-build : build-optware + # End of Makefile -- cgit v1.2.3 From 454bea1b24e121d12495506a163b44d440077a8a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 2 Jul 2005 07:46:58 +0000 Subject: Added the push-master and upload-master targets. --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index b602b15fff..2602b22e21 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,14 @@ update-oe-symlinks: oe-symlinks/packages update-optware: optware/Makefile ( cd optware ; cvs update -d -P ) +.PHONY: push-master +push-master: monotone/nslu2-linux.db + monotone merge && monotone push + +.PHONY: upload-master +upload-master: monotone/nslu2-linux.db + scp Makefile www.nslu2-linux.org:/home/nslu2/public_html/Makefile + .PHONY: clobber-bitbake clobber-bitbake: rm -rf bitbake -- cgit v1.2.3 From 2757d7a41136a94c14b5f0ee1c2003ad10e9e482 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 2 Jul 2005 07:49:56 +0000 Subject: Fixed the upload-master target. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2602b22e21..f36e168f2e 100644 --- a/Makefile +++ b/Makefile @@ -79,11 +79,11 @@ update-optware: optware/Makefile .PHONY: push-master push-master: monotone/nslu2-linux.db - monotone merge && monotone push + monotone push .PHONY: upload-master -upload-master: monotone/nslu2-linux.db - scp Makefile www.nslu2-linux.org:/home/nslu2/public_html/Makefile +upload-master: push-master + scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile .PHONY: clobber-bitbake clobber-bitbake: -- cgit v1.2.3 From f52bde10a6e08665afdae9d371a4fffc0ba05a38 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 2 Jul 2005 09:01:55 +0000 Subject: Added a number of administrative targets --- Makefile | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f36e168f2e..4b410fd0e2 100644 --- a/Makefile +++ b/Makefile @@ -28,14 +28,19 @@ openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf optware build-optware: optware/Makefile ( cd optware ; make ) -.PHONY: setup-master -setup-master monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: +.PHONY: setup-monotone +setup-monotone monotone/nslu2-linux.db: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded ) ( monotone -d monotone/nslu2-linux.db unset database default-server ) ( monotone -d monotone/nslu2-linux.db unset database default-collection ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org ) + +unslung/Makefile openslug/Makefile: monotone/nslu2-linux.db [ -e MT ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) + +.PHONY: setup-master +setup-master: setup-monotone unslung/Makefile openslug/Makefile [ -e downloads ] || mkdir -p downloads [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) @@ -59,7 +64,11 @@ setup-optware optware/Makefile: .PHONY: update-master update-master: monotone/nslu2-linux.db - monotone pull && monotone update + monotone pull + monotone update + if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ + monotone merge -b org.nslu2-linux.dev ; \ + fi .PHONY: update-bitbake update-bitbake: bitbake/bin/bitbake @@ -67,7 +76,11 @@ update-bitbake: bitbake/bin/bitbake .PHONY: update-openembedded update-openembedded: openembedded/conf/machine/nslu2.conf - ( cd openembedded ; monotone pull && monotone update ) + monotone pull + ( cd openembedded ; monotone update ) + if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.nslu2-linux ; \ + fi .PHONY: update-oe-symlinks update-oe-symlinks: oe-symlinks/packages @@ -81,9 +94,9 @@ update-optware: optware/Makefile push-master: monotone/nslu2-linux.db monotone push -.PHONY: upload-master -upload-master: push-master - scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile +.PHONY: push-openembedded +push-openembedded: openembedded/conf/machine/nslu2.conf + ( cd openembedded ; monotone push ) .PHONY: clobber-bitbake clobber-bitbake: @@ -107,4 +120,39 @@ unslung-build : build-unslung openslug-build : build-openslug optware-build : build-optware +# Core team use only targets + +.PHONY: publish-master +publish-master: push-master + scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile + +.PHONY: import-openembedded +import-openembedded: openembedded/conf/machine/nslu2.conf + monotone pull monotone.vanille.de org.openembedded + if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.dev ; \ + fi + +.PHONY: propagate-from-oe +propagate-from-oe: + monotone propagate org.openembedded.dev org.openembedded.nslu2-linux + if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.nslu2-linux ; \ + fi + +.PHONY: propagate-to-oe +propagate-to-oe: + monotone propagate org.openembedded.nslu2-linux org.openembedded.dev + if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.dev ; \ + fi + +.PHONY: export-openembedded +export-openembedded: openembedded/conf/machine/nslu2.conf + monotone push monotone.vanille.de org.openembedded + +.PHONY: publish-openembedded +publish-openembedded: import-openembedded propagate-from-oe update-openembedded \ + propagate-to-oe push-openembedded export-openembedded + # End of Makefile -- cgit v1.2.3 From bf2b82d94119212d670f69be3a985bdb01cca984 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 2 Jul 2005 21:15:14 +0000 Subject: Fix first build so that 'make' (no args) works. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4b410fd0e2..71bff95691 100644 --- a/Makefile +++ b/Makefile @@ -36,8 +36,8 @@ setup-monotone monotone/nslu2-linux.db: ( monotone -d monotone/nslu2-linux.db unset database default-collection ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org ) -unslung/Makefile openslug/Makefile: monotone/nslu2-linux.db - [ -e MT ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) +unslung/Makefile openslug/Makefile MT/revision: monotone/nslu2-linux.db + [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) .PHONY: setup-master setup-master: setup-monotone unslung/Makefile openslug/Makefile @@ -50,7 +50,7 @@ setup-bitbake bitbake/bin/bitbake: [ -e bitbake/bin/bitbake ] || ( svn co svn://svn.berlios.de/bitbake/trunk/bitbake ) .PHONY: setup-openembedded -setup-openembedded openembedded/conf/machine/nslu2.conf: monotone/nslu2-linux.db +setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded .PHONY: setup-oe-symlinks @@ -63,7 +63,7 @@ setup-optware optware/Makefile: [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) .PHONY: update-master -update-master: monotone/nslu2-linux.db +update-master: MT/revision monotone pull monotone update if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ -- cgit v1.2.3 From 9bb59f9294687dfda51dd8832166de5d303b036f Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 3 Jul 2005 16:54:15 +0000 Subject: Fix creation of downloads directory in absence of make setup --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 71bff95691..14968fe97a 100644 --- a/Makefile +++ b/Makefile @@ -17,11 +17,11 @@ update: update-master update-bitbake update-openembedded update-oe-symlinks upda clobber: clobber-optware clobber-oe-symlinks clobber-openembedded clobber-bitbake .PHONY: unslung build-unslung -unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages +unslung build-unslung: unslung/Makefile downloads bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( cd unslung ; make ) .PHONY: openslug build-openslug -openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages +openslug build-openslug: openslug/Makefile downloads bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( cd openslug ; make ) .PHONY: optware build-optware @@ -40,7 +40,7 @@ unslung/Makefile openslug/Makefile MT/revision: monotone/nslu2-linux.db [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) .PHONY: setup-master -setup-master: setup-monotone unslung/Makefile openslug/Makefile +setup-master downloads: setup-monotone unslung/Makefile openslug/Makefile [ -e downloads ] || mkdir -p downloads [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) @@ -87,7 +87,7 @@ update-oe-symlinks: oe-symlinks/packages ( cd oe-symlinks ; svn update ) .PHONY: update-optware -update-optware: optware/Makefile +update-optware: optware/Makefile downloads ( cd optware ; cvs update -d -P ) .PHONY: push-master -- cgit v1.2.3 From ee3c72cd0baa112c221a3e9175c190f58fdde1e2 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 3 Jul 2005 20:46:05 +0000 Subject: Added upload-openslug-cross admin target --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 4b410fd0e2..22858e6abe 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,10 @@ optware-build : build-optware publish-master: push-master scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile +.PHONY: upload-openembedded-cross +upload-openslug-cross: openslug/Makefile + rsync -avr openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ + .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf monotone pull monotone.vanille.de org.openembedded -- cgit v1.2.3 From 8aee402b8b06dda6a228cb48de7c9f111c614baf Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 9 Jul 2005 08:38:40 +0000 Subject: Fixed the update-openembedded target so that it could handle multiple heads --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7d0b05ca15..302d404aec 100644 --- a/Makefile +++ b/Makefile @@ -77,10 +77,10 @@ update-bitbake: bitbake/bin/bitbake .PHONY: update-openembedded update-openembedded: openembedded/conf/machine/nslu2.conf monotone pull - ( cd openembedded ; monotone update ) if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.nslu2-linux ; \ fi + ( cd openembedded ; monotone update ) .PHONY: update-oe-symlinks update-oe-symlinks: oe-symlinks/packages -- cgit v1.2.3 From 2332977c51f23f37d3bb9b80f2ba4ba4cbbbec70 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 9 Jul 2005 18:40:02 +0000 Subject: Added new targets for non-core write access --- Makefile | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 302d404aec..7aaf2e43e6 100644 --- a/Makefile +++ b/Makefile @@ -90,14 +90,6 @@ update-oe-symlinks: oe-symlinks/packages update-optware: optware/Makefile downloads ( cd optware ; cvs update -d -P ) -.PHONY: push-master -push-master: monotone/nslu2-linux.db - monotone push - -.PHONY: push-openembedded -push-openembedded: openembedded/conf/machine/nslu2.conf - ( cd openembedded ; monotone push ) - .PHONY: clobber-bitbake clobber-bitbake: rm -rf bitbake @@ -114,13 +106,17 @@ clobber-oe-symlinks: clobber-optware: rm -rf optware -# Deprecated targets +# Targets for use by those with write access to the repositories -unslung-build : build-unslung -openslug-build : build-openslug -optware-build : build-optware +.PHONY: push-master +push-master: monotone/nslu2-linux.db + monotone push + +.PHONY: push-openembedded +push-openembedded: openembedded/conf/machine/nslu2.conf + ( cd openembedded ; monotone push ) -# Core team use only targets +# Targets for use by core team members only .PHONY: publish-master publish-master: push-master -- cgit v1.2.3 From b8f86a084abbe3356eab61744906291feb5c37d3 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 10 Jul 2005 00:36:16 +0000 Subject: lock Bitbake to 269 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7d0b05ca15..a022147238 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ setup-master downloads: setup-monotone unslung/Makefile openslug/Makefile .PHONY: setup-bitbake setup-bitbake bitbake/bin/bitbake: - [ -e bitbake/bin/bitbake ] || ( svn co svn://svn.berlios.de/bitbake/trunk/bitbake ) + [ -e bitbake/bin/bitbake ] || ( svn co -r 269 svn://svn.berlios.de/bitbake/trunk/bitbake ) .PHONY: setup-openembedded setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision -- cgit v1.2.3 From 80fba26bf889f60e9460773f88e2e9354159811a Mon Sep 17 00:00:00 2001 From: Derek Young Date: Sun, 10 Jul 2005 02:35:32 +0000 Subject: Add developer targets --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Makefile b/Makefile index 2c02e6ee37..8370dd86bb 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,9 @@ build: build-unslung build-openslug build-optware .PHONY: setup setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks setup-optware +.PHONY: setup-developer +setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks-developer setup-optware-developer + .PHONY: update update: update-master update-bitbake update-openembedded update-oe-symlinks update-optware @@ -62,6 +65,15 @@ setup-optware optware/Makefile: [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) +.PHONY: setup-oe-symlinks-developer +setup-oe-symlinks-developer oe-symlinks/packages: + [ -e oe-symlinks/packages ] || ( svn co svn+ssh://${SVN_USER}@svn.berlios.de/svnroot/repos/openslug/trunk/openslug/nslu2-linux oe-symlinks ) + +.PHONY: setup-optware-developer +setup-optware-developer optware/Makefile: + [ -e optware/Makefile ] || ( cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) + [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) + .PHONY: update-master update-master: MT/revision monotone pull -- cgit v1.2.3 From 3d46b5f67b46567411c9e2b1cf442b0a5df31db7 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 10 Jul 2005 23:41:34 +0000 Subject: lock update-bitbake to rev. 269 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c02e6ee37..c93e5371b2 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ update-master: MT/revision .PHONY: update-bitbake update-bitbake: bitbake/bin/bitbake - ( cd bitbake ; svn update ) + ( cd bitbake ; svn -r 269 update ) .PHONY: update-openembedded update-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From 9902dcdddb760757cb3aaba80432f7ef2aa8d0c1 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 10 Jul 2005 23:45:47 +0000 Subject: Make BITBAKE_REVISION change --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8206c0fe2e..82b69856d9 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ # Makefile for the NSLU2 Linux development system # Licensed under the GPL v2 or later +BITBAKE_REVISION="-r 269" # Fetch this revision of BitBake. Unset this to fetch bleeding edge. + .PHONY: all all: update build @@ -50,7 +52,7 @@ setup-master downloads: setup-monotone unslung/Makefile openslug/Makefile .PHONY: setup-bitbake setup-bitbake bitbake/bin/bitbake: - [ -e bitbake/bin/bitbake ] || ( svn co -r 269 svn://svn.berlios.de/bitbake/trunk/bitbake ) + [ -e bitbake/bin/bitbake ] || ( svn co ${BITBAKE_REVISION} svn://svn.berlios.de/bitbake/trunk/bitbake ) .PHONY: setup-openembedded setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision @@ -84,7 +86,7 @@ update-master: MT/revision .PHONY: update-bitbake update-bitbake: bitbake/bin/bitbake - ( cd bitbake ; svn -r 269 update ) + ( cd bitbake ; svn ${BITBAKE_REVISION} update ) .PHONY: update-openembedded update-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From ba81c9cff919b82fa35e8856907cb8d03a884068 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Mon, 11 Jul 2005 08:30:27 +0000 Subject: Fix the bitbake fixing line --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 82b69856d9..aeb50a51b3 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ # Makefile for the NSLU2 Linux development system # Licensed under the GPL v2 or later -BITBAKE_REVISION="-r 269" # Fetch this revision of BitBake. Unset this to fetch bleeding edge. +# Fetch this revision of BitBake. Unset this to fetch bleeding edge. +BITBAKE_REVISION=-r 269 .PHONY: all all: update build -- cgit v1.2.3 From d7a7f84a93a6d1e2383a008858d9e9e078028836 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 11 Jul 2005 08:35:03 +0000 Subject: Fixed the setup-developer targets --- Makefile | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index aeb50a51b3..7490209719 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,12 @@ # Makefile for the NSLU2 Linux development system # Licensed under the GPL v2 or later +# Change these if you are unfortunate enough to have a split net personality. +SVN_USER ?= ${USER} +CVS_USER ?= ${USER} + # Fetch this revision of BitBake. Unset this to fetch bleeding edge. -BITBAKE_REVISION=-r 269 +BITBAKE_REVISION = -r 269 .PHONY: all all: update build @@ -14,7 +18,7 @@ build: build-unslung build-openslug build-optware setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks setup-optware .PHONY: setup-developer -setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks-developer setup-optware-developer +setup-developer: setup-master setup-bitbake setup-openembedded setup-oe-symlinks-developer setup-optware-developer .PHONY: update update: update-master update-bitbake update-openembedded update-oe-symlinks update-optware @@ -63,18 +67,20 @@ setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision setup-oe-symlinks oe-symlinks/packages: [ -e oe-symlinks/packages ] || ( svn co svn://svn.berlios.de/openslug/trunk/openslug/nslu2-linux oe-symlinks ) +.PHONY: setup-oe-symlinks-developer +setup-oe-symlinks-developer: + [ -e oe-symlinks ] && ( mv oe-symlinks oe-symlinks-user ) + svn co svn+ssh://${SVN_USER}@svn.berlios.de/svnroot/repos/openslug/trunk/openslug/nslu2-linux oe-symlinks + .PHONY: setup-optware setup-optware optware/Makefile: [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) -.PHONY: setup-oe-symlinks-developer -setup-oe-symlinks-developer oe-symlinks/packages: - [ -e oe-symlinks/packages ] || ( svn co svn+ssh://${SVN_USER}@svn.berlios.de/svnroot/repos/openslug/trunk/openslug/nslu2-linux oe-symlinks ) - .PHONY: setup-optware-developer -setup-optware-developer optware/Makefile: - [ -e optware/Makefile ] || ( cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) +setup-optware-developer: + [ -e optware ] && ( mv optware optware-user ) + cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) .PHONY: update-master -- cgit v1.2.3 From 28267edfc5685c5b433df0b7392178702a900185 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 11 Jul 2005 09:32:19 +0000 Subject: Broke some superfluous dependencies --- Makefile | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7490209719..f4b3139e3f 100644 --- a/Makefile +++ b/Makefile @@ -27,11 +27,11 @@ update: update-master update-bitbake update-openembedded update-oe-symlinks upda clobber: clobber-optware clobber-oe-symlinks clobber-openembedded clobber-bitbake .PHONY: unslung build-unslung -unslung build-unslung: unslung/Makefile downloads bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages +unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( cd unslung ; make ) .PHONY: openslug build-openslug -openslug build-openslug: openslug/Makefile downloads bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages +openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( cd openslug ; make ) .PHONY: optware build-optware @@ -46,12 +46,16 @@ setup-monotone monotone/nslu2-linux.db: ( monotone -d monotone/nslu2-linux.db unset database default-collection ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org ) -unslung/Makefile openslug/Makefile MT/revision: monotone/nslu2-linux.db +downloads: + [ -e downloads ] || mkdir -p downloads + +unslung/Makefile openslug/Makefile MT/revision: + ${MAKE} downloads + [ -e monotone/nslu2-linux.db ] || ( ${MAKE} monotone/nslu2-linux.db ) [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) .PHONY: setup-master -setup-master downloads: setup-monotone unslung/Makefile openslug/Makefile - [ -e downloads ] || mkdir -p downloads +setup-master: setup-monotone unslung/Makefile openslug/Makefile [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) @@ -60,7 +64,8 @@ setup-bitbake bitbake/bin/bitbake: [ -e bitbake/bin/bitbake ] || ( svn co ${BITBAKE_REVISION} svn://svn.berlios.de/bitbake/trunk/bitbake ) .PHONY: setup-openembedded -setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision +setup-openembedded openembedded/conf/machine/nslu2.conf: + ${MAKE} MT/revision [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded .PHONY: setup-oe-symlinks @@ -74,11 +79,13 @@ setup-oe-symlinks-developer: .PHONY: setup-optware setup-optware optware/Makefile: + ${MAKE} downloads [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) .PHONY: setup-optware-developer setup-optware-developer: + ${MAKE} downloads [ -e optware ] && ( mv optware optware-user ) cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) @@ -108,7 +115,7 @@ update-oe-symlinks: oe-symlinks/packages ( cd oe-symlinks ; svn update ) .PHONY: update-optware -update-optware: optware/Makefile downloads +update-optware: optware/Makefile ( cd optware ; cvs update -d -P ) .PHONY: clobber-bitbake @@ -130,7 +137,7 @@ clobber-optware: # Targets for use by those with write access to the repositories .PHONY: push-master -push-master: monotone/nslu2-linux.db +push-master: MT/revision monotone push .PHONY: push-openembedded -- cgit v1.2.3 From bb37e057dd1f4ccde852d619a179d7e7014938f6 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 11 Jul 2005 19:12:50 +0000 Subject: Made the push targets do an update (and required merge) first --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f4b3139e3f..464ed3f904 100644 --- a/Makefile +++ b/Makefile @@ -137,11 +137,11 @@ clobber-optware: # Targets for use by those with write access to the repositories .PHONY: push-master -push-master: MT/revision +push-master: update-master monotone push .PHONY: push-openembedded -push-openembedded: openembedded/conf/machine/nslu2.conf +push-openembedded: update-openembedded ( cd openembedded ; monotone push ) # Targets for use by core team members only -- cgit v1.2.3 From aa65bc56715198981fbae3d85b6498da95c79301 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 11 Jul 2005 19:54:07 +0000 Subject: Added the developer push target --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 464ed3f904..5798604670 100644 --- a/Makefile +++ b/Makefile @@ -136,6 +136,9 @@ clobber-optware: # Targets for use by those with write access to the repositories +.PHONY: push +push: push-master push-openembedded + .PHONY: push-master push-master: update-master monotone push -- cgit v1.2.3 From 2a45b8e3189c9d18afeffb7c09a7e58645a8b942 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 14 Jul 2005 16:31:17 +0000 Subject: Added unset MFLAGS and unset MAKEFLAGS to the generation of setup-env in openslug/Makefile --- openslug/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openslug/Makefile b/openslug/Makefile index a0c0ec1e72..e037ddf63c 100644 --- a/openslug/Makefile +++ b/openslug/Makefile @@ -30,6 +30,8 @@ setup-env: echo 'unset LC_CTYPE' >> setup-env echo 'unset CC' >> setup-env echo 'unset CXX' >> setup-env + echo 'unset MFLAGS' >> setup-env + echo 'unset MAKEFLAGS' >> setup-env echo 'alias bb=bitbake' >> setup-env echo 'echo Environment set up for OpenSlug development.' >> setup-env -- cgit v1.2.3 From 69742294e28c27ddc29052c591fe6272284e4065 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 15 Jul 2005 07:46:59 +0000 Subject: Updated for monotone 0.20 --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5798604670..293c44dc8d 100644 --- a/Makefile +++ b/Makefile @@ -41,10 +41,10 @@ optware build-optware: optware/Makefile .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) - ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded ) + ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded.* ) ( monotone -d monotone/nslu2-linux.db unset database default-server ) - ( monotone -d monotone/nslu2-linux.db unset database default-collection ) - ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org ) + ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) + ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) downloads: [ -e downloads ] || mkdir -p downloads @@ -159,7 +159,7 @@ upload-openslug-cross: openslug/Makefile .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf - monotone pull monotone.vanille.de org.openembedded + monotone pull monotone.vanille.de org.openembedded.* if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.dev ; \ fi @@ -180,7 +180,7 @@ propagate-to-oe: .PHONY: export-openembedded export-openembedded: openembedded/conf/machine/nslu2.conf - monotone push monotone.vanille.de org.openembedded + monotone push monotone.vanille.de org.openembedded.* .PHONY: publish-openembedded publish-openembedded: import-openembedded propagate-from-oe update-openembedded \ -- cgit v1.2.3 From 8cce149673e503259d9bf0b505ed10c65849fa92 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Mon, 18 Jul 2005 10:01:25 +0000 Subject: Add misc other developer related targets --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Makefile b/Makefile index 293c44dc8d..a952875bc6 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,18 @@ setup-optware-developer: cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) +.PHONY: setup-slugimage-developer +setup-slugimage-developer: + cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co slugimage + +.PHONY: setup-upslug-developer +setup-upslug-developer: + cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co upslug + +.PHONY: setup-sluggo-developer +setup-sluggo-developer: + cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co sluggo + .PHONY: update-master update-master: MT/revision monotone pull -- cgit v1.2.3 From 553637753b10aceac657087f04ce79db7a0b57b0 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 19 Jul 2005 18:35:27 +0000 Subject: Added the setup-apex-developer target --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index a952875bc6..be1786f0be 100644 --- a/Makefile +++ b/Makefile @@ -102,6 +102,10 @@ setup-upslug-developer: setup-sluggo-developer: cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co sluggo +.PHONY: setup-apex-developer +setup-apex-developer: + cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co apex + .PHONY: update-master update-master: MT/revision monotone pull -- cgit v1.2.3 From 1c4141b07e17a72af33f82c3ca99c59de8894b33 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 19 Jul 2005 18:43:09 +0000 Subject: Added the build-apex target --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index be1786f0be..bee271d0d7 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,10 @@ openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf optware build-optware: optware/Makefile ( cd optware ; make ) +.PHONY: apex build-apex +apex build-apex: apex/Makefile + ( cd apex ; make nslu2_config ; make oldconfig ; make CROSS_COMPILE=../openslug/tmp/cross/bin/armeb-linux- ) + .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) @@ -102,6 +106,10 @@ setup-upslug-developer: setup-sluggo-developer: cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co sluggo +.PHONY: setup-apex +setup-apex apex/Makefile: + cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co apex + .PHONY: setup-apex-developer setup-apex-developer: cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co apex -- cgit v1.2.3 From eb61b33bf6fffddf7972e99ac51df1dff3cbd4f7 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 19 Jul 2005 23:30:26 +0000 Subject: Removed build-apex target, as it is now in OpenEmbedded instead. --- Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile b/Makefile index bee271d0d7..f9d7946f0f 100644 --- a/Makefile +++ b/Makefile @@ -38,10 +38,6 @@ openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf optware build-optware: optware/Makefile ( cd optware ; make ) -.PHONY: apex build-apex -apex build-apex: apex/Makefile - ( cd apex ; make nslu2_config ; make oldconfig ; make CROSS_COMPILE=../openslug/tmp/cross/bin/armeb-linux- ) - .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) -- cgit v1.2.3 From 1aaf58e549fa73565afd4f9fc86b1a288d0139c4 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 22 Jul 2005 05:25:03 +0000 Subject: Migrated bitbake from the unstable and three-day-downtime berlios.de SVN to our well-maintained nslu2-linux.org monotone repository --- Makefile | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f9d7946f0f..13c1fb5e38 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,6 @@ SVN_USER ?= ${USER} CVS_USER ?= ${USER} -# Fetch this revision of BitBake. Unset this to fetch bleeding edge. -BITBAKE_REVISION = -r 269 - .PHONY: all all: update build @@ -61,7 +58,8 @@ setup-master: setup-monotone unslung/Makefile openslug/Makefile .PHONY: setup-bitbake setup-bitbake bitbake/bin/bitbake: - [ -e bitbake/bin/bitbake ] || ( svn co ${BITBAKE_REVISION} svn://svn.berlios.de/bitbake/trunk/bitbake ) + ${MAKE} MT/revision + [ -e bitbake/bin/bitbake ] || monotone co -b org.nslu2-linux.bitbake bitbake .PHONY: setup-openembedded setup-openembedded openembedded/conf/machine/nslu2.conf: @@ -113,6 +111,9 @@ setup-apex-developer: .PHONY: update-master update-master: MT/revision monotone pull + if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ + monotone merge -b org.nslu2-linux.dev ; \ + fi monotone update if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ monotone merge -b org.nslu2-linux.dev ; \ @@ -120,7 +121,14 @@ update-master: MT/revision .PHONY: update-bitbake update-bitbake: bitbake/bin/bitbake - ( cd bitbake ; svn ${BITBAKE_REVISION} update ) + monotone pull + if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1" ] ; then \ + monotone merge -b org.nslu2-linux.bitbake ; \ + fi + ( cd bitbake ; monotone update ) + if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1" ] ; then \ + monotone merge -b org.nslu2-linux.bitbake ; \ + fi .PHONY: update-openembedded update-openembedded: openembedded/conf/machine/nslu2.conf @@ -129,6 +137,9 @@ update-openembedded: openembedded/conf/machine/nslu2.conf monotone merge -b org.openembedded.nslu2-linux ; \ fi ( cd openembedded ; monotone update ) + if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.nslu2-linux ; \ + fi .PHONY: update-oe-symlinks update-oe-symlinks: oe-symlinks/packages -- cgit v1.2.3 From cb97f2a5f236414f4a6257171cd2f09aa4472ac5 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 25 Jul 2005 22:23:45 +0000 Subject: Changed 'source' to '.' in the OpenSlug makefile --- openslug/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openslug/Makefile b/openslug/Makefile index e037ddf63c..2d8bf76463 100644 --- a/openslug/Makefile +++ b/openslug/Makefile @@ -2,7 +2,7 @@ # Licensed under the GPL v2 or later openslug-firmware: setup-env conf/local.conf - ( source setup-env ; bitbake openslug-packages ) + ( . setup-env ; bitbake openslug-packages ) # This does the same thing but with a clean environment # The HOME setting prevents user environment settings @@ -11,7 +11,7 @@ openslug-firmware: setup-env conf/local.conf # .cache in the home directory. openslug-firmware-safe: setup-env conf/local.conf env -i CCACHE_DISABLE=1 CCACHE_DIR="`pwd`/tmp/ccache" HOME=/dev/null \ - sh -c 'source setup-env; bitbake openslug-packages' + sh -c '. setup-env; bitbake openslug-packages' setup-env: [ -e bitbake ] || ( ln -s ../bitbake . ) -- cgit v1.2.3 From c889b78359d96c4a0c770f653c1e49c964190376 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 26 Jul 2005 01:59:25 +0000 Subject: Remove the update of oe-symlinks from the update target so that it will run again (this is an intermediate step in the removal of oe-symlinks). --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 13c1fb5e38..f9586cd2af 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks setup-opt setup-developer: setup-master setup-bitbake setup-openembedded setup-oe-symlinks-developer setup-optware-developer .PHONY: update -update: update-master update-bitbake update-openembedded update-oe-symlinks update-optware +update: update-master update-bitbake update-openembedded update-optware .PHONY: clobber clobber: clobber-optware clobber-oe-symlinks clobber-openembedded clobber-bitbake -- cgit v1.2.3 From 693809b03d2e7367cafa7660af147d839f752fe3 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 26 Jul 2005 06:18:21 +0000 Subject: Removed all traces of oe-symlinks from the master makefiles --- Makefile | 27 +++++---------------------- openslug/Makefile | 7 +++---- unslung/Makefile | 9 +++++---- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index f9586cd2af..4774d8e1d5 100644 --- a/Makefile +++ b/Makefile @@ -12,23 +12,23 @@ all: update build build: build-unslung build-openslug build-optware .PHONY: setup -setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks setup-optware +setup: setup-master setup-bitbake setup-openembedded setup-optware .PHONY: setup-developer -setup-developer: setup-master setup-bitbake setup-openembedded setup-oe-symlinks-developer setup-optware-developer +setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-developer .PHONY: update update: update-master update-bitbake update-openembedded update-optware .PHONY: clobber -clobber: clobber-optware clobber-oe-symlinks clobber-openembedded clobber-bitbake +clobber: clobber-optware clobber-openembedded clobber-bitbake .PHONY: unslung build-unslung -unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages +unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf ( cd unslung ; make ) .PHONY: openslug build-openslug -openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages +openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf ( cd openslug ; make ) .PHONY: optware build-optware @@ -66,15 +66,6 @@ setup-openembedded openembedded/conf/machine/nslu2.conf: ${MAKE} MT/revision [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded -.PHONY: setup-oe-symlinks -setup-oe-symlinks oe-symlinks/packages: - [ -e oe-symlinks/packages ] || ( svn co svn://svn.berlios.de/openslug/trunk/openslug/nslu2-linux oe-symlinks ) - -.PHONY: setup-oe-symlinks-developer -setup-oe-symlinks-developer: - [ -e oe-symlinks ] && ( mv oe-symlinks oe-symlinks-user ) - svn co svn+ssh://${SVN_USER}@svn.berlios.de/svnroot/repos/openslug/trunk/openslug/nslu2-linux oe-symlinks - .PHONY: setup-optware setup-optware optware/Makefile: ${MAKE} downloads @@ -141,10 +132,6 @@ update-openembedded: openembedded/conf/machine/nslu2.conf monotone merge -b org.openembedded.nslu2-linux ; \ fi -.PHONY: update-oe-symlinks -update-oe-symlinks: oe-symlinks/packages - ( cd oe-symlinks ; svn update ) - .PHONY: update-optware update-optware: optware/Makefile ( cd optware ; cvs update -d -P ) @@ -157,10 +144,6 @@ clobber-bitbake: clobber-openembedded: rm -rf openembedded -.PHONY: clobber-oe-symlinks -clobber-oe-symlinks: - rm -rf oe-symlinks - .PHONY: clobber-optware clobber-optware: rm -rf optware diff --git a/openslug/Makefile b/openslug/Makefile index 2d8bf76463..6a8caf8c92 100644 --- a/openslug/Makefile +++ b/openslug/Makefile @@ -17,10 +17,9 @@ setup-env: [ -e bitbake ] || ( ln -s ../bitbake . ) [ -e downloads ] || ( ln -s ../downloads . ) [ -e openembedded ] || ( ln -s ../openembedded . ) - [ -e oe-symlinks ] || ( ln -s ../oe-symlinks . ) echo 'OEROOT='`pwd` > setup-env echo 'OESYS=$$OEROOT/bitbake/' >> setup-env - echo 'PKGDIR=$$OEROOT/openembedded/' >> setup-env + echo 'export PKGDIR=$$OEROOT/openembedded/' >> setup-env echo 'OEBUILD=$$OEROOT' >> setup-env echo 'export PYTHONPATH=$$OESYS/lib' >>setup-env echo 'export BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env @@ -42,9 +41,9 @@ clobber: rm -rf tmp openslug-source: - tar zcvf openslug-source.tar.gz --exclude=MT Makefile bitbake conf openembedded oe-symlinks + tar zcvf openslug-source.tar.gz --exclude=MT Makefile bitbake conf openembedded distclean: clobber - rm -rf setup-env conf/local.conf bitbake downloads openembedded oe-symlinks + rm -rf setup-env conf/local.conf bitbake downloads openembedded # End of Makefile diff --git a/unslung/Makefile b/unslung/Makefile index b64453007b..aecf3abe7c 100644 --- a/unslung/Makefile +++ b/unslung/Makefile @@ -17,10 +17,9 @@ setup-env: [ -e bitbake ] || ( ln -s ../bitbake . ) [ -e downloads ] || ( ln -s ../downloads . ) [ -e openembedded ] || ( ln -s ../openembedded . ) - [ -e oe-symlinks ] || ( ln -s ../oe-symlinks . ) echo 'OEROOT='`pwd` > setup-env echo 'OESYS=$$OEROOT/bitbake/' >> setup-env - echo 'PKGDIR=$$OEROOT/openembedded/' >> setup-env + echo 'export PKGDIR=$$OEROOT/openembedded/' >> setup-env echo 'OEBUILD=$$OEROOT' >> setup-env echo 'BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env echo 'PATH=$$OESYS/bin/:$$PATH' >> setup-env @@ -30,6 +29,8 @@ setup-env: echo 'unset LC_CTYPE' >> setup-env echo 'unset CC' >> setup-env echo 'unset CXX' >> setup-env + echo 'unset MFLAGS' >> setup-env + echo 'unset MAKEFLAGS' >> setup-env echo 'alias bb=bitbake' >> setup-env echo 'echo Environment set up for Unslung development.' >> setup-env @@ -40,9 +41,9 @@ clobber: rm -rf tmp unslung-source: - tar zcvf unslung-source.tar.gz --exclude=MT Makefile bitbake conf openembedded oe-symlinks + tar zcvf unslung-source.tar.gz --exclude=MT Makefile bitbake conf openembedded distclean: clobber - rm -f setup-env conf/local.conf bitbake downloads openembedded oe-symlinks + rm -f setup-env conf/local.conf bitbake downloads openembedded # End of Makefile -- cgit v1.2.3 From 6d6928a588c05b9a01002505ebc5cfb134c9694d Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 26 Jul 2005 06:42:22 +0000 Subject: Better fix for PKGDIR --- openslug/Makefile | 12 ++++++------ openslug/conf/local.conf.template | 10 ++++++---- unslung/Makefile | 21 ++++++++++----------- unslung/conf/local.conf.template | 10 ++++++---- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/openslug/Makefile b/openslug/Makefile index 6a8caf8c92..d6fc3dd8dd 100644 --- a/openslug/Makefile +++ b/openslug/Makefile @@ -2,7 +2,7 @@ # Licensed under the GPL v2 or later openslug-firmware: setup-env conf/local.conf - ( . setup-env ; bitbake openslug-packages ) + . setup-env ; bitbake openslug-packages # This does the same thing but with a clean environment # The HOME setting prevents user environment settings @@ -14,13 +14,13 @@ openslug-firmware-safe: setup-env conf/local.conf sh -c '. setup-env; bitbake openslug-packages' setup-env: - [ -e bitbake ] || ( ln -s ../bitbake . ) - [ -e downloads ] || ( ln -s ../downloads . ) - [ -e openembedded ] || ( ln -s ../openembedded . ) + [ -e bitbake ] || ln -s ../bitbake . + [ -e downloads ] || ln -s ../downloads . + [ -e openembedded ] || ln -s ../openembedded . echo 'OEROOT='`pwd` > setup-env echo 'OESYS=$$OEROOT/bitbake/' >> setup-env - echo 'export PKGDIR=$$OEROOT/openembedded/' >> setup-env echo 'OEBUILD=$$OEROOT' >> setup-env + echo 'PKGDIR=$$OEROOT/openembedded/' >> setup-env echo 'export PYTHONPATH=$$OESYS/lib' >>setup-env echo 'export BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env echo 'export PATH=$$OESYS/bin/:$$PATH' >> setup-env @@ -41,7 +41,7 @@ clobber: rm -rf tmp openslug-source: - tar zcvf openslug-source.tar.gz --exclude=MT Makefile bitbake conf openembedded + tar zcf openslug-source.tar.gz --exclude=MT Makefile bitbake conf openembedded distclean: clobber rm -rf setup-env conf/local.conf bitbake downloads openembedded diff --git a/openslug/conf/local.conf.template b/openslug/conf/local.conf.template index f5095c54c5..9139503e6d 100644 --- a/openslug/conf/local.conf.template +++ b/openslug/conf/local.conf.template @@ -3,10 +3,12 @@ OEROOT = "%%%OEROOT%%%" # Use this to specify where OE should place the downloaded sources into DL_DIR = "${OEROOT}/downloads" -# Delete the line below. Then specify which .oe files to consider for -# your build. Typically this will be something like OEFILES = "/path/to/packages/*/*.oe" -# BBFILES := "/home/slug/openembedded/packages/*/*.bb" -BBFILES := "${OEROOT}/oe-symlinks/packages/*/*.bb" +# BBFILES defines the list of .bb files to consider when looking for a +# way to build a package. This gets overridden in the openslug and +# unslung .conf files. PKGDIR defines where to find the 'packages' +# directory containing the package sub-directories. +PKGDIR := "${OEROOT}/openembedded" +BBFILES := "${PKGDIR}/packages/*/*.bb" # Use the OEMASK below to instruct OE to _NOT_ consider some .oe files # This is a regulary expression, so be sure to get your parenthesis balanced. diff --git a/unslung/Makefile b/unslung/Makefile index aecf3abe7c..c46569bee8 100644 --- a/unslung/Makefile +++ b/unslung/Makefile @@ -2,7 +2,7 @@ # Licensed under the GPL v2 or later unslung-firmware: setup-env conf/local.conf - (source setup-env ; bitbake unslung-packages) + . setup-env ; bitbake unslung-packages # This does the same thing but with a clean environment # The HOME setting prevents user environment settings @@ -11,20 +11,19 @@ unslung-firmware: setup-env conf/local.conf # .cache in the home directory. unslung-firmware-safe: setup-env conf/local.conf env -i CCACHE_DISABLE=1 CCACHE_DIR="`pwd`/tmp/ccache" HOME=/dev/null \ - sh -c 'source setup-env; bitbake unslung-packages' + sh -c '. setup-env; bitbake unslung-packages' setup-env: - [ -e bitbake ] || ( ln -s ../bitbake . ) - [ -e downloads ] || ( ln -s ../downloads . ) - [ -e openembedded ] || ( ln -s ../openembedded . ) + [ -e bitbake ] || ln -s ../bitbake . + [ -e downloads ] || ln -s ../downloads . + [ -e openembedded ] || ln -s ../openembedded . echo 'OEROOT='`pwd` > setup-env echo 'OESYS=$$OEROOT/bitbake/' >> setup-env - echo 'export PKGDIR=$$OEROOT/openembedded/' >> setup-env echo 'OEBUILD=$$OEROOT' >> setup-env - echo 'BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env - echo 'PATH=$$OESYS/bin/:$$PATH' >> setup-env - echo 'LD_LIBRARY_PATH=' >> setup-env - echo 'export PATH LD_LIBRARY_PATH BBPATH' >> setup-env + echo 'PKGDIR=$$OEROOT/openembedded/' >> setup-env + echo 'export BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env + echo 'export PATH=$$OESYS/bin/:$$PATH' >> setup-env + echo 'export LD_LIBRARY_PATH=' >> setup-env echo 'export LANG=C' >> setup-env echo 'unset LC_CTYPE' >> setup-env echo 'unset CC' >> setup-env @@ -41,7 +40,7 @@ clobber: rm -rf tmp unslung-source: - tar zcvf unslung-source.tar.gz --exclude=MT Makefile bitbake conf openembedded + tar zcf unslung-source.tar.gz --exclude=MT Makefile bitbake conf openembedded distclean: clobber rm -f setup-env conf/local.conf bitbake downloads openembedded diff --git a/unslung/conf/local.conf.template b/unslung/conf/local.conf.template index a13923f749..3ec09752f1 100644 --- a/unslung/conf/local.conf.template +++ b/unslung/conf/local.conf.template @@ -3,10 +3,12 @@ OEROOT = "%%%OEROOT%%%" # Use this to specify where OE should place the downloaded sources into DL_DIR = "${OEROOT}/downloads" -# Delete the line below. Then specify which .oe files to consider for -# your build. Typically this will be something like OEFILES = "/path/to/packages/*/*.oe" -# BBFILES := "/home/slug/openembedded/packages/*/*.bb" -BBFILES := "${OEROOT}/oe-symlinks/packages/*/*.bb" +# BBFILES defines the list of .bb files to consider when looking for a +# way to build a package. This gets overridden in the openslug and +# unslung .conf files. PKGDIR defines where to find the 'packages' +# directory containing the package sub-directories. +PKGDIR := "${OEROOT}/openembedded" +BBFILES := "${PKGDIR}/packages/*/*.bb" # Use the OEMASK below to instruct OE to _NOT_ consider some .oe files # This is a regulary expression, so be sure to get your parenthesis balanced. -- cgit v1.2.3 From b85a47077db333119bf52eaad6ee1e862fb163b8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 24 Jul 2005 09:33:47 +0000 Subject: Added the setup-host-debian target to document all required packages for an official Debian Etch build host. --- Makefile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Makefile b/Makefile index 4774d8e1d5..7421bd810f 100644 --- a/Makefile +++ b/Makefile @@ -99,6 +99,24 @@ setup-apex apex/Makefile: setup-apex-developer: cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co apex +.PHONY: setup-host-debian +setup-host-debian: + sudo apt-get install \ + autoconf automake automake1.9 \ + bison \ + ccache \ + cvs \ + docbook \ + flex \ + g++ gawk gcj gettext \ + libc6-dev libglib2.0-dev libtool \ + m4 make \ + patch pkg-config \ + python python-dev python-psyco python2.4 python2.4-dev \ + sed \ + texinfo \ + unzip + .PHONY: update-master update-master: MT/revision monotone pull -- cgit v1.2.3 From f91ce343655ad93f22bd8468dbc50b8268d0f402 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 24 Jul 2005 13:19:21 +0000 Subject: Fixed the typo in upload-openslug-cross --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7421bd810f..86e9c3b154 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,7 @@ push-openembedded: update-openembedded publish-master: push-master scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile -.PHONY: upload-openembedded-cross +.PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile rsync -avr openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ -- cgit v1.2.3 From 11703507d1d10dc2f7e6d99142ffc10ac86d32d0 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 25 Jul 2005 05:46:01 +0000 Subject: Split optware builds into two subdirs - nslu2 and wl500g. --- Makefile | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 47755dc411..2499d8009b 100644 --- a/Makefile +++ b/Makefile @@ -32,20 +32,24 @@ openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf ( cd openslug ; make ) .PHONY: optware build-optware -optware build-optware: optware/Makefile - ( cd optware ; unset LD_LIBRARY_PATH; make ) +optware build-optware: build-optware-nslu2 build-optware-wl500g + +.PHONY: optware-nslu2 build-optware-nslu2 +optware-nslu2 build-optware-nslu2: optware/nslu2/Makefile + ( cd optware/nslu2 ; make ) + +.PHONY: optware-wl500g build-optware-wl500g +optware-wl500g build-optware-wl500g: optware/wl500g/Makefile + ( cd optware/wl500g ; make ) .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: - [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) + [ -e monotone/nslu2-linux.db ] || \ + ( mkdir -p monotone && wget http://www.nslu2-linux.org/nslu2-linux.initial.db -O monotone/nslu2-linux.db ) ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded.* ) ( monotone -d monotone/nslu2-linux.db unset database default-server ) ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) - # Above may be supplemented by following someday - # It currently *requires* monotone 0.21, or it will fail with - # a mysterious sounding database error. - # wget http://www.nslu2-linux.org/nslu2-linux.initial.db -O monotone/nslu2-linux.db downloads: [ -e downloads ] || mkdir -p downloads @@ -74,14 +78,35 @@ setup-openembedded openembedded/conf/machine/nslu2.conf: setup-optware optware/Makefile: ${MAKE} downloads [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) - [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) + +optware/nslu2/Makefile : optware/Makefile + [ -e optware/nslu2/Makefile ] || ( \ + mkdir -p optware/nslu2 ; \ + echo "OPTWARE_TARGET=nslu2" > optware/nslu2/Makefile ; \ + echo "include ../Makefile" >> optware/nslu2/Makefile ; \ + ln -s ../../downloads optware/nslu2/downloads ; \ + ln -s ../make optware/nslu2/make ; \ + ln -s ../scripts optware/nslu2/scripts ; \ + ln -s ../sources optware/nslu2/sources ; \ + ) + +optware/wl500g/Makefile : optware/Makefile + [ -e optware/wl500g/Makefile ] || ( \ + mkdir -p optware/wl500g ; \ + echo "OPTWARE_TARGET=wl500g" > optware/wl500g/Makefile ; \ + echo "include ../Makefile" >> optware/wl500g/Makefile ; \ + ln -s ../../downloads optware/wl500g/downloads ; \ + ln -s ../make optware/wl500g/make ; \ + ln -s ../scripts optware/wl500g/scripts ; \ + ln -s ../sources optware/wl500g/sources ; \ + ) .PHONY: setup-optware-developer setup-optware-developer: ${MAKE} downloads [ -e optware ] && ( mv optware optware-user ) cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung - [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) + ${MAKE} optware/nslu2/Makefile optware/wl500g/Makefile .PHONY: setup-slugimage-developer setup-slugimage-developer: -- cgit v1.2.3 From 5a0ba6ded2a8493174fc4446c6c48f58eb2d4340 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 26 Jul 2005 16:55:38 +0000 Subject: Add unset LD_LIBRARY_PATH before the make for the optware build, this avoids a make failure in glibc when LD_LIBRARY_PATH is set on the build system (already done for openslug-build and unslung-build). --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 86e9c3b154..a73f331afd 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf .PHONY: optware build-optware optware build-optware: optware/Makefile - ( cd optware ; make ) + ( cd optware ; unset LD_LIBRARY_PATH; make ) .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: -- cgit v1.2.3 From b36ee885439367a96df407a319ef4e7224a05dc7 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 26 Jul 2005 22:47:17 +0000 Subject: Make upload-openslug-cross --delete and ignore morgue --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a73f331afd..8ec9a02de4 100644 --- a/Makefile +++ b/Makefile @@ -187,7 +187,7 @@ publish-master: push-master .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile - rsync -avr openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ + rsync --delete -av --exclude="morgue" openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From 40b0f3c48b27cd5488f727e6c577169c4745ffc9 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Tue, 26 Jul 2005 23:07:31 +0000 Subject: Add commented out possible solution for initial database population --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 8ec9a02de4..9b1ad193fd 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,8 @@ setup-monotone monotone/nslu2-linux.db: ( monotone -d monotone/nslu2-linux.db unset database default-server ) ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) + # Above may be supplemented by following someday + # wget http://www.nslu2-linux.org/nslu2-linux.initial.db -O monotone/nslu2-linux.db downloads: [ -e downloads ] || mkdir -p downloads -- cgit v1.2.3 From 7261ef31627612bc973fc3ac4af488809b4c6fbb Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 26 Jul 2005 23:15:58 +0000 Subject: Make upload-openslug-cross ignore modification times. Otherwise it'll exit with an error --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8ec9a02de4..024919dd52 100644 --- a/Makefile +++ b/Makefile @@ -187,7 +187,7 @@ publish-master: push-master .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile - rsync --delete -av --exclude="morgue" openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ + rsync --ignore-times --delete -av --exclude="morgue" openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From 4a8b8bce2a22d227020c9ce762808c3562078c5b Mon Sep 17 00:00:00 2001 From: Derek Young Date: Tue, 26 Jul 2005 23:22:42 +0000 Subject: Added some comments qualifying the usage of initial db strategy --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 856ec5db6f..93a530b2b1 100644 --- a/Makefile +++ b/Makefile @@ -43,6 +43,8 @@ setup-monotone monotone/nslu2-linux.db: ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) # Above may be supplemented by following someday + # It currently *requires* monotone 0.21, or it will fail with + # a mysterious sounding database error. # wget http://www.nslu2-linux.org/nslu2-linux.initial.db -O monotone/nslu2-linux.db downloads: -- cgit v1.2.3 From 0c98deb088a68faca86a96aff06d90efb1ec59dc Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 26 Jul 2005 23:28:42 +0000 Subject: Replace --ignore-times with --size-only in upload-openslug-cross --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 856ec5db6f..2bc265b922 100644 --- a/Makefile +++ b/Makefile @@ -189,7 +189,7 @@ publish-master: push-master .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile - rsync --ignore-times --delete -av --exclude="morgue" openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ + rsync --size-only --delete -av --exclude="morgue" openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From 9c9a3ffa105708a111932d1fb201055fae6138c0 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 26 Jul 2005 23:39:00 +0000 Subject: Replace --size-only with --omit-dir-times. Now it won't fail on trying to set dir times, but will check file timestamps --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 76988d2a8f..dfd69b88d9 100644 --- a/Makefile +++ b/Makefile @@ -191,7 +191,7 @@ publish-master: push-master .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile - rsync --size-only --delete -av --exclude="morgue" openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ + rsync --omit-dir-times --delete -av --exclude="morgue" openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From 87d14d029ffcf90065c56747854b475d9beba187 Mon Sep 17 00:00:00 2001 From: jp30 Date: Wed, 27 Jul 2005 07:10:02 +0000 Subject: upload-unslung-modules target --- Makefile | 9 +++++++++ scripts/.mtn2git_empty | 0 scripts/package-strip.pl | 28 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 scripts/.mtn2git_empty create mode 100755 scripts/package-strip.pl diff --git a/Makefile b/Makefile index a73f331afd..33e686c0fe 100644 --- a/Makefile +++ b/Makefile @@ -189,6 +189,15 @@ publish-master: push-master upload-openslug-cross: openslug/Makefile rsync -avr openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ +.PHONY: upload-unslung-modules +upload-unslung-modules: unslung/Makefile + scripts/package-strip.pl kernel-module-\* unslung/tmp/deploy/ipk/Packages unslung/tmp/deploy/ipk/Packages.new + mv unslung/tmp/deploy/ipk/Packages.new unslung/tmp/deploy/ipk/Packages + rm -f unslung/tmp/deploy/ipk/Packages.gz + gzip -c unslung/tmp/deploy/ipk/Packages >unslung/tmp/deploy/ipk/Packages.gz + rsync -avr unslung/tmp/deploy/ipk/kernel-module-* unslung@nslu.sf.net:nslu/feeds/unslung/oe/ + rsync -avr unslung/tmp/deploy/ipk/Packages* unslung@nslu.sf.net:nslu/feeds/unslung/oe/ + .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf monotone pull monotone.vanille.de org.openembedded.* diff --git a/scripts/.mtn2git_empty b/scripts/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scripts/package-strip.pl b/scripts/package-strip.pl new file mode 100755 index 0000000000..45c64134f8 --- /dev/null +++ b/scripts/package-strip.pl @@ -0,0 +1,28 @@ +#!/usr/bin/perl + +my $pat = shift(@ARGV) || usage(1); +my $infile = shift(@ARGV) || usage(1); +my $outfile = shift(@ARGV) || "-"; +print STDERR "Package-strip processing input file $infile\n"; +print STDERR "Output to " . ($outfile ne "-" ? $outfile : "stdout") . "\n"; + +# massage the regexp to accept semi-shell-style * +$pat =~ s/\*/.*/g; + +open (I,"<$infile") || die $@; +open (O,">>$outfile") || die $@; +undef $/; +my $srctext = ; +close(I); + +my @srclist = split(/\012\012\012/,$srctext); +my @outlist = grep(/Package: $pat/,@srclist); +print O join("\012\012\012",@outlist); +print O "\012\012\012"; + +sub usage { + my $cack = shift(@_); + print STDERR "usage: Package-strip [output filename]\nRemember to escape wildcard characters for the shell."; + die if $cack; +} + -- cgit v1.2.3 From f7bd4facc21cf2b548736dc5bd4441fdd0685744 Mon Sep 17 00:00:00 2001 From: jp30 Date: Wed, 27 Jul 2005 07:20:29 +0000 Subject: set PYTHONPATH for bitbake --- unslung/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/unslung/Makefile b/unslung/Makefile index c46569bee8..a435a1121e 100644 --- a/unslung/Makefile +++ b/unslung/Makefile @@ -21,6 +21,7 @@ setup-env: echo 'OESYS=$$OEROOT/bitbake/' >> setup-env echo 'OEBUILD=$$OEROOT' >> setup-env echo 'PKGDIR=$$OEROOT/openembedded/' >> setup-env + echo 'export PYTHONPATH=$$OESYS/lib' >>setup-env echo 'export BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env echo 'export PATH=$$OESYS/bin/:$$PATH' >> setup-env echo 'export LD_LIBRARY_PATH=' >> setup-env -- cgit v1.2.3 From 7a9b345b465ac84850e5a11ffb3e9d049c752a0c Mon Sep 17 00:00:00 2001 From: Derek Young Date: Wed, 27 Jul 2005 09:19:51 +0000 Subject: changed the candidate source location for initial db populuation --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 47755dc411..85d6746368 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,9 @@ setup-monotone monotone/nslu2-linux.db: # Above may be supplemented by following someday # It currently *requires* monotone 0.21, or it will fail with # a mysterious sounding database error. - # wget http://www.nslu2-linux.org/nslu2-linux.initial.db -O monotone/nslu2-linux.db + # wget http://www.nslu2-linux.org/monotone/nslu2-linux.db -O monotone/nslu2-linux.db + # or + # wget http://ipkg-us-dyoung.nslu2-linux.org/monotone/nslu2-linux.db -O monotone/nslu2-linux.db downloads: [ -e downloads ] || mkdir -p downloads -- cgit v1.2.3 From 7c1a32920f634ee58a54bd7d4dfaab8c79378333 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Wed, 27 Jul 2005 09:47:55 +0000 Subject: add some comments regarding compression scheme --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 85d6746368..3fdf7b024d 100644 --- a/Makefile +++ b/Makefile @@ -45,9 +45,10 @@ setup-monotone monotone/nslu2-linux.db: # Above may be supplemented by following someday # It currently *requires* monotone 0.21, or it will fail with # a mysterious sounding database error. - # wget http://www.nslu2-linux.org/monotone/nslu2-linux.db -O monotone/nslu2-linux.db + # wget http://www.nslu2-linux.org/monotone/nslu2-linux.db -O monotone/nslu2-linux.db.gz # or - # wget http://ipkg-us-dyoung.nslu2-linux.org/monotone/nslu2-linux.db -O monotone/nslu2-linux.db + # wget http://ipkg-us-dyoung.nslu2-linux.org/monotone/nslu2-linux.db -O monotone/nslu2-linux.db.gz + # followed by decompressing it downloads: [ -e downloads ] || mkdir -p downloads -- cgit v1.2.3 From 5c7980141f1329edbb067cd0b56858a5f39a1e91 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 25 Jul 2005 05:59:59 +0000 Subject: Fixed setup-optware-developer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2bbdcf1896..d5eff9ab52 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,7 @@ optware/wl500g/Makefile : optware/Makefile .PHONY: setup-optware-developer setup-optware-developer: ${MAKE} downloads - [ -e optware ] && ( mv optware optware-user ) + [ ! -e optware ] || ( mv optware optware-user ) cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung ${MAKE} optware/nslu2/Makefile optware/wl500g/Makefile -- cgit v1.2.3 From d3783d8f510ad543da05e17a497e153d42d418d6 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Wed, 27 Jul 2005 10:23:38 +0000 Subject: appended the correct suffix --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2bbdcf1896..1fea88b1b6 100644 --- a/Makefile +++ b/Makefile @@ -52,9 +52,9 @@ setup-monotone monotone/nslu2-linux.db: # Above may be supplemented by following someday # It currently *requires* monotone 0.21, or it will fail with # a mysterious sounding database error. - # wget http://www.nslu2-linux.org/monotone/nslu2-linux.db -O monotone/nslu2-linux.db.gz + # wget http://www.nslu2-linux.org/monotone/nslu2-linux.db.gz -O monotone/nslu2-linux.db.gz # or - # wget http://ipkg-us-dyoung.nslu2-linux.org/monotone/nslu2-linux.db -O monotone/nslu2-linux.db.gz + # wget http://ipkg-us-dyoung.nslu2-linux.org/monotone/nslu2-linux.db.gz -O monotone/nslu2-linux.db.gz # followed by decompressing it downloads: -- cgit v1.2.3 From cb72cea8cfb33f7b58d4c28779f3867685b46a70 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 26 Jul 2005 01:46:57 +0000 Subject: Added the push-bitbake and import-bitbake targets --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 248eec5794..adfc70324b 100644 --- a/Makefile +++ b/Makefile @@ -210,6 +210,10 @@ push: push-master push-openembedded push-master: update-master monotone push +.PHONY: push-bitbake +push-bitbake: update-bitbake + ( cd bitbake ; monotone push ) + .PHONY: push-openembedded push-openembedded: update-openembedded ( cd openembedded ; monotone push ) @@ -240,6 +244,10 @@ import-openembedded: openembedded/conf/machine/nslu2.conf monotone merge -b org.openembedded.dev ; \ fi +.PHONY: import-bitbake +import-bitbake: bitbake/bin/bitbake + svn co svn://svn.berlios.de/bitbake/trunk/bitbake + .PHONY: propagate-from-oe propagate-from-oe: monotone propagate org.openembedded.dev org.openembedded.nslu2-linux -- cgit v1.2.3 From b4c3dfefcdf4ae84969e3209e7b813381c6808a8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 26 Jul 2005 02:04:48 +0000 Subject: Added the upload-optware-nslu2-cross and upload-optware-wl500g-cross targets --- Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index adfc70324b..333f822364 100644 --- a/Makefile +++ b/Makefile @@ -234,8 +234,18 @@ upload-unslung-modules: unslung/Makefile mv unslung/tmp/deploy/ipk/Packages.new unslung/tmp/deploy/ipk/Packages rm -f unslung/tmp/deploy/ipk/Packages.gz gzip -c unslung/tmp/deploy/ipk/Packages >unslung/tmp/deploy/ipk/Packages.gz - rsync -avr unslung/tmp/deploy/ipk/kernel-module-* unslung@nslu.sf.net:nslu/feeds/unslung/oe/ - rsync -avr unslung/tmp/deploy/ipk/Packages* unslung@nslu.sf.net:nslu/feeds/unslung/oe/ + rsync -vrlt unslung/tmp/deploy/ipk/kernel-module-* unslung@nslu.sf.net:nslu/feeds/unslung/oe/ + rsync -vrl unslung/tmp/deploy/ipk/Packages* unslung@nslu.sf.net:nslu/feeds/unslung/oe/ + +.PHONY: upload-optware-nslu2-cross +upload-optware-nslu2-cross: optware/nslu2/Makefile + rsync -vrlt optware/nslu2/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ + rsync -vrl optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ + +.PHONY: upload-optware-wl500g-cross +upload-optware-wl500g-cross: optware/wl500g/Makefile + rsync -vrlt optware/wl500g/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ + rsync -vrl optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From e425c59a06e14acf57533b944b46a921cbb7dfcd Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 26 Jul 2005 02:41:20 +0000 Subject: Added make autoclean to the optware builds --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 333f822364..82c64a969f 100644 --- a/Makefile +++ b/Makefile @@ -36,11 +36,11 @@ optware build-optware: build-optware-nslu2 build-optware-wl500g .PHONY: optware-nslu2 build-optware-nslu2 optware-nslu2 build-optware-nslu2: optware/nslu2/Makefile - ( cd optware/nslu2 ; make ) + ( cd optware/nslu2 ; make autoclean ; make ) .PHONY: optware-wl500g build-optware-wl500g optware-wl500g build-optware-wl500g: optware/wl500g/Makefile - ( cd optware/wl500g ; make ) + ( cd optware/wl500g ; make autoclean ; make ) .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: -- cgit v1.2.3 From 03cbc237bbe7d5405b10be6f544f55cab60cf8dc Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 26 Jul 2005 05:18:58 +0000 Subject: Rationalised the upload targets --- Makefile | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 82c64a969f..08796592f3 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,9 @@ setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-dev .PHONY: update update: update-master update-bitbake update-openembedded update-optware +.PHONY: upload +upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross + .PHONY: clobber clobber: clobber-optware clobber-openembedded clobber-bitbake @@ -226,26 +229,31 @@ publish-master: push-master .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile - rsync --omit-dir-times --delete -av --exclude="morgue" openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ + rsync -vlt openslug/tmp/deploy/ipk/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/unstable/ + rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/unstable/ + rsync -vlt --delete openslug/tmp/deploy/ipk/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/unstable/ .PHONY: upload-unslung-modules upload-unslung-modules: unslung/Makefile scripts/package-strip.pl kernel-module-\* unslung/tmp/deploy/ipk/Packages unslung/tmp/deploy/ipk/Packages.new mv unslung/tmp/deploy/ipk/Packages.new unslung/tmp/deploy/ipk/Packages rm -f unslung/tmp/deploy/ipk/Packages.gz - gzip -c unslung/tmp/deploy/ipk/Packages >unslung/tmp/deploy/ipk/Packages.gz - rsync -vrlt unslung/tmp/deploy/ipk/kernel-module-* unslung@nslu.sf.net:nslu/feeds/unslung/oe/ - rsync -vrl unslung/tmp/deploy/ipk/Packages* unslung@nslu.sf.net:nslu/feeds/unslung/oe/ + gzip -c unslung/tmp/deploy/ipk/Packages > unslung/tmp/deploy/ipk/Packages.gz + rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ + rsync -vl unslung/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ + rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ .PHONY: upload-optware-nslu2-cross upload-optware-nslu2-cross: optware/nslu2/Makefile - rsync -vrlt optware/nslu2/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ - rsync -vrl optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ + rsync -vlt optware/nslu2/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ + rsync -vl optware/nslu2/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ + rsync -vlt --delete optware/nslu2/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ .PHONY: upload-optware-wl500g-cross upload-optware-wl500g-cross: optware/wl500g/Makefile - rsync -vrlt optware/wl500g/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ - rsync -vrl optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ + rsync -vlt optware/wl500g/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ + rsync -vl optware/wl500g/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ + rsync -vlt --delete optware/wl500g/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From 309f707a1ec0f5254105452851f88faac6bedc41 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 28 Jul 2005 15:33:15 +0000 Subject: Fixed the upload targets --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 08796592f3..158d236a78 100644 --- a/Makefile +++ b/Makefile @@ -229,9 +229,9 @@ publish-master: push-master .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile - rsync -vlt openslug/tmp/deploy/ipk/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/unstable/ + rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/unstable/ rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/unstable/ - rsync -vlt --delete openslug/tmp/deploy/ipk/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/unstable/ + rsync -vlrt --delete openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/unstable/ .PHONY: upload-unslung-modules upload-unslung-modules: unslung/Makefile @@ -245,15 +245,15 @@ upload-unslung-modules: unslung/Makefile .PHONY: upload-optware-nslu2-cross upload-optware-nslu2-cross: optware/nslu2/Makefile - rsync -vlt optware/nslu2/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ + rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ rsync -vl optware/nslu2/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ - rsync -vlt --delete optware/nslu2/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ + rsync -vlrt --delete optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ .PHONY: upload-optware-wl500g-cross upload-optware-wl500g-cross: optware/wl500g/Makefile - rsync -vlt optware/wl500g/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ + rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ rsync -vl optware/wl500g/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ - rsync -vlt --delete optware/wl500g/packages/*.ipk unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ + rsync -vlrt --delete optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From d9026a6cd8512dd335a1cde07d13edf294772581 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 26 Jul 2005 05:49:44 +0000 Subject: Fixed the openslug unstable feed path --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 158d236a78..e301647bfe 100644 --- a/Makefile +++ b/Makefile @@ -229,9 +229,9 @@ publish-master: push-master .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile - rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/unstable/ - rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/unstable/ - rsync -vlrt --delete openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/unstable/ + rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ + rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ + rsync -vlrt --delete openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ .PHONY: upload-unslung-modules upload-unslung-modules: unslung/Makefile -- cgit v1.2.3 From 5e174cbd419503afd2f84a30dd176afe60985f28 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 26 Jul 2005 06:45:31 +0000 Subject: Replaced the initial pull from vanille.de with a download of a prepared database from one of our mirrors --- Makefile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index e301647bfe..447f4d0e05 100644 --- a/Makefile +++ b/Makefile @@ -47,18 +47,12 @@ optware-wl500g build-optware-wl500g: optware/wl500g/Makefile .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: - [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) - ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded.* ) - ( monotone -d monotone/nslu2-linux.db unset database default-server ) - ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) + [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && \ + wget http://ipkg-us-dyoung.nslu2-linux.org/monotone/nslu2-linux.db.gz -O monotone/nslu2-linux.db.gz && \ + gunzip monotone/nslu2-linux.db.gz ) + - ( monotone -d monotone/nslu2-linux.db unset database default-server ) + - ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) - # Above may be supplemented by following someday - # It currently *requires* monotone 0.21, or it will fail with - # a mysterious sounding database error. - # wget http://www.nslu2-linux.org/monotone/nslu2-linux.db.gz -O monotone/nslu2-linux.db.gz - # or - # wget http://ipkg-us-dyoung.nslu2-linux.org/monotone/nslu2-linux.db.gz -O monotone/nslu2-linux.db.gz - # followed by decompressing it downloads: [ -e downloads ] || mkdir -p downloads -- cgit v1.2.3 From fb0a1efcf6fe91a549f39affbd9ea021987453bc Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 26 Jul 2005 06:49:21 +0000 Subject: Commented out the upload line which was failing. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 447f4d0e05..ae5e9bbf0b 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,7 @@ upload-unslung-modules: unslung/Makefile gzip -c unslung/tmp/deploy/ipk/Packages > unslung/tmp/deploy/ipk/Packages.gz rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ rsync -vl unslung/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ - rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ +# rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ .PHONY: upload-optware-nslu2-cross upload-optware-nslu2-cross: optware/nslu2/Makefile -- cgit v1.2.3 From dde76611a8f3a2606b9ed24ea1a4c6653fde5d04 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 26 Jul 2005 13:21:48 +0000 Subject: Small fixes to openslug and unslung Makefiles for native builds --- openslug/Makefile | 4 ++-- unslung/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openslug/Makefile b/openslug/Makefile index d6fc3dd8dd..657ed278f5 100644 --- a/openslug/Makefile +++ b/openslug/Makefile @@ -2,7 +2,7 @@ # Licensed under the GPL v2 or later openslug-firmware: setup-env conf/local.conf - . setup-env ; bitbake openslug-packages + . ./setup-env ; bitbake openslug-packages # This does the same thing but with a clean environment # The HOME setting prevents user environment settings @@ -11,7 +11,7 @@ openslug-firmware: setup-env conf/local.conf # .cache in the home directory. openslug-firmware-safe: setup-env conf/local.conf env -i CCACHE_DISABLE=1 CCACHE_DIR="`pwd`/tmp/ccache" HOME=/dev/null \ - sh -c '. setup-env; bitbake openslug-packages' + sh -c '. ./setup-env; bitbake openslug-packages' setup-env: [ -e bitbake ] || ln -s ../bitbake . diff --git a/unslung/Makefile b/unslung/Makefile index a435a1121e..7016538075 100644 --- a/unslung/Makefile +++ b/unslung/Makefile @@ -2,7 +2,7 @@ # Licensed under the GPL v2 or later unslung-firmware: setup-env conf/local.conf - . setup-env ; bitbake unslung-packages + . ./setup-env ; bitbake unslung-packages # This does the same thing but with a clean environment # The HOME setting prevents user environment settings @@ -11,7 +11,7 @@ unslung-firmware: setup-env conf/local.conf # .cache in the home directory. unslung-firmware-safe: setup-env conf/local.conf env -i CCACHE_DISABLE=1 CCACHE_DIR="`pwd`/tmp/ccache" HOME=/dev/null \ - sh -c '. setup-env; bitbake unslung-packages' + sh -c '. ./setup-env; bitbake unslung-packages' setup-env: [ -e bitbake ] || ln -s ../bitbake . -- cgit v1.2.3 From dd6683506b1a920bf700e44fd44d32b40e085b5b Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 29 Jul 2005 07:22:05 +0000 Subject: Improved the optware build targets --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ae5e9bbf0b..8161753663 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,8 @@ setup-optware optware/Makefile: ${MAKE} downloads [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) -optware/nslu2/Makefile : optware/Makefile +optware/nslu2/Makefile: + ${MAKE} optware/Makefile [ -e optware/nslu2/Makefile ] || ( \ mkdir -p optware/nslu2 ; \ echo "OPTWARE_TARGET=nslu2" > optware/nslu2/Makefile ; \ @@ -93,7 +94,8 @@ optware/nslu2/Makefile : optware/Makefile ln -s ../sources optware/nslu2/sources ; \ ) -optware/wl500g/Makefile : optware/Makefile +optware/wl500g/Makefile: + ${MAKE} optware/Makefile [ -e optware/wl500g/Makefile ] || ( \ mkdir -p optware/wl500g ; \ echo "OPTWARE_TARGET=wl500g" > optware/wl500g/Makefile ; \ -- cgit v1.2.3 From 0933116aa8d0ae1c47f660122960cfcd31d6f3df Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 29 Jul 2005 07:27:49 +0000 Subject: Improved the OE import and export targets --- Makefile | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 8161753663..9555c2b971 100644 --- a/Makefile +++ b/Makefile @@ -20,9 +20,6 @@ setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-dev .PHONY: update update: update-master update-bitbake update-openembedded update-optware -.PHONY: upload -upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross - .PHONY: clobber clobber: clobber-optware clobber-openembedded clobber-bitbake @@ -203,11 +200,12 @@ clobber-optware: # Targets for use by those with write access to the repositories .PHONY: push -push: push-master push-openembedded +push: push-master push-bitbake push-openembedded .PHONY: push-master push-master: update-master monotone push + scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile .PHONY: push-bitbake push-bitbake: update-bitbake @@ -219,9 +217,8 @@ push-openembedded: update-openembedded # Targets for use by core team members only -.PHONY: publish-master -publish-master: push-master - scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile +.PHONY: upload +upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile @@ -251,37 +248,30 @@ upload-optware-wl500g-cross: optware/wl500g/Makefile rsync -vl optware/wl500g/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ rsync -vlrt --delete optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ +.PHONY: import-bitbake +import-bitbake: bitbake/bin/bitbake + svn co svn://svn.berlios.de/bitbake/trunk/bitbake + .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf monotone pull monotone.vanille.de org.openembedded.* if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.dev ; \ fi - -.PHONY: import-bitbake -import-bitbake: bitbake/bin/bitbake - svn co svn://svn.berlios.de/bitbake/trunk/bitbake - -.PHONY: propagate-from-oe -propagate-from-oe: monotone propagate org.openembedded.dev org.openembedded.nslu2-linux if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.nslu2-linux ; \ fi -.PHONY: propagate-to-oe -propagate-to-oe: +.PHONY: export-openembedded +export-openembedded: openembedded/conf/machine/nslu2.conf monotone propagate org.openembedded.nslu2-linux org.openembedded.dev if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.dev ; \ fi - -.PHONY: export-openembedded -export-openembedded: openembedded/conf/machine/nslu2.conf monotone push monotone.vanille.de org.openembedded.* .PHONY: publish-openembedded -publish-openembedded: import-openembedded propagate-from-oe update-openembedded \ - propagate-to-oe push-openembedded export-openembedded +publish-openembedded: import-openembedded update-openembedded push-openembedded export-openembedded # End of Makefile -- cgit v1.2.3 From cb37f51459f99f8f293869b4de28bd6d3f4e9b1f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 29 Jul 2005 07:33:49 +0000 Subject: Fixed the push-master target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9555c2b971..861e5a609a 100644 --- a/Makefile +++ b/Makefile @@ -205,7 +205,7 @@ push: push-master push-bitbake push-openembedded .PHONY: push-master push-master: update-master monotone push - scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile + scp Makefile rwhitby@www.nslu2-linux.org:/home/nslu/public_html/Makefile .PHONY: push-bitbake push-bitbake: update-bitbake -- cgit v1.2.3 From f64ef92c8c405258694ed81a75f0b6bc6135f293 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 29 Jul 2005 07:41:12 +0000 Subject: Added the upload-sources target for pushing sources to mirrors --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 861e5a609a..3723990a33 100644 --- a/Makefile +++ b/Makefile @@ -218,7 +218,7 @@ push-openembedded: update-openembedded # Targets for use by core team members only .PHONY: upload -upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross +upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross upload-sources .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile @@ -248,6 +248,10 @@ upload-optware-wl500g-cross: optware/wl500g/Makefile rsync -vl optware/wl500g/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ rsync -vlrt --delete optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ +.PHONY: upload-sources +upload-sources: + rsync -vlrt --exclude='ixp400*' downloads/ unslung@ipkg.nslu2-linux.org:nslu/sources/ + .PHONY: import-bitbake import-bitbake: bitbake/bin/bitbake svn co svn://svn.berlios.de/bitbake/trunk/bitbake -- cgit v1.2.3 From 63468a250c6824ae41f0b1b2f525e549f31b0d25 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Fri, 29 Jul 2005 10:27:16 +0000 Subject: Added hooks for mirror syncing --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 3723990a33..8995658022 100644 --- a/Makefile +++ b/Makefile @@ -223,8 +223,10 @@ upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ + ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_ipk openslug/cross rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ rsync -vlrt --delete openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ + ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_packages_clean openslug/cross .PHONY: upload-unslung-modules upload-unslung-modules: unslung/Makefile @@ -233,20 +235,26 @@ upload-unslung-modules: unslung/Makefile rm -f unslung/tmp/deploy/ipk/Packages.gz gzip -c unslung/tmp/deploy/ipk/Packages > unslung/tmp/deploy/ipk/Packages.gz rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ + ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_ipk unslung/oe rsync -vl unslung/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ + ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_packages_clean unslung/oe # rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ .PHONY: upload-optware-nslu2-cross upload-optware-nslu2-cross: optware/nslu2/Makefile rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ + ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_ipk unslung/cross rsync -vl optware/nslu2/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ rsync -vlrt --delete optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ + ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_packages_clean unslung/cross .PHONY: upload-optware-wl500g-cross upload-optware-wl500g-cross: optware/wl500g/Makefile rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ + ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_ipk unslung/wl500g rsync -vl optware/wl500g/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ rsync -vlrt --delete optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ + ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_packages_clean unslung/wl500g .PHONY: upload-sources upload-sources: -- cgit v1.2.3 From 398c1c2678a0c9bcb6b79a812153e72879a48834 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 27 Jul 2005 08:05:37 +0000 Subject: Added new sources.nslu2-linux.org master mirror --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 8995658022..7d362c3afa 100644 --- a/Makefile +++ b/Makefile @@ -223,10 +223,10 @@ upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ - ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_ipk openslug/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync_ipk openslug/cross rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ rsync -vlrt --delete openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ - ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_packages_clean openslug/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync_packages_clean openslug/cross .PHONY: upload-unslung-modules upload-unslung-modules: unslung/Makefile @@ -235,30 +235,30 @@ upload-unslung-modules: unslung/Makefile rm -f unslung/tmp/deploy/ipk/Packages.gz gzip -c unslung/tmp/deploy/ipk/Packages > unslung/tmp/deploy/ipk/Packages.gz rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ - ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_ipk unslung/oe + ssh nslu2@sources.nslu2-linux.org mirror/sync_ipk unslung/oe rsync -vl unslung/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ - ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_packages_clean unslung/oe + ssh nslu2@sources.nslu2-linux.org mirror/sync_packages_clean unslung/oe # rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ .PHONY: upload-optware-nslu2-cross upload-optware-nslu2-cross: optware/nslu2/Makefile rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ - ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_ipk unslung/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync_ipk unslung/cross rsync -vl optware/nslu2/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ rsync -vlrt --delete optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ - ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_packages_clean unslung/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync_packages_clean unslung/cross .PHONY: upload-optware-wl500g-cross upload-optware-wl500g-cross: optware/wl500g/Makefile rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ - ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_ipk unslung/wl500g + ssh nslu2@sources.nslu2-linux.org mirror/sync_ipk unslung/wl500g rsync -vl optware/wl500g/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ rsync -vlrt --delete optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ - ssh nslu2@ipkg-us-dyoung.nslu2-linux.org mirror/sync_packages_clean unslung/wl500g + ssh nslu2@sources.nslu2-linux.org mirror/sync_packages_clean unslung/wl500g .PHONY: upload-sources upload-sources: - rsync -vlrt --exclude='ixp400*' downloads/ unslung@ipkg.nslu2-linux.org:nslu/sources/ + rsync -vlrt --exclude='ixp400*' downloads/ nslu2@sources.nslu2-linux.org:ipkg/sources/ .PHONY: import-bitbake import-bitbake: bitbake/bin/bitbake -- cgit v1.2.3 From c82a9e624ca21055f5067cb66ada11618cdb0769 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 27 Jul 2005 09:40:07 +0000 Subject: Made all the cvs commands quiet --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7d362c3afa..60d3a16040 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ setup-openembedded openembedded/conf/machine/nslu2.conf: .PHONY: setup-optware setup-optware optware/Makefile: ${MAKE} downloads - [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) + [ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) optware/nslu2/Makefile: ${MAKE} optware/Makefile @@ -107,28 +107,28 @@ optware/wl500g/Makefile: setup-optware-developer: ${MAKE} downloads [ ! -e optware ] || ( mv optware optware-user ) - cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung + cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung ${MAKE} optware/nslu2/Makefile optware/wl500g/Makefile .PHONY: setup-slugimage-developer setup-slugimage-developer: - cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co slugimage + cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co slugimage .PHONY: setup-upslug-developer setup-upslug-developer: - cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co upslug + cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co upslug .PHONY: setup-sluggo-developer setup-sluggo-developer: - cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co sluggo + cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co sluggo .PHONY: setup-apex setup-apex apex/Makefile: - cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co apex + cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co apex .PHONY: setup-apex-developer setup-apex-developer: - cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co apex + cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co apex .PHONY: setup-host-debian setup-host-debian: @@ -183,7 +183,7 @@ update-openembedded: openembedded/conf/machine/nslu2.conf .PHONY: update-optware update-optware: optware/Makefile - ( cd optware ; cvs update -d -P ) + ( cd optware ; cvs -q update -d -P ) .PHONY: clobber-bitbake clobber-bitbake: -- cgit v1.2.3 From 6a8486d842cd7b996b09430fd75d2f7b16936a9b Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 27 Jul 2005 10:08:40 +0000 Subject: Migrated to correct user for www.nslu2-linux.org --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 60d3a16040..d3aef815ae 100644 --- a/Makefile +++ b/Makefile @@ -205,7 +205,7 @@ push: push-master push-bitbake push-openembedded .PHONY: push-master push-master: update-master monotone push - scp Makefile rwhitby@www.nslu2-linux.org:/home/nslu/public_html/Makefile + scp Makefile nslu@www.nslu2-linux.org:public_html/Makefile .PHONY: push-bitbake push-bitbake: update-bitbake -- cgit v1.2.3 From f5c5871199a5d62d40175efe733fd4e6541279f2 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Fri, 29 Jul 2005 13:31:02 +0000 Subject: change the source URL for initial monotone db --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 60d3a16040..ec27efa332 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ optware-wl500g build-optware-wl500g: optware/wl500g/Makefile .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && \ - wget http://ipkg-us-dyoung.nslu2-linux.org/monotone/nslu2-linux.db.gz -O monotone/nslu2-linux.db.gz && \ + wget http://sources.nslu2-linux.org/monotone/nslu2-linux.db.gz -O monotone/nslu2-linux.db.gz && \ gunzip monotone/nslu2-linux.db.gz ) - ( monotone -d monotone/nslu2-linux.db unset database default-server ) - ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) -- cgit v1.2.3 From 9978017cd5a2bf40d031dcc7bce456756892dd61 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 27 Jul 2005 11:28:32 +0000 Subject: Remove the morgue dirs before uploading --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index fbdb72dae6..f97685759d 100644 --- a/Makefile +++ b/Makefile @@ -222,6 +222,7 @@ upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile + rm -rf openslug/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ ssh nslu2@sources.nslu2-linux.org mirror/sync_ipk openslug/cross rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ @@ -230,6 +231,7 @@ upload-openslug-cross: openslug/Makefile .PHONY: upload-unslung-modules upload-unslung-modules: unslung/Makefile + rm -rf unslung/tmp/deploy/ipk/morgue scripts/package-strip.pl kernel-module-\* unslung/tmp/deploy/ipk/Packages unslung/tmp/deploy/ipk/Packages.new mv unslung/tmp/deploy/ipk/Packages.new unslung/tmp/deploy/ipk/Packages rm -f unslung/tmp/deploy/ipk/Packages.gz -- cgit v1.2.3 From 5ed49b042fa7311f334a61d92b0a82b47a6eb58b Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 28 Jul 2005 05:59:16 +0000 Subject: Added a naive autobuild target --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index f97685759d..df9b19dec5 100644 --- a/Makefile +++ b/Makefile @@ -217,6 +217,12 @@ push-openembedded: update-openembedded # Targets for use by core team members only +.PHONY: autobuild +autobuild: + while true ; do \ + ${MAKE} update build upload ; \ + done + .PHONY: upload upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross upload-sources -- cgit v1.2.3 From f8806e26ae6461f020879f41f0d8535daa824c95 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 28 Jul 2005 07:50:26 +0000 Subject: Removed the CVS_TARBALL_STASH from local.conf.template, cause it is now in nslu2.conf --- openslug/conf/local.conf.template | 4 ---- unslung/conf/local.conf.template | 4 ---- 2 files changed, 8 deletions(-) diff --git a/openslug/conf/local.conf.template b/openslug/conf/local.conf.template index 9139503e6d..45fae8f0d7 100644 --- a/openslug/conf/local.conf.template +++ b/openslug/conf/local.conf.template @@ -89,10 +89,6 @@ CACHE = "${OEROOT}/tmp/cache" # Uncomment this if you want OE to emit the log if a build fails. OEINCLUDELOGS = "yes" -# Specifies a location to search for pre-generated tarballs when fetching -# a cvs:// URI. Uncomment this, if you not want to pull directly from CVS. -CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" - # INHERIT += "src_distribute_local pkg_distribute" # EDIT THIS FILE and then remove the line below before using! diff --git a/unslung/conf/local.conf.template b/unslung/conf/local.conf.template index 3ec09752f1..db24fdf849 100644 --- a/unslung/conf/local.conf.template +++ b/unslung/conf/local.conf.template @@ -52,10 +52,6 @@ CACHE = "${OEROOT}/tmp/cache" # Uncomment this if you want OE to emit the log if a build fails. OEINCLUDELOGS = "yes" -# Specifies a location to search for pre-generated tarballs when fetching -# a cvs:// URI. Uncomment this, if you not want to pull directly from CVS. -CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" - # INHERIT += "src_distribute_local pkg_distribute" # EDIT THIS FILE and then remove the line below before using! -- cgit v1.2.3 From 31323e038dac41ebbae0f33e0471d46ec5bd38db Mon Sep 17 00:00:00 2001 From: Derek Young Date: Sat, 30 Jul 2005 10:08:49 +0000 Subject: change names from sync_foo to sync-foo --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index df9b19dec5..f412c36f81 100644 --- a/Makefile +++ b/Makefile @@ -230,10 +230,10 @@ upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross upload-openslug-cross: openslug/Makefile rm -rf openslug/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync_ipk openslug/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ rsync -vlrt --delete openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync_packages_clean openslug/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages_clean openslug/cross .PHONY: upload-unslung-modules upload-unslung-modules: unslung/Makefile @@ -243,26 +243,26 @@ upload-unslung-modules: unslung/Makefile rm -f unslung/tmp/deploy/ipk/Packages.gz gzip -c unslung/tmp/deploy/ipk/Packages > unslung/tmp/deploy/ipk/Packages.gz rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ - ssh nslu2@sources.nslu2-linux.org mirror/sync_ipk unslung/oe + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/oe rsync -vl unslung/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ - ssh nslu2@sources.nslu2-linux.org mirror/sync_packages_clean unslung/oe + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages_clean unslung/oe # rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ .PHONY: upload-optware-nslu2-cross upload-optware-nslu2-cross: optware/nslu2/Makefile rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ - ssh nslu2@sources.nslu2-linux.org mirror/sync_ipk unslung/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross rsync -vl optware/nslu2/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ rsync -vlrt --delete optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ - ssh nslu2@sources.nslu2-linux.org mirror/sync_packages_clean unslung/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages_clean unslung/cross .PHONY: upload-optware-wl500g-cross upload-optware-wl500g-cross: optware/wl500g/Makefile rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ - ssh nslu2@sources.nslu2-linux.org mirror/sync_ipk unslung/wl500g + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g rsync -vl optware/wl500g/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ rsync -vlrt --delete optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ - ssh nslu2@sources.nslu2-linux.org mirror/sync_packages_clean unslung/wl500g + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages_clean unslung/wl500g .PHONY: upload-sources upload-sources: -- cgit v1.2.3 From 71fe9cf98f09abfa1d0b79bddc951793e8620afe Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 28 Jul 2005 10:07:09 +0000 Subject: More merging in publish-openembedded, and updated autobuild (to be called from cron) --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f412c36f81..579f4136c8 100644 --- a/Makefile +++ b/Makefile @@ -219,9 +219,7 @@ push-openembedded: update-openembedded .PHONY: autobuild autobuild: - while true ; do \ - ${MAKE} update build upload ; \ - done + ${MAKE} update build upload .PHONY: upload upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross upload-sources @@ -278,6 +276,9 @@ import-openembedded: openembedded/conf/machine/nslu2.conf if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.dev ; \ fi + if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.nslu2-linux ; \ + fi monotone propagate org.openembedded.dev org.openembedded.nslu2-linux if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.nslu2-linux ; \ @@ -285,6 +286,12 @@ import-openembedded: openembedded/conf/machine/nslu2.conf .PHONY: export-openembedded export-openembedded: openembedded/conf/machine/nslu2.conf + if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.nslu2-linux ; \ + fi + if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.dev ; \ + fi monotone propagate org.openembedded.nslu2-linux org.openembedded.dev if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.dev ; \ -- cgit v1.2.3 From 3a6121158d85667d2ac7dba775280a0be72ea33b Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 28 Jul 2005 11:11:33 +0000 Subject: Fixed the sync-packages_clean script name (should be sync-packages-clean) --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 579f4136c8..10262facb4 100644 --- a/Makefile +++ b/Makefile @@ -231,7 +231,7 @@ upload-openslug-cross: openslug/Makefile ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ rsync -vlrt --delete openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages_clean openslug/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross .PHONY: upload-unslung-modules upload-unslung-modules: unslung/Makefile @@ -243,7 +243,7 @@ upload-unslung-modules: unslung/Makefile rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/oe rsync -vl unslung/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages_clean unslung/oe + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/oe # rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ .PHONY: upload-optware-nslu2-cross @@ -252,7 +252,7 @@ upload-optware-nslu2-cross: optware/nslu2/Makefile ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross rsync -vl optware/nslu2/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ rsync -vlrt --delete optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages_clean unslung/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/cross .PHONY: upload-optware-wl500g-cross upload-optware-wl500g-cross: optware/wl500g/Makefile @@ -260,7 +260,7 @@ upload-optware-wl500g-cross: optware/wl500g/Makefile ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g rsync -vl optware/wl500g/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ rsync -vlrt --delete optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages_clean unslung/wl500g + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/wl500g .PHONY: upload-sources upload-sources: -- cgit v1.2.3 From 0353b4e219a586d5369382f41ed127ebf408348f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 29 Jul 2005 07:27:41 +0000 Subject: Improved the import-bitbake target --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 10262facb4..50bf3e716f 100644 --- a/Makefile +++ b/Makefile @@ -268,7 +268,11 @@ upload-sources: .PHONY: import-bitbake import-bitbake: bitbake/bin/bitbake + mv bitbake bitbake.old svn co svn://svn.berlios.de/bitbake/trunk/bitbake + cp -rp bitbake.old/MT bitbake.old/.mt-attrs bitbake + rm -rf bitbake.old + ( cd bitbake ; rm -rf .svn ; monotone status ) .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From 1ec4fe88982c3a15507c227d770807405d25463d Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Jul 2005 03:20:44 +0000 Subject: Fixed the openslug upload targets --- Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fd5770bcd7..716cf29be1 100644 --- a/Makefile +++ b/Makefile @@ -242,7 +242,12 @@ push-openembedded: update-openembedded .PHONY: autobuild autobuild: - ${MAKE} update build upload + ${MAKE} update + ${MAKE} build-openslug upload-openslug-cross + ${MAKE} build-unslung upload-unslung-modules + ${MAKE} build-optware-nslu2 upload-optware-nslu2-cross + ${MAKE} build-optware-wl500g upload-optware-wl500g-cross + ${MAKE} upload-sources .PHONY: upload upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross upload-sources @@ -251,10 +256,10 @@ upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross upload-openslug-cross: openslug/Makefile rm -rf openslug/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ rsync -vlrt --delete openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable .PHONY: upload-unslung-modules upload-unslung-modules: unslung/Makefile @@ -289,11 +294,10 @@ upload-optware-wl500g-cross: optware/wl500g/Makefile upload-openslug-2.3-beta-cross: rm -rf releases/OpenSlug-2.3-beta/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/2.3-beta + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta rsync -vl releases/OpenSlug-2.3-beta/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ rsync -vlrt --delete releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross - + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta .PHONY: upload-sources upload-sources: -- cgit v1.2.3 From 58b04ef967a582d63fb14611f5d85ba247c8fe8a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 31 Jul 2005 19:05:42 +0000 Subject: Added setup-openslug-2.3-beta target --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 50bf3e716f..ed0e0eb58b 100644 --- a/Makefile +++ b/Makefile @@ -79,6 +79,12 @@ setup-optware optware/Makefile: ${MAKE} downloads [ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) +.PHONY: setup-openslug-2.3-beta +setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/Makefile: + [ ! -e releases/OpenSlug-2.3-beta ] || mkdir -p releases + svn checkout svn://svn.berlios.de/openslug/releases/OpenSlug-2.3-beta releases/OpenSlug-2.3-beta + cd releases/OpenSlug-2.3-beta && ${MAKE} conf/local.conf setup-env + optware/nslu2/Makefile: ${MAKE} optware/Makefile [ -e optware/nslu2/Makefile ] || ( \ -- cgit v1.2.3 From fd9d0b8353aa1f5958e55c42b94fe9f555a93a10 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 31 Jul 2005 19:10:55 +0000 Subject: Added build-openslug-2.3-beta target --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index ed0e0eb58b..ae09bc79fd 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,10 @@ optware-nslu2 build-optware-nslu2: optware/nslu2/Makefile optware-wl500g build-optware-wl500g: optware/wl500g/Makefile ( cd optware/wl500g ; make autoclean ; make ) +.PHONY: openslug-2.3-beta build-openslug-2.3-beta +openslug-2.3-beta build-openslug-2.3-beta: + ( cd releases/OpenSlug-2.3-beta ; ${MAKE} openslug-firmware ) + .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && \ -- cgit v1.2.3 From c30ba2e3ff4548886ba605e0e0a9f3efe28320d3 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 31 Jul 2005 19:12:56 +0000 Subject: Added update-openslug-2.3-beta target --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index ae09bc79fd..96c30cd90b 100644 --- a/Makefile +++ b/Makefile @@ -195,6 +195,10 @@ update-openembedded: openembedded/conf/machine/nslu2.conf update-optware: optware/Makefile ( cd optware ; cvs -q update -d -P ) +.PHONY: update-openslug-2.3-beta +update-openslug-2.3-beta: + ( cd releases/OpenSlug-2.3-beta ; svn up ) + .PHONY: clobber-bitbake clobber-bitbake: rm -rf bitbake -- cgit v1.2.3 From 6a97d9a518f1038e988ddcc6cc15bb8a7ee3a47e Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 31 Jul 2005 19:17:17 +0000 Subject: Added upload-openslug-2.3-beta-cross target --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 96c30cd90b..91861eb890 100644 --- a/Makefile +++ b/Makefile @@ -276,6 +276,16 @@ upload-optware-wl500g-cross: optware/wl500g/Makefile rsync -vlrt --delete optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/wl500g +.PHONY: upload-openslug-2.3-beta-cross +upload-openslug-2.3-beta-cross: + rm -rf releases/OpenSlug-2.3-beta/tmp/deploy/ipk/morgue + rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/2.3-beta + rsync -vl releases/OpenSlug-2.3-beta/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ + rsync -vlrt --delete releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross + + .PHONY: upload-sources upload-sources: rsync -vlrt --exclude='ixp400*' downloads/ nslu2@sources.nslu2-linux.org:ipkg/sources/ -- cgit v1.2.3 From 288f02466384e5f973b486db3f85fc44971aa1e2 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 31 Jul 2005 19:20:48 +0000 Subject: Added setup-openslug-2.3-beta-developer target --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 91861eb890..ccb7c26103 100644 --- a/Makefile +++ b/Makefile @@ -140,6 +140,12 @@ setup-apex apex/Makefile: setup-apex-developer: cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co apex +.PHONY: setup-openslug-2.3-beta-developer +setup-openslug-2.3-beta-developer: + [ ! -e releases/OpenSlug-2.3-beta ] || mkdir -p releases + svn checkout svn+ssh://svn.berlios.de/openslug/releases/OpenSlug-2.3-beta releases/OpenSlug-2.3-beta + cd releases/OpenSlug-2.3-beta && ${MAKE} conf/local.conf setup-env + .PHONY: setup-host-debian setup-host-debian: sudo apt-get install \ -- cgit v1.2.3 From ec614588fd38a951177b4c268242c2b82cf6284c Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 31 Jul 2005 20:06:34 +0000 Subject: Set up SVN_SSH, and make setup-openslug-2.3-beta target use shared downloads --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ccb7c26103..083dfbb057 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ # Change these if you are unfortunate enough to have a split net personality. SVN_USER ?= ${USER} CVS_USER ?= ${USER} +SVN_SSH ?= "-l ${SVN_USER}" .PHONY: all all: update build @@ -84,10 +85,11 @@ setup-optware optware/Makefile: [ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) .PHONY: setup-openslug-2.3-beta -setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/Makefile: +setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/Makefile: downloads [ ! -e releases/OpenSlug-2.3-beta ] || mkdir -p releases svn checkout svn://svn.berlios.de/openslug/releases/OpenSlug-2.3-beta releases/OpenSlug-2.3-beta cd releases/OpenSlug-2.3-beta && ${MAKE} conf/local.conf setup-env + ln -s ../../downloads releases/OpenSlug-2.3-beta/ optware/nslu2/Makefile: ${MAKE} optware/Makefile -- cgit v1.2.3 From 4eaef3948ff20abcfd044f5c459c28c568240d82 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 31 Jul 2005 20:21:49 +0000 Subject: Make "make update" update openslug-2.3-beta if it exists. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 083dfbb057..26c87ced74 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-dev .PHONY: update update: update-master update-bitbake update-openembedded update-optware + [ ! -e releases/OpenSlug-2.3-beta/Makefile ] || ${MAKE} update-openslug-2.3-beta .PHONY: clobber clobber: clobber-optware clobber-openembedded clobber-bitbake -- cgit v1.2.3 From c29996960230d9e9a9cc09cb5834a1be2b8df24f Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 31 Jul 2005 20:38:22 +0000 Subject: Fix setup-openslug-2.3-beta-developer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 26c87ced74..fd5770bcd7 100644 --- a/Makefile +++ b/Makefile @@ -146,7 +146,7 @@ setup-apex-developer: .PHONY: setup-openslug-2.3-beta-developer setup-openslug-2.3-beta-developer: [ ! -e releases/OpenSlug-2.3-beta ] || mkdir -p releases - svn checkout svn+ssh://svn.berlios.de/openslug/releases/OpenSlug-2.3-beta releases/OpenSlug-2.3-beta + svn checkout svn+ssh://svn.berlios.de/svnroot/repos/openslug/releases/OpenSlug-2.3-beta releases/OpenSlug-2.3-beta cd releases/OpenSlug-2.3-beta && ${MAKE} conf/local.conf setup-env .PHONY: setup-host-debian -- cgit v1.2.3 From cd0f59d82098ec2008c8a657542a8574721ecb94 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 31 Jul 2005 23:29:37 +0000 Subject: Sufficient structure to make a buildable ucslugc (only ucslugc-safe tested so far). --- common/.mtn2git_empty | 0 common/Make.rules | 57 +++++++++++++++++++++++++++++++++++++++++++++ common/conf/.mtn2git_empty | 0 common/conf/site.conf | 43 ++++++++++++++++++++++++++++++++++ common/env | 42 +++++++++++++++++++++++++++++++++ ucslugc/.mtn2git_empty | 0 ucslugc/Makefile | 10 ++++++++ ucslugc/conf/.mtn2git_empty | 0 ucslugc/conf/auto.conf | 3 +++ 9 files changed, 155 insertions(+) create mode 100644 common/.mtn2git_empty create mode 100644 common/Make.rules create mode 100644 common/conf/.mtn2git_empty create mode 100644 common/conf/site.conf create mode 100644 common/env create mode 100644 ucslugc/.mtn2git_empty create mode 100644 ucslugc/Makefile create mode 100644 ucslugc/conf/.mtn2git_empty create mode 100644 ucslugc/conf/auto.conf diff --git a/common/.mtn2git_empty b/common/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common/Make.rules b/common/Make.rules new file mode 100644 index 0000000000..8a5940af56 --- /dev/null +++ b/common/Make.rules @@ -0,0 +1,57 @@ +# Makefile for UcSlugC +# Licensed under the GPL v2 or later +# +# Define DISTRO and TARGET before including this in Makefile + +BUILD_DIRS = downloads home +REQUIRED_DIRS = bitbake openembedded common +FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) + +# The default rule is to build the firmware in an unprotected environment. +$(DISTRO)-firmware: $(FIRMWARE_DEPS) + . common/env; exec bitbake $(TARGET) + +# This rule clobbers the environment (note that ccache uses '$HOME' by +# default, so the cache will end up there). +$(DISTRO)-safe: + env -i HOME="`pwd`/home" PATH="$${PATH}" $(MAKE) $(DISTRO)-firmware + +# topdir.conf is re-created automatically if the directory is +# moved - this will cause a full bitbake reparse +.PHONY: create-topdir +create-topdir: topdir.conf + . topdir.conf && test "`pwd`" = "$$TOPDIR" || echo "TOPDIR='`pwd`'" >topdir.conf + +topdir.conf: + echo "TOPDIR='`pwd`'" >$@ + +# rules for directories - if a symlink exists and the target does not +# exist something will go wrong in the build, therefore cause a failure +# here by the mkdir. +$(BUILD_DIRS): + test -d $@ || if test -d ../$@; then ln -s ../$@ .; else mkdir $@; fi + +# these directories must already exist - either in TOPDIR (here) or in .. +$(REQUIRED_DIRS): + test -d $@ || if test -d ../$@; then ln -s ../$@ .; else exit 1; fi + +.PHONY: clobber +clobber: + rm -rf tmp + +.PHONY: $(DISTRO)-source +$(DISTRO)-source: $(REQUIRED_DIRS) + tar zcf $@.tar.gz --exclude=MT Makefile conf/auto.conf $(REQUIRED_DIRS:=/.) + +# This target probably isn't important any longer, because the -source +# target above does the right thing +.PHONY: +distclean: clobber + rm -rf topdir.conf conf/local.conf $(BUILD_DIRS) + +# This target is mainly for testing - it is intended to put the disto directory +# back to its original state, it will destroy a source-tarball system (because +# it removes directories from the tarball). +.PHONY: +really-clean: distclean + rm -rf $(REQUIRED_DIRS) $(DISTRO)-source.tar.gz diff --git a/common/conf/.mtn2git_empty b/common/conf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common/conf/site.conf b/common/conf/site.conf new file mode 100644 index 0000000000..45451253e7 --- /dev/null +++ b/common/conf/site.conf @@ -0,0 +1,43 @@ +# NSLU2 master makefile bitbake site configuration +# It should not be necessary to alter this file! +# +# This configuration defines the location of the directories +# bitbake requires to build a particular distribution (DISTRO) +# +# Each DISTRO must create a appropriate topdir file containing +# (just) the definition of TOPDIR +include topdir.conf + +# These definitions should be the same for every DISTRO - if +# a change is necessary make it in the DISTRO auto.conf. The +# rvalues are evaluated here for safety (i.e. to prevent accidents +# if something else defines TOPDIR). +TMPDIR := "${TOPDIR}/tmp" +CACHE := "${TMPDIR}/cache" +DL_DIR := "${TOPDIR}/downloads" + +# The following is not defined or used by the standard bitbake +# configuration files, however it must be defined here for 'freeze' +# and 'unfreeze' to work correctly +PKGDIR := "${TOPDIR}/openembedded" + +# BBFILES is the list of all the .bb files bitbake looks at when +# working out how to build a package. By default this value is +# overridden later in the ${DISTRO}.conf file (when it includes +# conf/distro/freeze.conf). +BBFILES := "${PKGDIR}/packages/*/*.bb" + +# The distro must create the following directories - either by +# populating them with the required files or, in the master makefile +# environment, by symbolic links to the relevant shared directories +# (which are directories of the same name in ..) +# +# common - contains conf/site.conf - this file +# bitbake - the directory containing the bitbake program +# downloads - contains the source files downloaded from the network +# openembedded - the directory containing the OE source +# +# All these directories may be shared between multiple distros. +# The 'tmp' directory may not be shared, however bitbake will create +# it automatically when required. The 'downloads' directory will also +# be created if required by bitbake. diff --git a/common/env b/common/env new file mode 100644 index 0000000000..b41e1f4bc5 --- /dev/null +++ b/common/env @@ -0,0 +1,42 @@ +# setup up the environment for a bitbake build. This is used +# by the makefile and may also be directly sourced from an +# interactive shell. The makefile uses 'env -i' to ensure +# no variables are inherited apart from CCACHE_DISABLE and +# CCACHE_DIR +# +# topdir must exist in the directory and define TOPDIR to +# the full path name of the working directory +. ./topdir.conf +test -n "$TOPDIR" -a -d "$TOPDIR" || { + echo "environment: TOPDIR not defined" >&2 + exit 1 +} +# +# the following must match the definitions in common/conf/site.conf +export PYTHONPATH="${TOPDIR}/bitbake/lib" +export BBPATH="${TOPDIR}:${TOPDIR}/common:${TOPDIR}/openembedded:${TOPDIR}/bitbake" +export PATH="${TOPDIR}/bitbake/bin:${PATH}" +export LD_LIBRARY_PATH= +export LANG=C +#NOTE: if you add export definitions here add them below too! +# +# unset the following (unnecessary for the makefile, but safe) +unset LC_CTYPE +unset CC +unset CXX +unset MFLAGS +unset MAKEFLAGS +# +# make bb into a 'safe' bitbake +alias bb="env -i \ + CCACHE_DISABLE='${CCACHE_DISABLE}' \ + CCACHE_DIR='${CCACHE_DIR}' \ + PYTHONPATH='${PYTHONPATH}' \ + BBPATH='${BBPATH}' \ + PATH='${PATH}' \ + LD_LIBRARY_PATH='${LD_LIBRARY_PATH}' \ + LANG='${LANG}' \ + '${TOPDIR}/bitbake/bin/bitbake'" +# +# remove TOPDIR - not required +unset TOPDIR diff --git a/ucslugc/.mtn2git_empty b/ucslugc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ucslugc/Makefile b/ucslugc/Makefile new file mode 100644 index 0000000000..d210721ee2 --- /dev/null +++ b/ucslugc/Makefile @@ -0,0 +1,10 @@ +# Makefile for UcSlugC +# Licensed under the GPL v2 or later +DISTRO=ucslugc +TARGET=openslug-packages + +include common/Make.rules + +# The following is required for bootstrapping +common/Make.rules: + make -f ../common/Make.rules common diff --git a/ucslugc/conf/.mtn2git_empty b/ucslugc/conf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ucslugc/conf/auto.conf b/ucslugc/conf/auto.conf new file mode 100644 index 0000000000..0c584f449e --- /dev/null +++ b/ucslugc/conf/auto.conf @@ -0,0 +1,3 @@ +# UcSlugC bitbake configuration +DISTRO="ucslugc" +MACHINE="nslu2" -- cgit v1.2.3 From f1fa325bda1a07938f7a94f201264e0d655f5804 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 1 Aug 2005 00:03:09 +0000 Subject: Add setup-env and local.conf.sample, correct the 'bb' alias and make a new one called bb-safe. --- common/Make.rules | 4 ++-- common/env | 6 +++--- ucslugc/conf/local.conf.sample | 49 ++++++++++++++++++++++++++++++++++++++++++ ucslugc/setup-env | 14 ++++++++++++ 4 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 ucslugc/conf/local.conf.sample create mode 100644 ucslugc/setup-env diff --git a/common/Make.rules b/common/Make.rules index 8a5940af56..1a32b364ba 100644 --- a/common/Make.rules +++ b/common/Make.rules @@ -41,13 +41,13 @@ clobber: .PHONY: $(DISTRO)-source $(DISTRO)-source: $(REQUIRED_DIRS) - tar zcf $@.tar.gz --exclude=MT Makefile conf/auto.conf $(REQUIRED_DIRS:=/.) + tar zcf $@.tar.gz --exclude=MT Makefile conf/auto.conf conf/local.conf.sample $(REQUIRED_DIRS:=/.) # This target probably isn't important any longer, because the -source # target above does the right thing .PHONY: distclean: clobber - rm -rf topdir.conf conf/local.conf $(BUILD_DIRS) + rm -rf topdir.conf conf/local.conf common/conf/local.conf $(BUILD_DIRS) # This target is mainly for testing - it is intended to put the disto directory # back to its original state, it will destroy a source-tarball system (because diff --git a/common/env b/common/env index b41e1f4bc5..9cf757aa30 100644 --- a/common/env +++ b/common/env @@ -28,15 +28,15 @@ unset MFLAGS unset MAKEFLAGS # # make bb into a 'safe' bitbake -alias bb="env -i \ - CCACHE_DISABLE='${CCACHE_DISABLE}' \ - CCACHE_DIR='${CCACHE_DIR}' \ +alias bb-safe="env -i \ + HOME='${TOPDIR}/home' \ PYTHONPATH='${PYTHONPATH}' \ BBPATH='${BBPATH}' \ PATH='${PATH}' \ LD_LIBRARY_PATH='${LD_LIBRARY_PATH}' \ LANG='${LANG}' \ '${TOPDIR}/bitbake/bin/bitbake'" +alias bb="'${TOPDIR}/bitbake/bin/bitbake'" # # remove TOPDIR - not required unset TOPDIR diff --git a/ucslugc/conf/local.conf.sample b/ucslugc/conf/local.conf.sample new file mode 100644 index 0000000000..d94379f7ac --- /dev/null +++ b/ucslugc/conf/local.conf.sample @@ -0,0 +1,49 @@ +# Sample local configuration +# +# You do not need a 'local.conf' file, however you may use one to alter +# how the UcSlugC build proceeds and to specify bitbake options. +# +#---------------------------------------------------------------------------------- +# bitbake options +#---------------------------------------------------------------------------------- +# +#BBINCLUDELOGS = "yes" +# bitbake logs build progress to per-package log files. By default if an +# error occurs bitbake outputs the name of this file with an error message. +# If you set BBINCLUDELOGS to 'yes' then bitbake will also output the log +# file itself. +# +#BBMASK = "regular expression" +# bitbake examines all the .bb files listed in the BBFILES variable. BBMASK +# can be used to exclude some (or, indeed, all) of these files by matching +# against a regular expression. Typically you do not want to do this because +# bitbake freeze can be used to generate a minimal list for BBFILES. +# +#NOTE: you may prefer to make a global local.conf file in common/conf to specify +# these options, however if you do this it will be overridden (ignored) if you also +# specify a local.conf here. +# +#---------------------------------------------------------------------------------- +# UcSlugC options +#---------------------------------------------------------------------------------- +#FEED_URIS = "##" +# Define local feeds - should be replaced by a name which identifies +# your local feed (not a generic name!) and should be the location of +# the Packages.gz file (and, therefore, all the ipks). This is not required; +# the feed defaults to the internet one. +# +#UCLIBC_EXTRA_DEPENDS = "packages to add to the build" +# Any packages in this list will be built as depenencies of the firmware +# image, but they will not be included in the image (see below). +# +#UCLIBC_EXTRA_RDEPENDS = "packages to add to the firmware image" +# Any packages in this list will be added to the firmware image. Please do +# not distribute such images - make a new DISTRO.conf file following the +# instructions in conf/distro/ucslugc.conf +# +#UCLIBC_EXTRA_BBFILES = "paths of extra .bb files" +# Files in this list will be parsed by bitbake to find packages in addition +# to the default list of bb files in conf/distro/ucslugc-packages.conf. The +# setting of this variable is irrelevant after bb freeze has been built or if +# bb unfreeze is built (in the latter case bitbake will examine all of the +# openembedded packages). diff --git a/ucslugc/setup-env b/ucslugc/setup-env new file mode 100644 index 0000000000..56f39fbe21 --- /dev/null +++ b/ucslugc/setup-env @@ -0,0 +1,14 @@ +# set up an environment for building UcSlugC +# (it is sufficient to source common/env to do this, this +# script, which should be sourced, exists to mirror the old +# method). +test -d common || { + test -d ../common && ln -s ../common ./common +} +if test -r common/env +then + . common/env + echo 'Environment set up for UcSlugC development.' +else + echo "setup-env: 'common/env' script not found" >&2 +fi -- cgit v1.2.3 From 846b32b8001abc1608640d45c11e68c609c34b69 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 1 Aug 2005 00:36:35 +0000 Subject: Add ucslugc targets --- Makefile | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fd5770bcd7..5d9b1915de 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,10 @@ unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/ma openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf ( cd openslug ; make ) +.PHONY: ucslugc build-ucslugc +ucslugc build-ucslugc: ucslugc/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf + ( cd ucslugc ; make ) + .PHONY: optware build-optware optware build-optware: build-optware-nslu2 build-optware-wl500g @@ -57,10 +61,10 @@ setup-monotone monotone/nslu2-linux.db: - ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) -downloads: - [ -e downloads ] || mkdir -p downloads +downloads home: + [ -e $@ ] || mkdir -p $@ -unslung/Makefile openslug/Makefile MT/revision: +unslung/Makefile openslug/Makefile ucslugc/Makefile common/Make.rules MT/revision: ${MAKE} downloads [ -e monotone/nslu2-linux.db ] || ( ${MAKE} monotone/nslu2-linux.db ) [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) @@ -256,6 +260,15 @@ upload-openslug-cross: openslug/Makefile rsync -vlrt --delete openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross +.PHONY: upload-ucslugc-cross +upload-ucslugc-cross: ucslugc/Makefile + rm -rf ucslugc/tmp/deploy/ipk/morgue + rsync -vlrt --exclude='Packages*' ucslugc/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/ucslugc/cross/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross + rsync -vl ucslugc/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/ucslugc/cross/unstable/ + rsync -vlrt --delete ucslugc/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/ucslugc/cross/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross + .PHONY: upload-unslung-modules upload-unslung-modules: unslung/Makefile rm -rf unslung/tmp/deploy/ipk/morgue -- cgit v1.2.3 From eda933d33cc7df5f3b1d5c809108a70d7c26c23f Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 1 Aug 2005 02:12:32 +0000 Subject: Add ucslugc to the build and upload targets --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5d9b1915de..c5f8304c13 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ SVN_SSH ?= "-l ${SVN_USER}" all: update build .PHONY: build -build: build-unslung build-openslug build-optware +build: build-unslung build-openslug build-ucslugc build-optware .PHONY: setup setup: setup-master setup-bitbake setup-openembedded setup-optware @@ -249,7 +249,7 @@ autobuild: ${MAKE} update build upload .PHONY: upload -upload: upload-openslug-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross upload-sources +upload: upload-openslug-cross upload-ucslugc-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross upload-sources .PHONY: upload-openslug-cross upload-openslug-cross: openslug/Makefile -- cgit v1.2.3 From b9e4a2c60cfa6b2d8546820795681623527a7cec Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 1 Aug 2005 02:15:38 +0000 Subject: Change make to $(MAKE) --- ucslugc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ucslugc/Makefile b/ucslugc/Makefile index d210721ee2..fdaab6fc1c 100644 --- a/ucslugc/Makefile +++ b/ucslugc/Makefile @@ -7,4 +7,4 @@ include common/Make.rules # The following is required for bootstrapping common/Make.rules: - make -f ../common/Make.rules common + $(MAKE) -f ../common/Make.rules common -- cgit v1.2.3 From 5c3ef6f2f72d4ca7b1116df3dfd6353327a710d6 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 1 Aug 2005 02:21:42 +0000 Subject: Change to use ${MAKE} (not make) everywhere --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c5f8304c13..86e4857e89 100644 --- a/Makefile +++ b/Makefile @@ -27,26 +27,26 @@ clobber: clobber-optware clobber-openembedded clobber-bitbake .PHONY: unslung build-unslung unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf - ( cd unslung ; make ) + ( cd unslung ; ${MAKE} ) .PHONY: openslug build-openslug openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf - ( cd openslug ; make ) + ( cd openslug ; ${MAKE} ) .PHONY: ucslugc build-ucslugc ucslugc build-ucslugc: ucslugc/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf - ( cd ucslugc ; make ) + ( cd ucslugc ; ${MAKE} ) .PHONY: optware build-optware optware build-optware: build-optware-nslu2 build-optware-wl500g .PHONY: optware-nslu2 build-optware-nslu2 optware-nslu2 build-optware-nslu2: optware/nslu2/Makefile - ( cd optware/nslu2 ; make autoclean ; make ) + ( cd optware/nslu2 ; ${MAKE} autoclean ; ${MAKE} ) .PHONY: optware-wl500g build-optware-wl500g optware-wl500g build-optware-wl500g: optware/wl500g/Makefile - ( cd optware/wl500g ; make autoclean ; make ) + ( cd optware/wl500g ; ${MAKE} autoclean ; ${MAKE} ) .PHONY: openslug-2.3-beta build-openslug-2.3-beta openslug-2.3-beta build-openslug-2.3-beta: -- cgit v1.2.3 From 0cbdc3a875de6fd1dec1ac3ebdaf056e6cd5fc5a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Jul 2005 03:33:14 +0000 Subject: Removed the creation of home. --- Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 4b6bdf2506..01e9068a23 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ setup-monotone monotone/nslu2-linux.db: - ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) -downloads home: +downloads: [ -e $@ ] || mkdir -p $@ unslung/Makefile openslug/Makefile ucslugc/Makefile common/Make.rules MT/revision: @@ -263,16 +263,25 @@ upload-openslug-cross: openslug/Makefile ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ rsync -vlrt --delete openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable + +.PHONY: upload-openslug-2.3-beta-cross +upload-openslug-2.3-beta-cross: + rm -rf releases/OpenSlug-2.3-beta/tmp/deploy/ipk/morgue + rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta + rsync -vl releases/OpenSlug-2.3-beta/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ + rsync -vlrt --delete releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta .PHONY: upload-ucslugc-cross upload-ucslugc-cross: ucslugc/Makefile rm -rf ucslugc/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' ucslugc/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/ucslugc/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross/unstable rsync -vl ucslugc/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/ucslugc/cross/unstable/ rsync -vlrt --delete ucslugc/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/ucslugc/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross/unstable .PHONY: upload-unslung-modules upload-unslung-modules: unslung/Makefile @@ -303,15 +312,6 @@ upload-optware-wl500g-cross: optware/wl500g/Makefile rsync -vlrt --delete optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/wl500g -.PHONY: upload-openslug-2.3-beta-cross -upload-openslug-2.3-beta-cross: - rm -rf releases/OpenSlug-2.3-beta/tmp/deploy/ipk/morgue - rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta - rsync -vl releases/OpenSlug-2.3-beta/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ - rsync -vlrt --delete releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta - .PHONY: upload-sources upload-sources: rsync -vlrt --exclude='ixp400*' downloads/ nslu2@sources.nslu2-linux.org:ipkg/sources/ -- cgit v1.2.3 From 0f267b642c029b5548de2d731e6a40ad965a55fa Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Jul 2005 04:20:40 +0000 Subject: Re-enabled ucslugc builds --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 01e9068a23..169bbd6713 100644 --- a/Makefile +++ b/Makefile @@ -247,6 +247,7 @@ push-openembedded: update-openembedded .PHONY: autobuild autobuild: ${MAKE} update + ${MAKE} build-ucslugc upload-ucslugc-cross ${MAKE} build-openslug upload-openslug-cross ${MAKE} build-unslung upload-unslung-modules ${MAKE} build-optware-nslu2 upload-optware-nslu2-cross -- cgit v1.2.3 From bdbfaad29772a37cdcad61885b8ab01d0828aa68 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Jul 2005 05:07:19 +0000 Subject: Revamped the ucslugc setup process, file structure and Makefile. --- Makefile | 26 +++++++++++++++------ common/Make.rules | 57 ----------------------------------------------- common/conf/site.conf | 2 +- common/env | 42 ---------------------------------- common/openembedded.mk | 57 +++++++++++++++++++++++++++++++++++++++++++++++ common/setup-openembedded | 47 ++++++++++++++++++++++++++++++++++++++ ucslugc/Makefile | 10 --------- ucslugc/conf/auto.conf | 1 + ucslugc/setup-env | 14 ------------ 9 files changed, 125 insertions(+), 131 deletions(-) delete mode 100644 common/Make.rules delete mode 100644 common/env create mode 100644 common/openembedded.mk create mode 100644 common/setup-openembedded delete mode 100644 ucslugc/Makefile delete mode 100644 ucslugc/setup-env diff --git a/Makefile b/Makefile index 169bbd6713..6e36e75a98 100644 --- a/Makefile +++ b/Makefile @@ -64,13 +64,13 @@ setup-monotone monotone/nslu2-linux.db: downloads: [ -e $@ ] || mkdir -p $@ -unslung/Makefile openslug/Makefile ucslugc/Makefile common/Make.rules MT/revision: +unslung/Makefile openslug/Makefile common/openembedded.mk common/setup-openembedded MT/revision: ${MAKE} downloads [ -e monotone/nslu2-linux.db ] || ( ${MAKE} monotone/nslu2-linux.db ) [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) .PHONY: setup-master -setup-master: setup-monotone unslung/Makefile openslug/Makefile +setup-master: setup-monotone unslung/Makefile openslug/Makefile ucslugc/Makefile [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) @@ -84,11 +84,6 @@ setup-openembedded openembedded/conf/machine/nslu2.conf: ${MAKE} MT/revision [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded -.PHONY: setup-optware -setup-optware optware/Makefile: - ${MAKE} downloads - [ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) - .PHONY: setup-openslug-2.3-beta setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/Makefile: downloads [ ! -e releases/OpenSlug-2.3-beta ] || mkdir -p releases @@ -96,6 +91,23 @@ setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/Makefile: downloads cd releases/OpenSlug-2.3-beta && ${MAKE} conf/local.conf setup-env ln -s ../../downloads releases/OpenSlug-2.3-beta/ +.PHONY: setup-ucslugc +setup-ucslugc ucslugc/Makefile: + ${MAKE} MT/revision + [ -d ucslugc ] || ( mkdir -p ucslugc ) + [ -e ucslugc/Makefile ] || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile ) + [ -e ucslugc/setup-openembedded ] || ( cd ucslugc ; ln -s ../common/setup-openembedded . ) + [ -e ucslugc/downloads ] || ( cd ucslugc ; ln -s ../downloads . ) + [ -e ucslugc/bitbake ] || ( cd ucslugc ; ln -s ../bitbake . ) + [ -e ucslugc/openembedded ] || ( cd ucslugc ; ln -s ../openembedded . ) + [ -d ucslugc/conf ] || ( mkdir -p ucslugc/conf ) + [ -e ucslugc/conf/site.conf ] || ( cd ucslugc/conf ; ln -s ../../common/conf/site.conf . ) + +.PHONY: setup-optware +setup-optware optware/Makefile: + ${MAKE} downloads + [ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) + optware/nslu2/Makefile: ${MAKE} optware/Makefile [ -e optware/nslu2/Makefile ] || ( \ diff --git a/common/Make.rules b/common/Make.rules deleted file mode 100644 index 1a32b364ba..0000000000 --- a/common/Make.rules +++ /dev/null @@ -1,57 +0,0 @@ -# Makefile for UcSlugC -# Licensed under the GPL v2 or later -# -# Define DISTRO and TARGET before including this in Makefile - -BUILD_DIRS = downloads home -REQUIRED_DIRS = bitbake openembedded common -FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) - -# The default rule is to build the firmware in an unprotected environment. -$(DISTRO)-firmware: $(FIRMWARE_DEPS) - . common/env; exec bitbake $(TARGET) - -# This rule clobbers the environment (note that ccache uses '$HOME' by -# default, so the cache will end up there). -$(DISTRO)-safe: - env -i HOME="`pwd`/home" PATH="$${PATH}" $(MAKE) $(DISTRO)-firmware - -# topdir.conf is re-created automatically if the directory is -# moved - this will cause a full bitbake reparse -.PHONY: create-topdir -create-topdir: topdir.conf - . topdir.conf && test "`pwd`" = "$$TOPDIR" || echo "TOPDIR='`pwd`'" >topdir.conf - -topdir.conf: - echo "TOPDIR='`pwd`'" >$@ - -# rules for directories - if a symlink exists and the target does not -# exist something will go wrong in the build, therefore cause a failure -# here by the mkdir. -$(BUILD_DIRS): - test -d $@ || if test -d ../$@; then ln -s ../$@ .; else mkdir $@; fi - -# these directories must already exist - either in TOPDIR (here) or in .. -$(REQUIRED_DIRS): - test -d $@ || if test -d ../$@; then ln -s ../$@ .; else exit 1; fi - -.PHONY: clobber -clobber: - rm -rf tmp - -.PHONY: $(DISTRO)-source -$(DISTRO)-source: $(REQUIRED_DIRS) - tar zcf $@.tar.gz --exclude=MT Makefile conf/auto.conf conf/local.conf.sample $(REQUIRED_DIRS:=/.) - -# This target probably isn't important any longer, because the -source -# target above does the right thing -.PHONY: -distclean: clobber - rm -rf topdir.conf conf/local.conf common/conf/local.conf $(BUILD_DIRS) - -# This target is mainly for testing - it is intended to put the disto directory -# back to its original state, it will destroy a source-tarball system (because -# it removes directories from the tarball). -.PHONY: -really-clean: distclean - rm -rf $(REQUIRED_DIRS) $(DISTRO)-source.tar.gz diff --git a/common/conf/site.conf b/common/conf/site.conf index 45451253e7..f40ae58e3d 100644 --- a/common/conf/site.conf +++ b/common/conf/site.conf @@ -6,7 +6,7 @@ # # Each DISTRO must create a appropriate topdir file containing # (just) the definition of TOPDIR -include topdir.conf +include conf/topdir.conf # These definitions should be the same for every DISTRO - if # a change is necessary make it in the DISTRO auto.conf. The diff --git a/common/env b/common/env deleted file mode 100644 index 9cf757aa30..0000000000 --- a/common/env +++ /dev/null @@ -1,42 +0,0 @@ -# setup up the environment for a bitbake build. This is used -# by the makefile and may also be directly sourced from an -# interactive shell. The makefile uses 'env -i' to ensure -# no variables are inherited apart from CCACHE_DISABLE and -# CCACHE_DIR -# -# topdir must exist in the directory and define TOPDIR to -# the full path name of the working directory -. ./topdir.conf -test -n "$TOPDIR" -a -d "$TOPDIR" || { - echo "environment: TOPDIR not defined" >&2 - exit 1 -} -# -# the following must match the definitions in common/conf/site.conf -export PYTHONPATH="${TOPDIR}/bitbake/lib" -export BBPATH="${TOPDIR}:${TOPDIR}/common:${TOPDIR}/openembedded:${TOPDIR}/bitbake" -export PATH="${TOPDIR}/bitbake/bin:${PATH}" -export LD_LIBRARY_PATH= -export LANG=C -#NOTE: if you add export definitions here add them below too! -# -# unset the following (unnecessary for the makefile, but safe) -unset LC_CTYPE -unset CC -unset CXX -unset MFLAGS -unset MAKEFLAGS -# -# make bb into a 'safe' bitbake -alias bb-safe="env -i \ - HOME='${TOPDIR}/home' \ - PYTHONPATH='${PYTHONPATH}' \ - BBPATH='${BBPATH}' \ - PATH='${PATH}' \ - LD_LIBRARY_PATH='${LD_LIBRARY_PATH}' \ - LANG='${LANG}' \ - '${TOPDIR}/bitbake/bin/bitbake'" -alias bb="'${TOPDIR}/bitbake/bin/bitbake'" -# -# remove TOPDIR - not required -unset TOPDIR diff --git a/common/openembedded.mk b/common/openembedded.mk new file mode 100644 index 0000000000..e826f6e305 --- /dev/null +++ b/common/openembedded.mk @@ -0,0 +1,57 @@ +# Makefile for UcSlugC +# Licensed under the GPL v2 or later +# + +BUILD_DIRS = downloads +REQUIRED_DIRS = bitbake openembedded +FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) + +# The default rule is to build the firmware in an unprotected environment. +firmware: $(FIRMWARE_DEPS) + . ./setup-openembedded; exec bitbake $${MAKE_TARGET} + +# This rule clobbers the environment (note that ccache uses '$HOME' by +# default, so the cache will end up there). +firmware-safe: + env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) firmware + +# topdir.conf is re-created automatically if the directory is +# moved - this will cause a full bitbake reparse +.PHONY: create-topdir +create-topdir: conf/topdir.conf + . conf/topdir.conf && test "`pwd`" = "$$TOPDIR" || echo "TOPDIR='`pwd`'" > conf/topdir.conf + +conf/topdir.conf: + echo "TOPDIR='`pwd`'" >$@ + +# rules for directories - if a symlink exists and the target does not +# exist something will go wrong in the build, therefore cause a failure +# here by the mkdir. +$(BUILD_DIRS): + test -d $@ || if test -d ../$@; then ln -s ../$@ .; else mkdir $@; fi + +# these directories must already exist - either in TOPDIR (here) or in .. +$(REQUIRED_DIRS): + test -d $@ || if test -d ../$@; then ln -s ../$@ .; else exit 1; fi + +.PHONY: clobber +clobber: + rm -rf tmp + +.PHONY: source +source: $(REQUIRED_DIRS) + tar zcf $${DISTRO}.tar.gz --exclude=MT Makefile setup-openembedded conf/site.conf conf/auto.conf \ + conf/local.conf.sample $(REQUIRED_DIRS:=/.) + +# This target probably isn't important any longer, because the -source +# target above does the right thing +.PHONY: +distclean: clobber + rm -rf conf/topdir.conf conf/local.conf $(BUILD_DIRS) + +# This target is mainly for testing - it is intended to put the disto directory +# back to its original state, it will destroy a source-tarball system (because +# it removes directories from the tarball). +.PHONY: +really-clean: distclean + rm -rf $(REQUIRED_DIRS) $${DISTRO}-source.tar.gz diff --git a/common/setup-openembedded b/common/setup-openembedded new file mode 100644 index 0000000000..46151e5774 --- /dev/null +++ b/common/setup-openembedded @@ -0,0 +1,47 @@ +# setup up the environment for a bitbake build. This is used +# by the makefile and may also be directly sourced from an +# interactive shell. The makefile uses 'env -i' to ensure +# no variables are inherited apart from CCACHE_DISABLE and +# CCACHE_DIR +# +# topdir must exist in the directory and define TOPDIR to +# the full path name of the working directory +. ./conf/topdir.conf +test -n "$TOPDIR" -a -d "$TOPDIR" || { + echo "environment: TOPDIR not defined" >&2 + exit 1 +} + +. ./conf/auto.conf +export DISTRO +export MAKE_TARGET + +# +# the following must match the definitions in common/conf/site.conf +export PYTHONPATH="${TOPDIR}/bitbake/lib" +export BBPATH="${TOPDIR}:${TOPDIR}/openembedded:${TOPDIR}/bitbake" +export PATH="${TOPDIR}/bitbake/bin:${PATH}" +export LD_LIBRARY_PATH= +export LANG=C +#NOTE: if you add export definitions here add them below too! +# +# unset the following (unnecessary for the makefile, but safe) +unset LC_CTYPE +unset CC +unset CXX +unset MFLAGS +unset MAKEFLAGS +# +# make bb into a 'safe' bitbake +alias bb-safe="env -i \ + HOME='${TOPDIR}/home' \ + PYTHONPATH='${PYTHONPATH}' \ + BBPATH='${BBPATH}' \ + PATH='${PATH}' \ + LD_LIBRARY_PATH='${LD_LIBRARY_PATH}' \ + LANG='${LANG}' \ + '${TOPDIR}/bitbake/bin/bitbake'" +alias bb="'${TOPDIR}/bitbake/bin/bitbake'" +# +# remove TOPDIR - not required +unset TOPDIR diff --git a/ucslugc/Makefile b/ucslugc/Makefile deleted file mode 100644 index fdaab6fc1c..0000000000 --- a/ucslugc/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Makefile for UcSlugC -# Licensed under the GPL v2 or later -DISTRO=ucslugc -TARGET=openslug-packages - -include common/Make.rules - -# The following is required for bootstrapping -common/Make.rules: - $(MAKE) -f ../common/Make.rules common diff --git a/ucslugc/conf/auto.conf b/ucslugc/conf/auto.conf index 0c584f449e..b6a439982e 100644 --- a/ucslugc/conf/auto.conf +++ b/ucslugc/conf/auto.conf @@ -1,3 +1,4 @@ # UcSlugC bitbake configuration DISTRO="ucslugc" MACHINE="nslu2" +MAKE_TARGET="openslug-packages" \ No newline at end of file diff --git a/ucslugc/setup-env b/ucslugc/setup-env deleted file mode 100644 index 56f39fbe21..0000000000 --- a/ucslugc/setup-env +++ /dev/null @@ -1,14 +0,0 @@ -# set up an environment for building UcSlugC -# (it is sufficient to source common/env to do this, this -# script, which should be sourced, exists to mirror the old -# method). -test -d common || { - test -d ../common && ln -s ../common ./common -} -if test -r common/env -then - . common/env - echo 'Environment set up for UcSlugC development.' -else - echo "setup-env: 'common/env' script not found" >&2 -fi -- cgit v1.2.3 From 7bc1dacee9dd0e17d4a972a0dd0d14e728646905 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Jul 2005 05:10:28 +0000 Subject: Renamed common/setup-openembedded to common/setup-env due to makefile target conflict. --- Makefile | 18 +++++++++--------- common/openembedded.mk | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 6e36e75a98..700ca40820 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ setup-monotone monotone/nslu2-linux.db: downloads: [ -e $@ ] || mkdir -p $@ -unslung/Makefile openslug/Makefile common/openembedded.mk common/setup-openembedded MT/revision: +unslung/Makefile openslug/Makefile common/openembedded.mk common/setup-env MT/revision: ${MAKE} downloads [ -e monotone/nslu2-linux.db ] || ( ${MAKE} monotone/nslu2-linux.db ) [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) @@ -94,14 +94,14 @@ setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/Makefile: downloads .PHONY: setup-ucslugc setup-ucslugc ucslugc/Makefile: ${MAKE} MT/revision - [ -d ucslugc ] || ( mkdir -p ucslugc ) - [ -e ucslugc/Makefile ] || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile ) - [ -e ucslugc/setup-openembedded ] || ( cd ucslugc ; ln -s ../common/setup-openembedded . ) - [ -e ucslugc/downloads ] || ( cd ucslugc ; ln -s ../downloads . ) - [ -e ucslugc/bitbake ] || ( cd ucslugc ; ln -s ../bitbake . ) - [ -e ucslugc/openembedded ] || ( cd ucslugc ; ln -s ../openembedded . ) - [ -d ucslugc/conf ] || ( mkdir -p ucslugc/conf ) - [ -e ucslugc/conf/site.conf ] || ( cd ucslugc/conf ; ln -s ../../common/conf/site.conf . ) + [ -d ucslugc ] || ( mkdir -p ucslugc ) + [ -e ucslugc/Makefile ] || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile ) + [ -e ucslugc/setup-env ] || ( cd ucslugc ; ln -s ../common/setup-env . ) + [ -e ucslugc/downloads ] || ( cd ucslugc ; ln -s ../downloads . ) + [ -e ucslugc/bitbake ] || ( cd ucslugc ; ln -s ../bitbake . ) + [ -e ucslugc/openembedded ] || ( cd ucslugc ; ln -s ../openembedded . ) + [ -d ucslugc/conf ] || ( mkdir -p ucslugc/conf ) + [ -e ucslugc/conf/site.conf ] || ( cd ucslugc/conf ; ln -s ../../common/conf/site.conf . ) .PHONY: setup-optware setup-optware optware/Makefile: diff --git a/common/openembedded.mk b/common/openembedded.mk index e826f6e305..88a143970a 100644 --- a/common/openembedded.mk +++ b/common/openembedded.mk @@ -8,7 +8,7 @@ FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) # The default rule is to build the firmware in an unprotected environment. firmware: $(FIRMWARE_DEPS) - . ./setup-openembedded; exec bitbake $${MAKE_TARGET} + . ./setup-env; exec bitbake $${MAKE_TARGET} # This rule clobbers the environment (note that ccache uses '$HOME' by # default, so the cache will end up there). @@ -40,7 +40,7 @@ clobber: .PHONY: source source: $(REQUIRED_DIRS) - tar zcf $${DISTRO}.tar.gz --exclude=MT Makefile setup-openembedded conf/site.conf conf/auto.conf \ + tar zcf $${DISTRO}.tar.gz --exclude=MT Makefile setup-env conf/site.conf conf/auto.conf \ conf/local.conf.sample $(REQUIRED_DIRS:=/.) # This target probably isn't important any longer, because the -source -- cgit v1.2.3 From a95903817361c50782014172034cc09978819904 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Jul 2005 05:12:45 +0000 Subject: Renamed setup-openembedded to setup-env --- common/setup-env | 47 +++++++++++++++++++++++++++++++++++++++++++++++ common/setup-openembedded | 47 ----------------------------------------------- openslug/conf/auto.conf | 4 ++++ unslung/conf/auto.conf | 4 ++++ 4 files changed, 55 insertions(+), 47 deletions(-) create mode 100644 common/setup-env delete mode 100644 common/setup-openembedded create mode 100644 openslug/conf/auto.conf create mode 100644 unslung/conf/auto.conf diff --git a/common/setup-env b/common/setup-env new file mode 100644 index 0000000000..46151e5774 --- /dev/null +++ b/common/setup-env @@ -0,0 +1,47 @@ +# setup up the environment for a bitbake build. This is used +# by the makefile and may also be directly sourced from an +# interactive shell. The makefile uses 'env -i' to ensure +# no variables are inherited apart from CCACHE_DISABLE and +# CCACHE_DIR +# +# topdir must exist in the directory and define TOPDIR to +# the full path name of the working directory +. ./conf/topdir.conf +test -n "$TOPDIR" -a -d "$TOPDIR" || { + echo "environment: TOPDIR not defined" >&2 + exit 1 +} + +. ./conf/auto.conf +export DISTRO +export MAKE_TARGET + +# +# the following must match the definitions in common/conf/site.conf +export PYTHONPATH="${TOPDIR}/bitbake/lib" +export BBPATH="${TOPDIR}:${TOPDIR}/openembedded:${TOPDIR}/bitbake" +export PATH="${TOPDIR}/bitbake/bin:${PATH}" +export LD_LIBRARY_PATH= +export LANG=C +#NOTE: if you add export definitions here add them below too! +# +# unset the following (unnecessary for the makefile, but safe) +unset LC_CTYPE +unset CC +unset CXX +unset MFLAGS +unset MAKEFLAGS +# +# make bb into a 'safe' bitbake +alias bb-safe="env -i \ + HOME='${TOPDIR}/home' \ + PYTHONPATH='${PYTHONPATH}' \ + BBPATH='${BBPATH}' \ + PATH='${PATH}' \ + LD_LIBRARY_PATH='${LD_LIBRARY_PATH}' \ + LANG='${LANG}' \ + '${TOPDIR}/bitbake/bin/bitbake'" +alias bb="'${TOPDIR}/bitbake/bin/bitbake'" +# +# remove TOPDIR - not required +unset TOPDIR diff --git a/common/setup-openembedded b/common/setup-openembedded deleted file mode 100644 index 46151e5774..0000000000 --- a/common/setup-openembedded +++ /dev/null @@ -1,47 +0,0 @@ -# setup up the environment for a bitbake build. This is used -# by the makefile and may also be directly sourced from an -# interactive shell. The makefile uses 'env -i' to ensure -# no variables are inherited apart from CCACHE_DISABLE and -# CCACHE_DIR -# -# topdir must exist in the directory and define TOPDIR to -# the full path name of the working directory -. ./conf/topdir.conf -test -n "$TOPDIR" -a -d "$TOPDIR" || { - echo "environment: TOPDIR not defined" >&2 - exit 1 -} - -. ./conf/auto.conf -export DISTRO -export MAKE_TARGET - -# -# the following must match the definitions in common/conf/site.conf -export PYTHONPATH="${TOPDIR}/bitbake/lib" -export BBPATH="${TOPDIR}:${TOPDIR}/openembedded:${TOPDIR}/bitbake" -export PATH="${TOPDIR}/bitbake/bin:${PATH}" -export LD_LIBRARY_PATH= -export LANG=C -#NOTE: if you add export definitions here add them below too! -# -# unset the following (unnecessary for the makefile, but safe) -unset LC_CTYPE -unset CC -unset CXX -unset MFLAGS -unset MAKEFLAGS -# -# make bb into a 'safe' bitbake -alias bb-safe="env -i \ - HOME='${TOPDIR}/home' \ - PYTHONPATH='${PYTHONPATH}' \ - BBPATH='${BBPATH}' \ - PATH='${PATH}' \ - LD_LIBRARY_PATH='${LD_LIBRARY_PATH}' \ - LANG='${LANG}' \ - '${TOPDIR}/bitbake/bin/bitbake'" -alias bb="'${TOPDIR}/bitbake/bin/bitbake'" -# -# remove TOPDIR - not required -unset TOPDIR diff --git a/openslug/conf/auto.conf b/openslug/conf/auto.conf new file mode 100644 index 0000000000..7e2a406f79 --- /dev/null +++ b/openslug/conf/auto.conf @@ -0,0 +1,4 @@ +# OpenSlug bitbake configuration +DISTRO="openslug" +MACHINE="nslu2" +MAKE_TARGET="openslug-packages" \ No newline at end of file diff --git a/unslung/conf/auto.conf b/unslung/conf/auto.conf new file mode 100644 index 0000000000..7ec443ca0b --- /dev/null +++ b/unslung/conf/auto.conf @@ -0,0 +1,4 @@ +# Unslung bitbake configuration +DISTRO="unslung" +MACHINE="nslu2" +MAKE_TARGET="unslung-packages" \ No newline at end of file -- cgit v1.2.3 From 113ede2350b8179e06be8f1cf54832f3ea83d359 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Jul 2005 05:27:45 +0000 Subject: Migrated unslung and openslug to the new setup - type 'make setup-unslung setup-openslug' to upgrade. --- .mtn-ignore | 7 ---- Makefile | 65 +++++++++++++++++++++++++++-------- openslug/.mt-ignore | 4 --- openslug/Makefile | 90 +++++++++++++++++++++++++++---------------------- unslung/.mt-ignore | 4 --- unslung/Makefile | 90 +++++++++++++++++++++++++++---------------------- unslung/conf/.mt-ignore | 1 - 7 files changed, 149 insertions(+), 112 deletions(-) delete mode 100644 .mtn-ignore delete mode 100644 openslug/.mt-ignore delete mode 100644 unslung/.mt-ignore delete mode 100644 unslung/conf/.mt-ignore diff --git a/.mtn-ignore b/.mtn-ignore deleted file mode 100644 index 170b9c14e8..0000000000 --- a/.mtn-ignore +++ /dev/null @@ -1,7 +0,0 @@ -bitbake -downloads -monotone -oe-symlinks -openembedded -optware - diff --git a/Makefile b/Makefile index 700ca40820..d60927e191 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ setup-monotone monotone/nslu2-linux.db: downloads: [ -e $@ ] || mkdir -p $@ -unslung/Makefile openslug/Makefile common/openembedded.mk common/setup-env MT/revision: +MT/revision: ${MAKE} downloads [ -e monotone/nslu2-linux.db ] || ( ${MAKE} monotone/nslu2-linux.db ) [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) @@ -84,25 +84,62 @@ setup-openembedded openembedded/conf/machine/nslu2.conf: ${MAKE} MT/revision [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded +.PHONY: setup-unslung +setup-unslung unslung/Makefile: + ${MAKE} MT/revision downloads + [ -d unslung ] || ( mkdir -p unslung ) + [ ! -f unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me) + [ -e unslung/Makefile ] || ( cd unslung ; ln -s ../common/openembedded.mk Makefile ) + [ ! -f unslung/setup-env ] || ( cd unslung ; mv setup-env setup-env.delete-me ) + [ -e unslung/setup-env ] || ( cd unslung ; ln -s ../common/setup-env . ) + [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) + [ -e unslung/bitbake ] || ( cd unslung ; ln -s ../bitbake . ) + [ -e unslung/openembedded ] || ( cd unslung ; ln -s ../openembedded . ) + [ -d unslung/conf ] || ( mkdir -p unslung/conf ) + [ ! -f unslung/conf/local.conf ] || ( cd unslung/conf ; mv local.conf local.conf.delete-me ) + [ -e unslung/conf/site.conf ] || ( cd unslung/conf ; ln -s ../../common/conf/site.conf . ) + rm -rf unslung/tmp/cache + +.PHONY: setup-openslug +setup-openslug openslug/Makefile: + ${MAKE} MT/revision downloads + [ -d openslug ] || ( mkdir -p openslug ) + [ ! -f openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me) + [ -e openslug/Makefile ] || ( cd openslug ; ln -s ../common/openembedded.mk Makefile ) + [ ! -f openslug/setup-env ] || ( cd openslug ; mv setup-env setup-env.delete-me ) + [ -e openslug/setup-env ] || ( cd openslug ; ln -s ../common/setup-env . ) + [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) + [ -e openslug/bitbake ] || ( cd openslug ; ln -s ../bitbake . ) + [ -e openslug/openembedded ] || ( cd openslug ; ln -s ../openembedded . ) + [ -d openslug/conf ] || ( mkdir -p openslug/conf ) + [ ! -f openslug/conf/local.conf ] || ( cd openslug/conf ; mv local.conf local.conf.delete-me ) + [ -e openslug/conf/site.conf ] || ( cd openslug/conf ; ln -s ../../common/conf/site.conf . ) + rm -rf openslug/tmp/cache + +.PHONY: setup-ucslugc +setup-ucslugc ucslugc/Makefile: + ${MAKE} MT/revision downloads + [ -d ucslugc ] || ( mkdir -p ucslugc ) + [ ! -f ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me) + [ -e ucslugc/Makefile ] || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile ) + [ ! -f ucslugc/setup-env ] || ( cd ucslugc ; mv setup-env setup-env.delete-me ) + [ -e ucslugc/setup-env ] || ( cd ucslugc ; ln -s ../common/setup-env . ) + [ -e ucslugc/downloads ] || ( cd ucslugc ; ln -s ../downloads . ) + [ -e ucslugc/bitbake ] || ( cd ucslugc ; ln -s ../bitbake . ) + [ -e ucslugc/openembedded ] || ( cd ucslugc ; ln -s ../openembedded . ) + [ -d ucslugc/conf ] || ( mkdir -p ucslugc/conf ) + [ ! -f ucslugc/conf/local.conf ] || ( cd ucslugc/conf ; mv local.conf local.conf.delete-me ) + [ -e ucslugc/conf/site.conf ] || ( cd ucslugc/conf ; ln -s ../../common/conf/site.conf . ) + rm -rf ucslugc/tmp/cache + .PHONY: setup-openslug-2.3-beta -setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/Makefile: downloads +setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/Makefile: + ${MAKE} downloads [ ! -e releases/OpenSlug-2.3-beta ] || mkdir -p releases svn checkout svn://svn.berlios.de/openslug/releases/OpenSlug-2.3-beta releases/OpenSlug-2.3-beta cd releases/OpenSlug-2.3-beta && ${MAKE} conf/local.conf setup-env ln -s ../../downloads releases/OpenSlug-2.3-beta/ -.PHONY: setup-ucslugc -setup-ucslugc ucslugc/Makefile: - ${MAKE} MT/revision - [ -d ucslugc ] || ( mkdir -p ucslugc ) - [ -e ucslugc/Makefile ] || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile ) - [ -e ucslugc/setup-env ] || ( cd ucslugc ; ln -s ../common/setup-env . ) - [ -e ucslugc/downloads ] || ( cd ucslugc ; ln -s ../downloads . ) - [ -e ucslugc/bitbake ] || ( cd ucslugc ; ln -s ../bitbake . ) - [ -e ucslugc/openembedded ] || ( cd ucslugc ; ln -s ../openembedded . ) - [ -d ucslugc/conf ] || ( mkdir -p ucslugc/conf ) - [ -e ucslugc/conf/site.conf ] || ( cd ucslugc/conf ; ln -s ../../common/conf/site.conf . ) - .PHONY: setup-optware setup-optware optware/Makefile: ${MAKE} downloads diff --git a/openslug/.mt-ignore b/openslug/.mt-ignore deleted file mode 100644 index dd5df82133..0000000000 --- a/openslug/.mt-ignore +++ /dev/null @@ -1,4 +0,0 @@ -downloads -openslug-source.tar.gz -setup-env -tmp diff --git a/openslug/Makefile b/openslug/Makefile index 657ed278f5..88a143970a 100644 --- a/openslug/Makefile +++ b/openslug/Makefile @@ -1,49 +1,57 @@ -# Makefile for OpenSlug +# Makefile for UcSlugC # Licensed under the GPL v2 or later +# -openslug-firmware: setup-env conf/local.conf - . ./setup-env ; bitbake openslug-packages - -# This does the same thing but with a clean environment -# The HOME setting prevents user environment settings -# from changing the build. CCACHE_DIR is necessary to -# prevent ccache (if installed) attempting to use a -# .cache in the home directory. -openslug-firmware-safe: setup-env conf/local.conf - env -i CCACHE_DISABLE=1 CCACHE_DIR="`pwd`/tmp/ccache" HOME=/dev/null \ - sh -c '. ./setup-env; bitbake openslug-packages' - -setup-env: - [ -e bitbake ] || ln -s ../bitbake . - [ -e downloads ] || ln -s ../downloads . - [ -e openembedded ] || ln -s ../openembedded . - echo 'OEROOT='`pwd` > setup-env - echo 'OESYS=$$OEROOT/bitbake/' >> setup-env - echo 'OEBUILD=$$OEROOT' >> setup-env - echo 'PKGDIR=$$OEROOT/openembedded/' >> setup-env - echo 'export PYTHONPATH=$$OESYS/lib' >>setup-env - echo 'export BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env - echo 'export PATH=$$OESYS/bin/:$$PATH' >> setup-env - echo 'export LD_LIBRARY_PATH=' >> setup-env - echo 'export LANG=C' >> setup-env - echo 'unset LC_CTYPE' >> setup-env - echo 'unset CC' >> setup-env - echo 'unset CXX' >> setup-env - echo 'unset MFLAGS' >> setup-env - echo 'unset MAKEFLAGS' >> setup-env - echo 'alias bb=bitbake' >> setup-env - echo 'echo Environment set up for OpenSlug development.' >> setup-env - -conf/local.conf: - sed -e "s|%%%OEROOT%%%|`pwd`|" conf/local.conf.template > conf/local.conf +BUILD_DIRS = downloads +REQUIRED_DIRS = bitbake openembedded +FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) +# The default rule is to build the firmware in an unprotected environment. +firmware: $(FIRMWARE_DEPS) + . ./setup-env; exec bitbake $${MAKE_TARGET} + +# This rule clobbers the environment (note that ccache uses '$HOME' by +# default, so the cache will end up there). +firmware-safe: + env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) firmware + +# topdir.conf is re-created automatically if the directory is +# moved - this will cause a full bitbake reparse +.PHONY: create-topdir +create-topdir: conf/topdir.conf + . conf/topdir.conf && test "`pwd`" = "$$TOPDIR" || echo "TOPDIR='`pwd`'" > conf/topdir.conf + +conf/topdir.conf: + echo "TOPDIR='`pwd`'" >$@ + +# rules for directories - if a symlink exists and the target does not +# exist something will go wrong in the build, therefore cause a failure +# here by the mkdir. +$(BUILD_DIRS): + test -d $@ || if test -d ../$@; then ln -s ../$@ .; else mkdir $@; fi + +# these directories must already exist - either in TOPDIR (here) or in .. +$(REQUIRED_DIRS): + test -d $@ || if test -d ../$@; then ln -s ../$@ .; else exit 1; fi + +.PHONY: clobber clobber: rm -rf tmp -openslug-source: - tar zcf openslug-source.tar.gz --exclude=MT Makefile bitbake conf openembedded +.PHONY: source +source: $(REQUIRED_DIRS) + tar zcf $${DISTRO}.tar.gz --exclude=MT Makefile setup-env conf/site.conf conf/auto.conf \ + conf/local.conf.sample $(REQUIRED_DIRS:=/.) +# This target probably isn't important any longer, because the -source +# target above does the right thing +.PHONY: distclean: clobber - rm -rf setup-env conf/local.conf bitbake downloads openembedded - -# End of Makefile + rm -rf conf/topdir.conf conf/local.conf $(BUILD_DIRS) + +# This target is mainly for testing - it is intended to put the disto directory +# back to its original state, it will destroy a source-tarball system (because +# it removes directories from the tarball). +.PHONY: +really-clean: distclean + rm -rf $(REQUIRED_DIRS) $${DISTRO}-source.tar.gz diff --git a/unslung/.mt-ignore b/unslung/.mt-ignore deleted file mode 100644 index 2cf465fead..0000000000 --- a/unslung/.mt-ignore +++ /dev/null @@ -1,4 +0,0 @@ -downloads -unslung-source.tar.gz -setup-env -tmp diff --git a/unslung/Makefile b/unslung/Makefile index 7016538075..88a143970a 100644 --- a/unslung/Makefile +++ b/unslung/Makefile @@ -1,49 +1,57 @@ -# Makefile for Unslung +# Makefile for UcSlugC # Licensed under the GPL v2 or later +# -unslung-firmware: setup-env conf/local.conf - . ./setup-env ; bitbake unslung-packages - -# This does the same thing but with a clean environment -# The HOME setting prevents user environment settings -# from changing the build. CCACHE_DIR is necessary to -# prevent ccache (if installed) attempting to use a -# .cache in the home directory. -unslung-firmware-safe: setup-env conf/local.conf - env -i CCACHE_DISABLE=1 CCACHE_DIR="`pwd`/tmp/ccache" HOME=/dev/null \ - sh -c '. ./setup-env; bitbake unslung-packages' - -setup-env: - [ -e bitbake ] || ln -s ../bitbake . - [ -e downloads ] || ln -s ../downloads . - [ -e openembedded ] || ln -s ../openembedded . - echo 'OEROOT='`pwd` > setup-env - echo 'OESYS=$$OEROOT/bitbake/' >> setup-env - echo 'OEBUILD=$$OEROOT' >> setup-env - echo 'PKGDIR=$$OEROOT/openembedded/' >> setup-env - echo 'export PYTHONPATH=$$OESYS/lib' >>setup-env - echo 'export BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env - echo 'export PATH=$$OESYS/bin/:$$PATH' >> setup-env - echo 'export LD_LIBRARY_PATH=' >> setup-env - echo 'export LANG=C' >> setup-env - echo 'unset LC_CTYPE' >> setup-env - echo 'unset CC' >> setup-env - echo 'unset CXX' >> setup-env - echo 'unset MFLAGS' >> setup-env - echo 'unset MAKEFLAGS' >> setup-env - echo 'alias bb=bitbake' >> setup-env - echo 'echo Environment set up for Unslung development.' >> setup-env - -conf/local.conf: - sed -e "s|%%%OEROOT%%%|`pwd`|" conf/local.conf.template > conf/local.conf +BUILD_DIRS = downloads +REQUIRED_DIRS = bitbake openembedded +FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) +# The default rule is to build the firmware in an unprotected environment. +firmware: $(FIRMWARE_DEPS) + . ./setup-env; exec bitbake $${MAKE_TARGET} + +# This rule clobbers the environment (note that ccache uses '$HOME' by +# default, so the cache will end up there). +firmware-safe: + env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) firmware + +# topdir.conf is re-created automatically if the directory is +# moved - this will cause a full bitbake reparse +.PHONY: create-topdir +create-topdir: conf/topdir.conf + . conf/topdir.conf && test "`pwd`" = "$$TOPDIR" || echo "TOPDIR='`pwd`'" > conf/topdir.conf + +conf/topdir.conf: + echo "TOPDIR='`pwd`'" >$@ + +# rules for directories - if a symlink exists and the target does not +# exist something will go wrong in the build, therefore cause a failure +# here by the mkdir. +$(BUILD_DIRS): + test -d $@ || if test -d ../$@; then ln -s ../$@ .; else mkdir $@; fi + +# these directories must already exist - either in TOPDIR (here) or in .. +$(REQUIRED_DIRS): + test -d $@ || if test -d ../$@; then ln -s ../$@ .; else exit 1; fi + +.PHONY: clobber clobber: rm -rf tmp -unslung-source: - tar zcf unslung-source.tar.gz --exclude=MT Makefile bitbake conf openembedded +.PHONY: source +source: $(REQUIRED_DIRS) + tar zcf $${DISTRO}.tar.gz --exclude=MT Makefile setup-env conf/site.conf conf/auto.conf \ + conf/local.conf.sample $(REQUIRED_DIRS:=/.) +# This target probably isn't important any longer, because the -source +# target above does the right thing +.PHONY: distclean: clobber - rm -f setup-env conf/local.conf bitbake downloads openembedded - -# End of Makefile + rm -rf conf/topdir.conf conf/local.conf $(BUILD_DIRS) + +# This target is mainly for testing - it is intended to put the disto directory +# back to its original state, it will destroy a source-tarball system (because +# it removes directories from the tarball). +.PHONY: +really-clean: distclean + rm -rf $(REQUIRED_DIRS) $${DISTRO}-source.tar.gz diff --git a/unslung/conf/.mt-ignore b/unslung/conf/.mt-ignore deleted file mode 100644 index f21e1b217b..0000000000 --- a/unslung/conf/.mt-ignore +++ /dev/null @@ -1 +0,0 @@ -local.conf -- cgit v1.2.3 From d3094ed3b03721d8b5dab9256699aa8a8f39fadd Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Jul 2005 05:58:08 +0000 Subject: Added the additional setup dependencies to make setup --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d60927e191..42cd8c6668 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ all: update build build: build-unslung build-openslug build-ucslugc build-optware .PHONY: setup -setup: setup-master setup-bitbake setup-openembedded setup-optware +setup: setup-master setup-bitbake setup-openembedded setup-unslung setup-openslug setup-ucslugc setup-optware .PHONY: setup-developer setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-developer -- cgit v1.2.3 From 3260512bf505a9de1cecc9cb342db3a13684b201 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 1 Aug 2005 13:02:12 +0000 Subject: Dropped automatically updating OpenSlug-2.3-beta target --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index d60927e191..5d6bc105ac 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,6 @@ setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-dev .PHONY: update update: update-master update-bitbake update-openembedded update-optware - [ ! -e releases/OpenSlug-2.3-beta/Makefile ] || ${MAKE} update-openslug-2.3-beta .PHONY: clobber clobber: clobber-optware clobber-openembedded clobber-bitbake -- cgit v1.2.3 From 98d39b8f17c381bdae5e44fdb0fd0de59b9bca72 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Jul 2005 06:01:59 +0000 Subject: Changed the obselete file existence tests from '! -f' to '! -L' so that it doesn't do a second migration. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 200151c7c5..7bc659f998 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ setup-openembedded openembedded/conf/machine/nslu2.conf: setup-unslung unslung/Makefile: ${MAKE} MT/revision downloads [ -d unslung ] || ( mkdir -p unslung ) - [ ! -f unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me) + [ ! -L unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me) [ -e unslung/Makefile ] || ( cd unslung ; ln -s ../common/openembedded.mk Makefile ) - [ ! -f unslung/setup-env ] || ( cd unslung ; mv setup-env setup-env.delete-me ) + [ ! -L unslung/setup-env ] || ( cd unslung ; mv setup-env setup-env.delete-me ) [ -e unslung/setup-env ] || ( cd unslung ; ln -s ../common/setup-env . ) [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e unslung/bitbake ] || ( cd unslung ; ln -s ../bitbake . ) @@ -103,9 +103,9 @@ setup-unslung unslung/Makefile: setup-openslug openslug/Makefile: ${MAKE} MT/revision downloads [ -d openslug ] || ( mkdir -p openslug ) - [ ! -f openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me) + [ ! -L openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me) [ -e openslug/Makefile ] || ( cd openslug ; ln -s ../common/openembedded.mk Makefile ) - [ ! -f openslug/setup-env ] || ( cd openslug ; mv setup-env setup-env.delete-me ) + [ ! -L openslug/setup-env ] || ( cd openslug ; mv setup-env setup-env.delete-me ) [ -e openslug/setup-env ] || ( cd openslug ; ln -s ../common/setup-env . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) [ -e openslug/bitbake ] || ( cd openslug ; ln -s ../bitbake . ) @@ -119,9 +119,9 @@ setup-openslug openslug/Makefile: setup-ucslugc ucslugc/Makefile: ${MAKE} MT/revision downloads [ -d ucslugc ] || ( mkdir -p ucslugc ) - [ ! -f ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me) + [ ! -L ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me) [ -e ucslugc/Makefile ] || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile ) - [ ! -f ucslugc/setup-env ] || ( cd ucslugc ; mv setup-env setup-env.delete-me ) + [ ! -L ucslugc/setup-env ] || ( cd ucslugc ; mv setup-env setup-env.delete-me ) [ -e ucslugc/setup-env ] || ( cd ucslugc ; ln -s ../common/setup-env . ) [ -e ucslugc/downloads ] || ( cd ucslugc ; ln -s ../downloads . ) [ -e ucslugc/bitbake ] || ( cd ucslugc ; ln -s ../bitbake . ) -- cgit v1.2.3 From a53e48f376f2448f0f55e829285b205c20f040f8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Jul 2005 06:03:22 +0000 Subject: Actually, it should be just -L for the existence tests. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7bc659f998..ed72b1989e 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ setup-openembedded openembedded/conf/machine/nslu2.conf: setup-unslung unslung/Makefile: ${MAKE} MT/revision downloads [ -d unslung ] || ( mkdir -p unslung ) - [ ! -L unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me) + [ -L unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me) [ -e unslung/Makefile ] || ( cd unslung ; ln -s ../common/openembedded.mk Makefile ) - [ ! -L unslung/setup-env ] || ( cd unslung ; mv setup-env setup-env.delete-me ) + [ -L unslung/setup-env ] || ( cd unslung ; mv setup-env setup-env.delete-me ) [ -e unslung/setup-env ] || ( cd unslung ; ln -s ../common/setup-env . ) [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e unslung/bitbake ] || ( cd unslung ; ln -s ../bitbake . ) @@ -103,9 +103,9 @@ setup-unslung unslung/Makefile: setup-openslug openslug/Makefile: ${MAKE} MT/revision downloads [ -d openslug ] || ( mkdir -p openslug ) - [ ! -L openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me) + [ -L openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me) [ -e openslug/Makefile ] || ( cd openslug ; ln -s ../common/openembedded.mk Makefile ) - [ ! -L openslug/setup-env ] || ( cd openslug ; mv setup-env setup-env.delete-me ) + [ -L openslug/setup-env ] || ( cd openslug ; mv setup-env setup-env.delete-me ) [ -e openslug/setup-env ] || ( cd openslug ; ln -s ../common/setup-env . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) [ -e openslug/bitbake ] || ( cd openslug ; ln -s ../bitbake . ) @@ -119,9 +119,9 @@ setup-openslug openslug/Makefile: setup-ucslugc ucslugc/Makefile: ${MAKE} MT/revision downloads [ -d ucslugc ] || ( mkdir -p ucslugc ) - [ ! -L ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me) + [ -L ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me) [ -e ucslugc/Makefile ] || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile ) - [ ! -L ucslugc/setup-env ] || ( cd ucslugc ; mv setup-env setup-env.delete-me ) + [ -L ucslugc/setup-env ] || ( cd ucslugc ; mv setup-env setup-env.delete-me ) [ -e ucslugc/setup-env ] || ( cd ucslugc ; ln -s ../common/setup-env . ) [ -e ucslugc/downloads ] || ( cd ucslugc ; ln -s ../downloads . ) [ -e ucslugc/bitbake ] || ( cd ucslugc ; ln -s ../bitbake . ) -- cgit v1.2.3 From 5b3bedd039ef7a622bf04e8134d4e3d2a5c6174a Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 1 Aug 2005 16:17:42 +0000 Subject: Fix the renames of the obsolete files so that they no longer happen if the files do note exist. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ed72b1989e..42dc7dabe5 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ setup-openembedded openembedded/conf/machine/nslu2.conf: setup-unslung unslung/Makefile: ${MAKE} MT/revision downloads [ -d unslung ] || ( mkdir -p unslung ) - [ -L unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me) + [ -L unslung/Makefile -o ! -e unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me) [ -e unslung/Makefile ] || ( cd unslung ; ln -s ../common/openembedded.mk Makefile ) - [ -L unslung/setup-env ] || ( cd unslung ; mv setup-env setup-env.delete-me ) + [ -L unslung/setup-env -o ! -e unslung/setup-env ] || ( cd unslung ; mv setup-env setup-env.delete-me ) [ -e unslung/setup-env ] || ( cd unslung ; ln -s ../common/setup-env . ) [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e unslung/bitbake ] || ( cd unslung ; ln -s ../bitbake . ) @@ -103,9 +103,9 @@ setup-unslung unslung/Makefile: setup-openslug openslug/Makefile: ${MAKE} MT/revision downloads [ -d openslug ] || ( mkdir -p openslug ) - [ -L openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me) + [ -L openslug/Makefile -o ! -e openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me) [ -e openslug/Makefile ] || ( cd openslug ; ln -s ../common/openembedded.mk Makefile ) - [ -L openslug/setup-env ] || ( cd openslug ; mv setup-env setup-env.delete-me ) + [ -L openslug/setup-env -o ! -e openslug/setup-env ] || ( cd openslug ; mv setup-env setup-env.delete-me ) [ -e openslug/setup-env ] || ( cd openslug ; ln -s ../common/setup-env . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) [ -e openslug/bitbake ] || ( cd openslug ; ln -s ../bitbake . ) @@ -119,9 +119,9 @@ setup-openslug openslug/Makefile: setup-ucslugc ucslugc/Makefile: ${MAKE} MT/revision downloads [ -d ucslugc ] || ( mkdir -p ucslugc ) - [ -L ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me) + [ -L ucslugc/Makefile -o ! -e ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me) [ -e ucslugc/Makefile ] || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile ) - [ -L ucslugc/setup-env ] || ( cd ucslugc ; mv setup-env setup-env.delete-me ) + [ -L ucslugc/setup-env -o ! -e ucslugc/setup-env ] || ( cd ucslugc ; mv setup-env setup-env.delete-me ) [ -e ucslugc/setup-env ] || ( cd ucslugc ; ln -s ../common/setup-env . ) [ -e ucslugc/downloads ] || ( cd ucslugc ; ln -s ../downloads . ) [ -e ucslugc/bitbake ] || ( cd ucslugc ; ln -s ../bitbake . ) -- cgit v1.2.3 From e7799cc407b5d3c24d76c9950b83cb971d1b95af Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 1 Aug 2005 17:49:55 +0000 Subject: Prevent DISTRO, MAKE_TARGET and MACHINE getting into the environment. --- common/openembedded.mk | 19 +++++++++++++++---- common/setup-env | 9 ++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/common/openembedded.mk b/common/openembedded.mk index 88a143970a..c7eaa8e5fb 100644 --- a/common/openembedded.mk +++ b/common/openembedded.mk @@ -1,6 +1,17 @@ -# Makefile for UcSlugC +#!/bin/make +# Makefile for OpenEmbedded builds # Licensed under the GPL v2 or later # +# conf/auto.conf must exist in the same directory as the Makefile (i.e. +# the directory where Makefile is used - it may be a symbolic link to +# this file). conf/auto.conf defines: +# +# DISTRO - the OpenEmbedded 'distro' to build +# MACHINE - the OpenEmbedded build target machine +# MAKE_TARGET - the target to pass to bitbake +# +# All of these values are (should be, must be) quoted in double quotes +include conf/auto.conf BUILD_DIRS = downloads REQUIRED_DIRS = bitbake openembedded @@ -8,7 +19,7 @@ FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) # The default rule is to build the firmware in an unprotected environment. firmware: $(FIRMWARE_DEPS) - . ./setup-env; exec bitbake $${MAKE_TARGET} + . ./setup-env; exec bitbake $(MAKE_TARGET) # This rule clobbers the environment (note that ccache uses '$HOME' by # default, so the cache will end up there). @@ -40,7 +51,7 @@ clobber: .PHONY: source source: $(REQUIRED_DIRS) - tar zcf $${DISTRO}.tar.gz --exclude=MT Makefile setup-env conf/site.conf conf/auto.conf \ + tar zcf $(DISTRO).tar.gz --exclude=MT Makefile setup-env conf/site.conf conf/auto.conf \ conf/local.conf.sample $(REQUIRED_DIRS:=/.) # This target probably isn't important any longer, because the -source @@ -54,4 +65,4 @@ distclean: clobber # it removes directories from the tarball). .PHONY: really-clean: distclean - rm -rf $(REQUIRED_DIRS) $${DISTRO}-source.tar.gz + rm -rf $(REQUIRED_DIRS) $(DISTRO)-source.tar.gz diff --git a/common/setup-env b/common/setup-env index 46151e5774..a1e0d3fbd5 100644 --- a/common/setup-env +++ b/common/setup-env @@ -12,10 +12,6 @@ test -n "$TOPDIR" -a -d "$TOPDIR" || { exit 1 } -. ./conf/auto.conf -export DISTRO -export MAKE_TARGET - # # the following must match the definitions in common/conf/site.conf export PYTHONPATH="${TOPDIR}/bitbake/lib" @@ -31,10 +27,13 @@ unset CC unset CXX unset MFLAGS unset MAKEFLAGS +unset DISTRO +unset MACHINE +unset MAKE_TARGET # # make bb into a 'safe' bitbake alias bb-safe="env -i \ - HOME='${TOPDIR}/home' \ + HOME='${HOME}' \ PYTHONPATH='${PYTHONPATH}' \ BBPATH='${BBPATH}' \ PATH='${PATH}' \ -- cgit v1.2.3 From 71666fb57251f3375af43be126f351c107c1aff6 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 2 Aug 2005 03:45:39 +0000 Subject: Added the clobber-master target --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 42dc7dabe5..f856d4870a 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-dev update: update-master update-bitbake update-openembedded update-optware .PHONY: clobber -clobber: clobber-optware clobber-openembedded clobber-bitbake +clobber: clobber-optware clobber-openembedded clobber-bitbake clobber-master .PHONY: unslung build-unslung unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf @@ -260,6 +260,10 @@ update-optware: optware/Makefile update-openslug-2.3-beta: ( cd releases/OpenSlug-2.3-beta ; svn up ) +.PHONY: clobber-master +clobber-master: + rm -rf MT common downloads openslug scripts ucslugc unslung + .PHONY: clobber-bitbake clobber-bitbake: rm -rf bitbake -- cgit v1.2.3 From 0fad3350e7796dea30ab8d3434306b983f3f8bf0 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 2 Aug 2005 03:50:07 +0000 Subject: Removed the old unlsung Makefile --- unslung/Makefile | 57 -------------------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 unslung/Makefile diff --git a/unslung/Makefile b/unslung/Makefile deleted file mode 100644 index 88a143970a..0000000000 --- a/unslung/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# Makefile for UcSlugC -# Licensed under the GPL v2 or later -# - -BUILD_DIRS = downloads -REQUIRED_DIRS = bitbake openembedded -FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) - -# The default rule is to build the firmware in an unprotected environment. -firmware: $(FIRMWARE_DEPS) - . ./setup-env; exec bitbake $${MAKE_TARGET} - -# This rule clobbers the environment (note that ccache uses '$HOME' by -# default, so the cache will end up there). -firmware-safe: - env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) firmware - -# topdir.conf is re-created automatically if the directory is -# moved - this will cause a full bitbake reparse -.PHONY: create-topdir -create-topdir: conf/topdir.conf - . conf/topdir.conf && test "`pwd`" = "$$TOPDIR" || echo "TOPDIR='`pwd`'" > conf/topdir.conf - -conf/topdir.conf: - echo "TOPDIR='`pwd`'" >$@ - -# rules for directories - if a symlink exists and the target does not -# exist something will go wrong in the build, therefore cause a failure -# here by the mkdir. -$(BUILD_DIRS): - test -d $@ || if test -d ../$@; then ln -s ../$@ .; else mkdir $@; fi - -# these directories must already exist - either in TOPDIR (here) or in .. -$(REQUIRED_DIRS): - test -d $@ || if test -d ../$@; then ln -s ../$@ .; else exit 1; fi - -.PHONY: clobber -clobber: - rm -rf tmp - -.PHONY: source -source: $(REQUIRED_DIRS) - tar zcf $${DISTRO}.tar.gz --exclude=MT Makefile setup-env conf/site.conf conf/auto.conf \ - conf/local.conf.sample $(REQUIRED_DIRS:=/.) - -# This target probably isn't important any longer, because the -source -# target above does the right thing -.PHONY: -distclean: clobber - rm -rf conf/topdir.conf conf/local.conf $(BUILD_DIRS) - -# This target is mainly for testing - it is intended to put the disto directory -# back to its original state, it will destroy a source-tarball system (because -# it removes directories from the tarball). -.PHONY: -really-clean: distclean - rm -rf $(REQUIRED_DIRS) $${DISTRO}-source.tar.gz -- cgit v1.2.3 From b436e24637d38df828c18861a49ab48b373b8af8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 2 Aug 2005 03:50:39 +0000 Subject: Removed the old openslug Makefile --- openslug/Makefile | 57 ------------------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 openslug/Makefile diff --git a/openslug/Makefile b/openslug/Makefile deleted file mode 100644 index 88a143970a..0000000000 --- a/openslug/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# Makefile for UcSlugC -# Licensed under the GPL v2 or later -# - -BUILD_DIRS = downloads -REQUIRED_DIRS = bitbake openembedded -FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) - -# The default rule is to build the firmware in an unprotected environment. -firmware: $(FIRMWARE_DEPS) - . ./setup-env; exec bitbake $${MAKE_TARGET} - -# This rule clobbers the environment (note that ccache uses '$HOME' by -# default, so the cache will end up there). -firmware-safe: - env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) firmware - -# topdir.conf is re-created automatically if the directory is -# moved - this will cause a full bitbake reparse -.PHONY: create-topdir -create-topdir: conf/topdir.conf - . conf/topdir.conf && test "`pwd`" = "$$TOPDIR" || echo "TOPDIR='`pwd`'" > conf/topdir.conf - -conf/topdir.conf: - echo "TOPDIR='`pwd`'" >$@ - -# rules for directories - if a symlink exists and the target does not -# exist something will go wrong in the build, therefore cause a failure -# here by the mkdir. -$(BUILD_DIRS): - test -d $@ || if test -d ../$@; then ln -s ../$@ .; else mkdir $@; fi - -# these directories must already exist - either in TOPDIR (here) or in .. -$(REQUIRED_DIRS): - test -d $@ || if test -d ../$@; then ln -s ../$@ .; else exit 1; fi - -.PHONY: clobber -clobber: - rm -rf tmp - -.PHONY: source -source: $(REQUIRED_DIRS) - tar zcf $${DISTRO}.tar.gz --exclude=MT Makefile setup-env conf/site.conf conf/auto.conf \ - conf/local.conf.sample $(REQUIRED_DIRS:=/.) - -# This target probably isn't important any longer, because the -source -# target above does the right thing -.PHONY: -distclean: clobber - rm -rf conf/topdir.conf conf/local.conf $(BUILD_DIRS) - -# This target is mainly for testing - it is intended to put the disto directory -# back to its original state, it will destroy a source-tarball system (because -# it removes directories from the tarball). -.PHONY: -really-clean: distclean - rm -rf $(REQUIRED_DIRS) $${DISTRO}-source.tar.gz -- cgit v1.2.3 From 521db5920c5fb581223026d843fb0fdf9128c84f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 2 Aug 2005 05:14:59 +0000 Subject: Added status commands for developers to determine their changed files. --- Makefile | 83 +++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index f856d4870a..79ba6cceb2 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,9 @@ setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-dev .PHONY: update update: update-master update-bitbake update-openembedded update-optware +.PHONY: status +status: status-master status-bitbake status-openembedded status-optware + .PHONY: clobber clobber: clobber-optware clobber-openembedded clobber-bitbake clobber-master @@ -32,6 +35,10 @@ unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/ma openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf ( cd openslug ; ${MAKE} ) +.PHONY: openslug-2.3-beta build-openslug-2.3-beta +openslug-2.3-beta build-openslug-2.3-beta: releases/OpenSlug-2.3-beta/Makefile + ( cd releases/OpenSlug-2.3-beta ; ${MAKE} openslug-firmware ) + .PHONY: ucslugc build-ucslugc ucslugc build-ucslugc: ucslugc/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf ( cd ucslugc ; ${MAKE} ) @@ -47,49 +54,31 @@ optware-nslu2 build-optware-nslu2: optware/nslu2/Makefile optware-wl500g build-optware-wl500g: optware/wl500g/Makefile ( cd optware/wl500g ; ${MAKE} autoclean ; ${MAKE} ) -.PHONY: openslug-2.3-beta build-openslug-2.3-beta -openslug-2.3-beta build-openslug-2.3-beta: - ( cd releases/OpenSlug-2.3-beta ; ${MAKE} openslug-firmware ) - -.PHONY: setup-monotone -setup-monotone monotone/nslu2-linux.db: +.PHONY: setup-master +setup-master MT/revision: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && \ wget http://sources.nslu2-linux.org/monotone/nslu2-linux.db.gz -O monotone/nslu2-linux.db.gz && \ gunzip monotone/nslu2-linux.db.gz ) - ( monotone -d monotone/nslu2-linux.db unset database default-server ) - ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) - -downloads: - [ -e $@ ] || mkdir -p $@ - -MT/revision: - ${MAKE} downloads - [ -e monotone/nslu2-linux.db ] || ( ${MAKE} monotone/nslu2-linux.db ) [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) -.PHONY: setup-master -setup-master: setup-monotone unslung/Makefile openslug/Makefile ucslugc/Makefile - [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) - [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) - .PHONY: setup-bitbake -setup-bitbake bitbake/bin/bitbake: - ${MAKE} MT/revision +setup-bitbake bitbake/bin/bitbake: MT/revision [ -e bitbake/bin/bitbake ] || monotone co -b org.nslu2-linux.bitbake bitbake .PHONY: setup-openembedded -setup-openembedded openembedded/conf/machine/nslu2.conf: - ${MAKE} MT/revision +setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded .PHONY: setup-unslung -setup-unslung unslung/Makefile: - ${MAKE} MT/revision downloads +setup-unslung unslung/Makefile: MT/revision [ -d unslung ] || ( mkdir -p unslung ) - [ -L unslung/Makefile -o ! -e unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me) + [ -e downloads ] || ( mkdir -p downloads ) + [ -L unslung/Makefile -o ! -e unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me) [ -e unslung/Makefile ] || ( cd unslung ; ln -s ../common/openembedded.mk Makefile ) - [ -L unslung/setup-env -o ! -e unslung/setup-env ] || ( cd unslung ; mv setup-env setup-env.delete-me ) + [ -L unslung/setup-env -o ! -e unslung/setup-env ] || ( cd unslung ; mv setup-env setup-env.delete-me ) [ -e unslung/setup-env ] || ( cd unslung ; ln -s ../common/setup-env . ) [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e unslung/bitbake ] || ( cd unslung ; ln -s ../bitbake . ) @@ -100,12 +89,12 @@ setup-unslung unslung/Makefile: rm -rf unslung/tmp/cache .PHONY: setup-openslug -setup-openslug openslug/Makefile: - ${MAKE} MT/revision downloads +setup-openslug openslug/Makefile: MT/revision [ -d openslug ] || ( mkdir -p openslug ) - [ -L openslug/Makefile -o ! -e openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me) + [ -e downloads ] || ( mkdir -p downloads ) + [ -L openslug/Makefile -o ! -e openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me) [ -e openslug/Makefile ] || ( cd openslug ; ln -s ../common/openembedded.mk Makefile ) - [ -L openslug/setup-env -o ! -e openslug/setup-env ] || ( cd openslug ; mv setup-env setup-env.delete-me ) + [ -L openslug/setup-env -o ! -e openslug/setup-env ] || ( cd openslug ; mv setup-env setup-env.delete-me ) [ -e openslug/setup-env ] || ( cd openslug ; ln -s ../common/setup-env . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) [ -e openslug/bitbake ] || ( cd openslug ; ln -s ../bitbake . ) @@ -116,12 +105,12 @@ setup-openslug openslug/Makefile: rm -rf openslug/tmp/cache .PHONY: setup-ucslugc -setup-ucslugc ucslugc/Makefile: - ${MAKE} MT/revision downloads +setup-ucslugc ucslugc/Makefile: MT/revision [ -d ucslugc ] || ( mkdir -p ucslugc ) - [ -L ucslugc/Makefile -o ! -e ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me) + [ -e downloads ] || ( mkdir -p downloads ) + [ -L ucslugc/Makefile -o ! -e ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me) [ -e ucslugc/Makefile ] || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile ) - [ -L ucslugc/setup-env -o ! -e ucslugc/setup-env ] || ( cd ucslugc ; mv setup-env setup-env.delete-me ) + [ -L ucslugc/setup-env -o ! -e ucslugc/setup-env ] || ( cd ucslugc ; mv setup-env setup-env.delete-me ) [ -e ucslugc/setup-env ] || ( cd ucslugc ; ln -s ../common/setup-env . ) [ -e ucslugc/downloads ] || ( cd ucslugc ; ln -s ../downloads . ) [ -e ucslugc/bitbake ] || ( cd ucslugc ; ln -s ../bitbake . ) @@ -133,15 +122,15 @@ setup-ucslugc ucslugc/Makefile: .PHONY: setup-openslug-2.3-beta setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/Makefile: - ${MAKE} downloads [ ! -e releases/OpenSlug-2.3-beta ] || mkdir -p releases svn checkout svn://svn.berlios.de/openslug/releases/OpenSlug-2.3-beta releases/OpenSlug-2.3-beta cd releases/OpenSlug-2.3-beta && ${MAKE} conf/local.conf setup-env + [ -e downloads ] || ( mkdir -p downloads ) ln -s ../../downloads releases/OpenSlug-2.3-beta/ .PHONY: setup-optware setup-optware optware/Makefile: - ${MAKE} downloads + [ -e downloads ] || ( mkdir -p downloads ) [ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) optware/nslu2/Makefile: @@ -170,10 +159,8 @@ optware/wl500g/Makefile: .PHONY: setup-optware-developer setup-optware-developer: - ${MAKE} downloads [ ! -e optware ] || ( mv optware optware-user ) cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung - ${MAKE} optware/nslu2/Makefile optware/wl500g/Makefile .PHONY: setup-slugimage-developer setup-slugimage-developer: @@ -260,6 +247,26 @@ update-optware: optware/Makefile update-openslug-2.3-beta: ( cd releases/OpenSlug-2.3-beta ; svn up ) +.PHONY: status-master +status-master: MT/revision + monotone status --brief + +.PHONY: status-bitbake +status-bitbake: bitbake/bin/bitbake + ( cd bitbake ; monotone status --brief ) + +.PHONY: status-openembedded +status-openembedded: openembedded/conf/machine/nslu2.conf + ( cd openembedded ; monotone status --brief ) + +.PHONY: status-optware +status-optware: optware/Makefile + ( cd optware ; cvs -q update -d -P ) + +.PHONY: status-openslug-2.3-beta +status-openslug-2.3-beta: + ( cd releases/OpenSlug-2.3-beta ; svn status ) + .PHONY: clobber-master clobber-master: rm -rf MT common downloads openslug scripts ucslugc unslung -- cgit v1.2.3 From 6407ebe80de9614bdb380f25216dbdc717d763ba Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 2 Aug 2005 06:05:37 +0000 Subject: Revamped the setup targets to use a .configured stamp file to indicate completion instead of a file that is touched on each pull and causes downstream dependencies to be out of date. --- Makefile | 117 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 66 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index 79ba6cceb2..1b1038d83f 100644 --- a/Makefile +++ b/Makefile @@ -28,34 +28,34 @@ status: status-master status-bitbake status-openembedded status-optware clobber: clobber-optware clobber-openembedded clobber-bitbake clobber-master .PHONY: unslung build-unslung -unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf +unslung build-unslung: unslung/.configured bitbake/.configured openembedded/.configured ( cd unslung ; ${MAKE} ) .PHONY: openslug build-openslug -openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf +openslug build-openslug: openslug/.configured bitbake/.configured openembedded/.configured ( cd openslug ; ${MAKE} ) -.PHONY: openslug-2.3-beta build-openslug-2.3-beta -openslug-2.3-beta build-openslug-2.3-beta: releases/OpenSlug-2.3-beta/Makefile - ( cd releases/OpenSlug-2.3-beta ; ${MAKE} openslug-firmware ) - .PHONY: ucslugc build-ucslugc -ucslugc build-ucslugc: ucslugc/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf +ucslugc build-ucslugc: ucslugc/.configured bitbake/.configured openembedded/.configured ( cd ucslugc ; ${MAKE} ) .PHONY: optware build-optware optware build-optware: build-optware-nslu2 build-optware-wl500g .PHONY: optware-nslu2 build-optware-nslu2 -optware-nslu2 build-optware-nslu2: optware/nslu2/Makefile +optware-nslu2 build-optware-nslu2: optware/nslu2/.configured ( cd optware/nslu2 ; ${MAKE} autoclean ; ${MAKE} ) .PHONY: optware-wl500g build-optware-wl500g -optware-wl500g build-optware-wl500g: optware/wl500g/Makefile +optware-wl500g build-optware-wl500g: optware/wl500g/.configured ( cd optware/wl500g ; ${MAKE} autoclean ; ${MAKE} ) +.PHONY: openslug-2.3-beta build-openslug-2.3-beta +openslug-2.3-beta build-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured + ( cd releases/OpenSlug-2.3-beta ; ${MAKE} openslug-firmware ) + .PHONY: setup-master -setup-master MT/revision: +setup-master MT/.configured: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && \ wget http://sources.nslu2-linux.org/monotone/nslu2-linux.db.gz -O monotone/nslu2-linux.db.gz && \ gunzip monotone/nslu2-linux.db.gz ) @@ -63,17 +63,20 @@ setup-master MT/revision: - ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) + touch MT/.configured .PHONY: setup-bitbake -setup-bitbake bitbake/bin/bitbake: MT/revision +setup-bitbake bitbake/.configured: MT/.configured [ -e bitbake/bin/bitbake ] || monotone co -b org.nslu2-linux.bitbake bitbake + touch bitbake/.configured .PHONY: setup-openembedded -setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision +setup-openembedded openembedded/.configured: MT/.configured [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded + touch openembedded/.configured .PHONY: setup-unslung -setup-unslung unslung/Makefile: MT/revision +setup-unslung unslung/.configured: MT/.configured [ -d unslung ] || ( mkdir -p unslung ) [ -e downloads ] || ( mkdir -p downloads ) [ -L unslung/Makefile -o ! -e unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me) @@ -87,9 +90,10 @@ setup-unslung unslung/Makefile: MT/revision [ ! -f unslung/conf/local.conf ] || ( cd unslung/conf ; mv local.conf local.conf.delete-me ) [ -e unslung/conf/site.conf ] || ( cd unslung/conf ; ln -s ../../common/conf/site.conf . ) rm -rf unslung/tmp/cache + touch unslung/.configured .PHONY: setup-openslug -setup-openslug openslug/Makefile: MT/revision +setup-openslug openslug/.configured: MT/.configured [ -d openslug ] || ( mkdir -p openslug ) [ -e downloads ] || ( mkdir -p downloads ) [ -L openslug/Makefile -o ! -e openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me) @@ -103,9 +107,10 @@ setup-openslug openslug/Makefile: MT/revision [ ! -f openslug/conf/local.conf ] || ( cd openslug/conf ; mv local.conf local.conf.delete-me ) [ -e openslug/conf/site.conf ] || ( cd openslug/conf ; ln -s ../../common/conf/site.conf . ) rm -rf openslug/tmp/cache + touch openslug/.configured .PHONY: setup-ucslugc -setup-ucslugc ucslugc/Makefile: MT/revision +setup-ucslugc ucslugc/.configured: MT/.configured [ -d ucslugc ] || ( mkdir -p ucslugc ) [ -e downloads ] || ( mkdir -p downloads ) [ -L ucslugc/Makefile -o ! -e ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me) @@ -119,23 +124,16 @@ setup-ucslugc ucslugc/Makefile: MT/revision [ ! -f ucslugc/conf/local.conf ] || ( cd ucslugc/conf ; mv local.conf local.conf.delete-me ) [ -e ucslugc/conf/site.conf ] || ( cd ucslugc/conf ; ln -s ../../common/conf/site.conf . ) rm -rf ucslugc/tmp/cache - -.PHONY: setup-openslug-2.3-beta -setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/Makefile: - [ ! -e releases/OpenSlug-2.3-beta ] || mkdir -p releases - svn checkout svn://svn.berlios.de/openslug/releases/OpenSlug-2.3-beta releases/OpenSlug-2.3-beta - cd releases/OpenSlug-2.3-beta && ${MAKE} conf/local.conf setup-env - [ -e downloads ] || ( mkdir -p downloads ) - ln -s ../../downloads releases/OpenSlug-2.3-beta/ + touch ucslugc/.configured .PHONY: setup-optware -setup-optware optware/Makefile: +setup-optware optware/.configured: [ -e downloads ] || ( mkdir -p downloads ) [ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) + touch optware/.configured -optware/nslu2/Makefile: - ${MAKE} optware/Makefile - [ -e optware/nslu2/Makefile ] || ( \ +optware/nslu2/.configured: optware/.configured + [ -e optware/nslu2/Makefile ] || ( \ mkdir -p optware/nslu2 ; \ echo "OPTWARE_TARGET=nslu2" > optware/nslu2/Makefile ; \ echo "include ../Makefile" >> optware/nslu2/Makefile ; \ @@ -144,10 +142,10 @@ optware/nslu2/Makefile: ln -s ../scripts optware/nslu2/scripts ; \ ln -s ../sources optware/nslu2/sources ; \ ) + touch optware/nslu2/.configured -optware/wl500g/Makefile: - ${MAKE} optware/Makefile - [ -e optware/wl500g/Makefile ] || ( \ +optware/wl500g/.configured: optware/.configured + [ -e optware/wl500g/Makefile ] || ( \ mkdir -p optware/wl500g ; \ echo "OPTWARE_TARGET=wl500g" > optware/wl500g/Makefile ; \ echo "include ../Makefile" >> optware/wl500g/Makefile ; \ @@ -156,11 +154,13 @@ optware/wl500g/Makefile: ln -s ../scripts optware/wl500g/scripts ; \ ln -s ../sources optware/wl500g/sources ; \ ) + touch optware/wl500g/.configured .PHONY: setup-optware-developer setup-optware-developer: [ ! -e optware ] || ( mv optware optware-user ) cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung + ${MAKE} setup-optware .PHONY: setup-slugimage-developer setup-slugimage-developer: @@ -182,11 +182,26 @@ setup-apex apex/Makefile: setup-apex-developer: cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co apex +.PHONY: setup-openslug-2.3-beta +setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/.configured: + [ -e releases/OpenSlug-2.3-beta ] || ( \ + mkdir -p releases ; \ + svn checkout svn://svn.berlios.de/openslug/releases/OpenSlug-2.3-beta \ + releases/OpenSlug-2.3-beta \ + ) + ( cd releases/OpenSlug-2.3-beta ; ${MAKE} conf/local.conf setup-env ) + [ -e downloads ] || ( mkdir -p downloads ) + ln -s ../../downloads releases/OpenSlug-2.3-beta/ + touch releases/OpenSlug-2.3-beta/.configured + .PHONY: setup-openslug-2.3-beta-developer setup-openslug-2.3-beta-developer: - [ ! -e releases/OpenSlug-2.3-beta ] || mkdir -p releases - svn checkout svn+ssh://svn.berlios.de/svnroot/repos/openslug/releases/OpenSlug-2.3-beta releases/OpenSlug-2.3-beta - cd releases/OpenSlug-2.3-beta && ${MAKE} conf/local.conf setup-env + [ -e releases/OpenSlug-2.3-beta ] || ( \ + mkdir -p releases ; \ + svn checkout svn+ssh://svn.berlios.de/svnroot/repos/openslug/releases/OpenSlug-2.3-beta \ + releases/OpenSlug-2.3-beta \ + ) + ${MAKE} setup-openslug-2.3-beta .PHONY: setup-host-debian setup-host-debian: @@ -207,7 +222,7 @@ setup-host-debian: unzip .PHONY: update-master -update-master: MT/revision +update-master: MT/.configured monotone pull if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ monotone merge -b org.nslu2-linux.dev ; \ @@ -218,7 +233,7 @@ update-master: MT/revision fi .PHONY: update-bitbake -update-bitbake: bitbake/bin/bitbake +update-bitbake: bitbake/.configured monotone pull if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1" ] ; then \ monotone merge -b org.nslu2-linux.bitbake ; \ @@ -229,7 +244,7 @@ update-bitbake: bitbake/bin/bitbake fi .PHONY: update-openembedded -update-openembedded: openembedded/conf/machine/nslu2.conf +update-openembedded: openembedded/.configured monotone pull if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.nslu2-linux ; \ @@ -240,27 +255,27 @@ update-openembedded: openembedded/conf/machine/nslu2.conf fi .PHONY: update-optware -update-optware: optware/Makefile +update-optware: optware/.configured ( cd optware ; cvs -q update -d -P ) .PHONY: update-openslug-2.3-beta -update-openslug-2.3-beta: +update-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured ( cd releases/OpenSlug-2.3-beta ; svn up ) .PHONY: status-master -status-master: MT/revision +status-master: MT/.configured monotone status --brief .PHONY: status-bitbake -status-bitbake: bitbake/bin/bitbake +status-bitbake: bitbake/.configured ( cd bitbake ; monotone status --brief ) .PHONY: status-openembedded -status-openembedded: openembedded/conf/machine/nslu2.conf +status-openembedded: openembedded/.configured ( cd openembedded ; monotone status --brief ) .PHONY: status-optware -status-optware: optware/Makefile +status-optware: optware/.configured ( cd optware ; cvs -q update -d -P ) .PHONY: status-openslug-2.3-beta @@ -317,7 +332,7 @@ autobuild: upload: upload-openslug-cross upload-ucslugc-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross upload-sources .PHONY: upload-openslug-cross -upload-openslug-cross: openslug/Makefile +upload-openslug-cross: openslug/.configured rm -rf openslug/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable @@ -326,7 +341,7 @@ upload-openslug-cross: openslug/Makefile ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable .PHONY: upload-openslug-2.3-beta-cross -upload-openslug-2.3-beta-cross: +upload-openslug-2.3-beta-cross: releases/OpenSlug-2.3-beta/.configured rm -rf releases/OpenSlug-2.3-beta/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta @@ -335,7 +350,7 @@ upload-openslug-2.3-beta-cross: ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta .PHONY: upload-ucslugc-cross -upload-ucslugc-cross: ucslugc/Makefile +upload-ucslugc-cross: ucslugc/.configured rm -rf ucslugc/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' ucslugc/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/ucslugc/cross/unstable/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross/unstable @@ -344,7 +359,7 @@ upload-ucslugc-cross: ucslugc/Makefile ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross/unstable .PHONY: upload-unslung-modules -upload-unslung-modules: unslung/Makefile +upload-unslung-modules: unslung/.configured rm -rf unslung/tmp/deploy/ipk/morgue scripts/package-strip.pl kernel-module-\* unslung/tmp/deploy/ipk/Packages unslung/tmp/deploy/ipk/Packages.new mv unslung/tmp/deploy/ipk/Packages.new unslung/tmp/deploy/ipk/Packages @@ -357,7 +372,7 @@ upload-unslung-modules: unslung/Makefile # rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ .PHONY: upload-optware-nslu2-cross -upload-optware-nslu2-cross: optware/nslu2/Makefile +upload-optware-nslu2-cross: optware/nslu2/.configured rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross rsync -vl optware/nslu2/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ @@ -365,7 +380,7 @@ upload-optware-nslu2-cross: optware/nslu2/Makefile ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/cross .PHONY: upload-optware-wl500g-cross -upload-optware-wl500g-cross: optware/wl500g/Makefile +upload-optware-wl500g-cross: optware/wl500g/.configured rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g rsync -vl optware/wl500g/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ @@ -377,7 +392,7 @@ upload-sources: rsync -vlrt --exclude='ixp400*' downloads/ nslu2@sources.nslu2-linux.org:ipkg/sources/ .PHONY: import-bitbake -import-bitbake: bitbake/bin/bitbake +import-bitbake: bitbake/.configured mv bitbake bitbake.old svn co svn://svn.berlios.de/bitbake/trunk/bitbake cp -rp bitbake.old/MT bitbake.old/.mt-attrs bitbake @@ -385,7 +400,7 @@ import-bitbake: bitbake/bin/bitbake ( cd bitbake ; rm -rf .svn ; monotone status ) .PHONY: import-openembedded -import-openembedded: openembedded/conf/machine/nslu2.conf +import-openembedded: openembedded/.configured monotone pull monotone.vanille.de org.openembedded.* if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.dev ; \ @@ -399,7 +414,7 @@ import-openembedded: openembedded/conf/machine/nslu2.conf fi .PHONY: export-openembedded -export-openembedded: openembedded/conf/machine/nslu2.conf +export-openembedded: openembedded/.configured if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.nslu2-linux ; \ fi -- cgit v1.2.3 From a504c015bca9089d0622e04ad33b24e6805a061c Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 2 Aug 2005 07:18:18 +0000 Subject: Added the clobber-releases target. --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1b1038d83f..676953456c 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ update: update-master update-bitbake update-openembedded update-optware status: status-master status-bitbake status-openembedded status-optware .PHONY: clobber -clobber: clobber-optware clobber-openembedded clobber-bitbake clobber-master +clobber: clobber-master clobber-bitbake clobber-openembedded clobber-optware clobber-releases .PHONY: unslung build-unslung unslung build-unslung: unslung/.configured bitbake/.configured openembedded/.configured @@ -298,6 +298,10 @@ clobber-openembedded: clobber-optware: rm -rf optware +.PHONY: clobber-releases +clobber-releases: + rm -rf releases + # Targets for use by those with write access to the repositories .PHONY: push @@ -306,6 +310,7 @@ push: push-master push-bitbake push-openembedded .PHONY: push-master push-master: update-master monotone push + # scp Makefile slug@www.nslu2-linux.org:htdocs/www/Makefile scp Makefile nslu@www.nslu2-linux.org:public_html/Makefile .PHONY: push-bitbake -- cgit v1.2.3 From 561638d18f47647bda12787f3b16e0b137cc0423 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 31 Jul 2005 02:22:45 +0000 Subject: Improved the autobuild target --- Makefile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 676953456c..ce94d80e5d 100644 --- a/Makefile +++ b/Makefile @@ -325,13 +325,18 @@ push-openembedded: update-openembedded .PHONY: autobuild autobuild: - ${MAKE} update - ${MAKE} build-ucslugc upload-ucslugc-cross - ${MAKE} build-openslug upload-openslug-cross - ${MAKE} build-unslung upload-unslung-modules - ${MAKE} build-optware-nslu2 upload-optware-nslu2-cross - ${MAKE} build-optware-wl500g upload-optware-wl500g-cross - ${MAKE} upload-sources + ( set errors=0 ; \ + ${MAKE} update || errors++; \ + ${MAKE} build-openslug upload-openslug-cross || errors++ ; \ + ${MAKE} build-ucslugc upload-ucslugc-cross || errors++; \ + ${MAKE} build-unslung upload-unslung-modules || errors++ ; \ + ${MAKE} build-optware-nslu2 upload-optware-nslu2-cross || errors++; \ + ${MAKE} build-optware-wl500g upload-optware-wl500g-cross || errors++; \ + ${MAKE} upload-sources || errors++ ; \ + if [ "$errors" != "0" ] ; then \ + echo "*** Errors during autobuild: $errors ***" ; \ + fi \ + ) .PHONY: upload upload: upload-openslug-cross upload-ucslugc-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross upload-sources -- cgit v1.2.3 From 1fd08029fc8d2fbf0da3b176cf53ff0000858eef Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 31 Jul 2005 12:45:59 +0000 Subject: Moved to new Makefile download location. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ce94d80e5d..2f3199d38d 100644 --- a/Makefile +++ b/Makefile @@ -310,8 +310,7 @@ push: push-master push-bitbake push-openembedded .PHONY: push-master push-master: update-master monotone push - # scp Makefile slug@www.nslu2-linux.org:htdocs/www/Makefile - scp Makefile nslu@www.nslu2-linux.org:public_html/Makefile + scp Makefile slug@nugabe.nslu2-linux.org:htdocs/www/Makefile .PHONY: push-bitbake push-bitbake: update-bitbake -- cgit v1.2.3 From db6d6bdaf9ba34f267fc8b915c6dabc37c7b875f Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 2 Aug 2005 18:13:26 +0000 Subject: Update Makefile so it doesn't barf if there already is a symlink to ./downloads --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ce94d80e5d..ae312849d2 100644 --- a/Makefile +++ b/Makefile @@ -191,7 +191,7 @@ setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/.configured: ) ( cd releases/OpenSlug-2.3-beta ; ${MAKE} conf/local.conf setup-env ) [ -e downloads ] || ( mkdir -p downloads ) - ln -s ../../downloads releases/OpenSlug-2.3-beta/ + [ -e releases/OpenSlug-2.3-beta/downloads ] || ln -s ../../downloads releases/OpenSlug-2.3-beta/ touch releases/OpenSlug-2.3-beta/.configured .PHONY: setup-openslug-2.3-beta-developer -- cgit v1.2.3 From 7816a63d18b55d6dcdc4d715261f786c6c3af44f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 3 Aug 2005 03:06:45 +0000 Subject: Moved to new Makefile download location. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ae312849d2..ad3aac44ce 100644 --- a/Makefile +++ b/Makefile @@ -310,8 +310,7 @@ push: push-master push-bitbake push-openembedded .PHONY: push-master push-master: update-master monotone push - # scp Makefile slug@www.nslu2-linux.org:htdocs/www/Makefile - scp Makefile nslu@www.nslu2-linux.org:public_html/Makefile + scp Makefile slug@nugabe.nslu2-linux.org:htdocs/www/Makefile .PHONY: push-bitbake push-bitbake: update-bitbake -- cgit v1.2.3 From 648b671fd19365f78320c73d0fbf8a3078a46c47 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 3 Aug 2005 03:22:17 +0000 Subject: Fixed the autobuild error reporting. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ad3aac44ce..9121220e73 100644 --- a/Makefile +++ b/Makefile @@ -332,8 +332,8 @@ autobuild: ${MAKE} build-optware-nslu2 upload-optware-nslu2-cross || errors++; \ ${MAKE} build-optware-wl500g upload-optware-wl500g-cross || errors++; \ ${MAKE} upload-sources || errors++ ; \ - if [ "$errors" != "0" ] ; then \ - echo "*** Errors during autobuild: $errors ***" ; \ + if [ "$$errors" != "0" ] ; then \ + echo "*** Errors during autobuild: $$errors ***" ; \ fi \ ) -- cgit v1.2.3 From dbfefc55d88c6bb15b6a6719d3d983d294c8df5a Mon Sep 17 00:00:00 2001 From: John Bowler Date: Wed, 3 Aug 2005 07:05:22 +0000 Subject: Change ucslugc to build it's own target - ucslugc-packages --- ucslugc/conf/auto.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ucslugc/conf/auto.conf b/ucslugc/conf/auto.conf index b6a439982e..a70e98fc7b 100644 --- a/ucslugc/conf/auto.conf +++ b/ucslugc/conf/auto.conf @@ -1,4 +1,4 @@ # UcSlugC bitbake configuration DISTRO="ucslugc" MACHINE="nslu2" -MAKE_TARGET="openslug-packages" \ No newline at end of file +MAKE_TARGET="ucslugc-packages" -- cgit v1.2.3 From 95b82c054f0a3f98096d583bb2089646e383fbc6 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 31 Jul 2005 23:12:26 +0000 Subject: /conf/auto.conf is now generated by the Makefile --- Makefile | 93 +++++++++++++++++--------------------- common/conf/local.conf.sample | 45 +++++++++++++++++++ common/openembedded.mk | 3 +- openslug/.mtn2git_empty | 0 openslug/conf/.mt-ignore | 1 - openslug/conf/.mtn2git_empty | 0 openslug/conf/auto.conf | 4 -- openslug/conf/local.conf.template | 94 --------------------------------------- ucslugc/.mtn2git_empty | 0 ucslugc/conf/.mtn2git_empty | 0 ucslugc/conf/auto.conf | 4 -- ucslugc/conf/local.conf.sample | 49 -------------------- unslung/.mtn2git_empty | 0 unslung/conf/.mtn2git_empty | 0 unslung/conf/auto.conf | 4 -- unslung/conf/local.conf.template | 57 ------------------------ 16 files changed, 87 insertions(+), 267 deletions(-) create mode 100644 common/conf/local.conf.sample delete mode 100644 openslug/.mtn2git_empty delete mode 100644 openslug/conf/.mt-ignore delete mode 100644 openslug/conf/.mtn2git_empty delete mode 100644 openslug/conf/auto.conf delete mode 100644 openslug/conf/local.conf.template delete mode 100644 ucslugc/.mtn2git_empty delete mode 100644 ucslugc/conf/.mtn2git_empty delete mode 100644 ucslugc/conf/auto.conf delete mode 100644 ucslugc/conf/local.conf.sample delete mode 100644 unslung/.mtn2git_empty delete mode 100644 unslung/conf/.mtn2git_empty delete mode 100644 unslung/conf/auto.conf delete mode 100644 unslung/conf/local.conf.template diff --git a/Makefile b/Makefile index 9121220e73..9c50396e34 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,8 @@ update: update-master update-bitbake update-openembedded update-optware status: status-master status-bitbake status-openembedded status-optware .PHONY: clobber -clobber: clobber-master clobber-bitbake clobber-openembedded clobber-optware clobber-releases +clobber: clobber-master clobber-bitbake clobber-openembedded \ + clobber-unslung clobber-openslug clobber-ucslugc clobber-optware clobber-releases .PHONY: unslung build-unslung unslung build-unslung: unslung/.configured bitbake/.configured openembedded/.configured @@ -75,59 +76,35 @@ setup-openembedded openembedded/.configured: MT/.configured [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded touch openembedded/.configured -.PHONY: setup-unslung -setup-unslung unslung/.configured: MT/.configured - [ -d unslung ] || ( mkdir -p unslung ) - [ -e downloads ] || ( mkdir -p downloads ) - [ -L unslung/Makefile -o ! -e unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me) - [ -e unslung/Makefile ] || ( cd unslung ; ln -s ../common/openembedded.mk Makefile ) - [ -L unslung/setup-env -o ! -e unslung/setup-env ] || ( cd unslung ; mv setup-env setup-env.delete-me ) - [ -e unslung/setup-env ] || ( cd unslung ; ln -s ../common/setup-env . ) - [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) - [ -e unslung/bitbake ] || ( cd unslung ; ln -s ../bitbake . ) - [ -e unslung/openembedded ] || ( cd unslung ; ln -s ../openembedded . ) - [ -d unslung/conf ] || ( mkdir -p unslung/conf ) - [ ! -f unslung/conf/local.conf ] || ( cd unslung/conf ; mv local.conf local.conf.delete-me ) - [ -e unslung/conf/site.conf ] || ( cd unslung/conf ; ln -s ../../common/conf/site.conf . ) - rm -rf unslung/tmp/cache - touch unslung/.configured - -.PHONY: setup-openslug -setup-openslug openslug/.configured: MT/.configured - [ -d openslug ] || ( mkdir -p openslug ) - [ -e downloads ] || ( mkdir -p downloads ) - [ -L openslug/Makefile -o ! -e openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me) - [ -e openslug/Makefile ] || ( cd openslug ; ln -s ../common/openembedded.mk Makefile ) - [ -L openslug/setup-env -o ! -e openslug/setup-env ] || ( cd openslug ; mv setup-env setup-env.delete-me ) - [ -e openslug/setup-env ] || ( cd openslug ; ln -s ../common/setup-env . ) - [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) - [ -e openslug/bitbake ] || ( cd openslug ; ln -s ../bitbake . ) - [ -e openslug/openembedded ] || ( cd openslug ; ln -s ../openembedded . ) - [ -d openslug/conf ] || ( mkdir -p openslug/conf ) - [ ! -f openslug/conf/local.conf ] || ( cd openslug/conf ; mv local.conf local.conf.delete-me ) - [ -e openslug/conf/site.conf ] || ( cd openslug/conf ; ln -s ../../common/conf/site.conf . ) - rm -rf openslug/tmp/cache - touch openslug/.configured - -.PHONY: setup-ucslugc -setup-ucslugc ucslugc/.configured: MT/.configured - [ -d ucslugc ] || ( mkdir -p ucslugc ) - [ -e downloads ] || ( mkdir -p downloads ) - [ -L ucslugc/Makefile -o ! -e ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me) - [ -e ucslugc/Makefile ] || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile ) - [ -L ucslugc/setup-env -o ! -e ucslugc/setup-env ] || ( cd ucslugc ; mv setup-env setup-env.delete-me ) - [ -e ucslugc/setup-env ] || ( cd ucslugc ; ln -s ../common/setup-env . ) - [ -e ucslugc/downloads ] || ( cd ucslugc ; ln -s ../downloads . ) - [ -e ucslugc/bitbake ] || ( cd ucslugc ; ln -s ../bitbake . ) - [ -e ucslugc/openembedded ] || ( cd ucslugc ; ln -s ../openembedded . ) - [ -d ucslugc/conf ] || ( mkdir -p ucslugc/conf ) - [ ! -f ucslugc/conf/local.conf ] || ( cd ucslugc/conf ; mv local.conf local.conf.delete-me ) - [ -e ucslugc/conf/site.conf ] || ( cd ucslugc/conf ; ln -s ../../common/conf/site.conf . ) - rm -rf ucslugc/tmp/cache - touch ucslugc/.configured +.PHONY: setup-unslung setup-openslug setup-ucslugc +setup-unslung setup-openslug setup-ucslugc: setup-%: MT/.configured + rm -rf $*/.configured + ${MAKE} $*/.configured + +%/.configured: MT/.configured + [ -d $* ] || ( mkdir -p $* ) + [ -e downloads ] || ( mkdir -p downloads ) + [ -L $*/Makefile -o ! -e $*/Makefile ] || ( cd $* ; mv Makefile Makefile.delete-me) + [ -e $*/Makefile ] || ( cd $* ; ln -s ../common/openembedded.mk Makefile ) + [ -L $*/setup-env -o ! -e $*/setup-env ] || ( cd $* ; mv setup-env setup-env.delete-me ) + [ -e $*/setup-env ] || ( cd $* ; ln -s ../common/setup-env . ) + [ -e $*/downloads ] || ( cd $* ; ln -s ../downloads . ) + [ -e $*/bitbake ] || ( cd $* ; ln -s ../bitbake . ) + [ -e $*/openembedded ] || ( cd $* ; ln -s ../openembedded . ) + [ -d $*/conf ] || ( mkdir -p $*/conf ) + [ ! -f $*/conf/local.conf ] || ( cd $*/conf ; mv local.conf local.conf.delete-me ) + [ -e $*/conf/local.conf.sample ] || ( cd $*/conf ; ln -s ../../common/conf/local.conf.sample . ) + [ -e $*/conf/site.conf ] || ( cd $*/conf ; ln -s ../../common/conf/site.conf . ) + [ ! -f $*/conf/auto.conf ] || ( cd $*/conf ; rm -f auto.conf ) + [ -e $*/conf/auto.conf ] || ( \ + echo "DISTRO=\"$*\"" > $*/conf/auto.conf ; \ + echo "MACHINE=\"nslu2\"" >> $*/conf/auto.conf \ + ) + rm -rf $*/tmp/cache + touch $*/.configured .PHONY: setup-optware -setup-optware optware/.configured: +setup-optware optware/.configured: MT/.configured [ -e downloads ] || ( mkdir -p downloads ) [ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) touch optware/.configured @@ -294,6 +271,18 @@ clobber-bitbake: clobber-openembedded: rm -rf openembedded +.PHONY: clobber-unslung +clobber-unslung: + rm -rf unslung + +.PHONY: clobber-openslug +clobber-openslug: + rm -rf openslug + +.PHONY: clobber-ucslugc +clobber-ucslugc: + rm -rf ucslugc + .PHONY: clobber-optware clobber-optware: rm -rf optware diff --git a/common/conf/local.conf.sample b/common/conf/local.conf.sample new file mode 100644 index 0000000000..c191c8ff63 --- /dev/null +++ b/common/conf/local.conf.sample @@ -0,0 +1,45 @@ +# Sample local configuration +# +# You do not need a 'local.conf' file, however you may use one to alter +# how the build proceeds and to specify bitbake options. +# +#---------------------------------------------------------------------------------- +# bitbake options +#---------------------------------------------------------------------------------- +# +#BBINCLUDELOGS = "yes" +# bitbake logs build progress to per-package log files. By default if an +# error occurs bitbake outputs the name of this file with an error message. +# If you set BBINCLUDELOGS to 'yes' then bitbake will also output the log +# file itself. +# +#BBMASK = "regular expression" +# bitbake examines all the .bb files listed in the BBFILES variable. BBMASK +# can be used to exclude some (or, indeed, all) of these files by matching +# against a regular expression. Typically you do not want to do this because +# bitbake freeze can be used to generate a minimal list for BBFILES. +# +#---------------------------------------------------------------------------------- +# OpenSlug (and derivatives) options +#---------------------------------------------------------------------------------- +#FEED_URIS = "##" +# Define local feeds - should be replaced by a name which identifies +# your local feed (not a generic name!) and should be the location of +# the Packages.gz file (and, therefore, all the ipks). This is not required; +# the feed defaults to the internet one. +# +#_EXTRA_DEPENDS = "packages to add to the build" +# Any packages in this list will be built as depenencies of the firmware +# image, but they will not be included in the image (see below). +# +#_EXTRA_RDEPENDS = "packages to add to the firmware image" +# Any packages in this list will be added to the firmware image. Please do +# not distribute such images - make a new DISTRO.conf file following the +# instructions in conf/distro/ucslugc.conf +# +#_EXTRA_BBFILES = "paths of extra .bb files" +# Files in this list will be parsed by bitbake to find packages in addition +# to the default list of bb files in conf/distro/-packages.conf. The +# setting of this variable is irrelevant after bb freeze has been built or if +# bb unfreeze is built (in the latter case bitbake will examine all of the +# openembedded packages). diff --git a/common/openembedded.mk b/common/openembedded.mk index c7eaa8e5fb..c23f206122 100644 --- a/common/openembedded.mk +++ b/common/openembedded.mk @@ -8,7 +8,6 @@ # # DISTRO - the OpenEmbedded 'distro' to build # MACHINE - the OpenEmbedded build target machine -# MAKE_TARGET - the target to pass to bitbake # # All of these values are (should be, must be) quoted in double quotes include conf/auto.conf @@ -19,7 +18,7 @@ FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) # The default rule is to build the firmware in an unprotected environment. firmware: $(FIRMWARE_DEPS) - . ./setup-env; exec bitbake $(MAKE_TARGET) + . ./setup-env; exec bitbake $(DISTRO)-packages # This rule clobbers the environment (note that ccache uses '$HOME' by # default, so the cache will end up there). diff --git a/openslug/.mtn2git_empty b/openslug/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openslug/conf/.mt-ignore b/openslug/conf/.mt-ignore deleted file mode 100644 index f21e1b217b..0000000000 --- a/openslug/conf/.mt-ignore +++ /dev/null @@ -1 +0,0 @@ -local.conf diff --git a/openslug/conf/.mtn2git_empty b/openslug/conf/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openslug/conf/auto.conf b/openslug/conf/auto.conf deleted file mode 100644 index 7e2a406f79..0000000000 --- a/openslug/conf/auto.conf +++ /dev/null @@ -1,4 +0,0 @@ -# OpenSlug bitbake configuration -DISTRO="openslug" -MACHINE="nslu2" -MAKE_TARGET="openslug-packages" \ No newline at end of file diff --git a/openslug/conf/local.conf.template b/openslug/conf/local.conf.template deleted file mode 100644 index 45fae8f0d7..0000000000 --- a/openslug/conf/local.conf.template +++ /dev/null @@ -1,94 +0,0 @@ -OEROOT = "%%%OEROOT%%%" - -# Use this to specify where OE should place the downloaded sources into -DL_DIR = "${OEROOT}/downloads" - -# BBFILES defines the list of .bb files to consider when looking for a -# way to build a package. This gets overridden in the openslug and -# unslung .conf files. PKGDIR defines where to find the 'packages' -# directory containing the package sub-directories. -PKGDIR := "${OEROOT}/openembedded" -BBFILES := "${PKGDIR}/packages/*/*.bb" - -# Use the OEMASK below to instruct OE to _NOT_ consider some .oe files -# This is a regulary expression, so be sure to get your parenthesis balanced. -OEMASK = "" - -# Uncomment this if you want to use a prebuilt toolchain. You will need to -# provide packages for toolchain and additional libraries yourself. You also -# have to set PATH in your environment to make sure OE finds additional binaries. -# Note: You will definitely need to say: -# ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" -# to build any of two Linux 2.4 Embedix kernels, -# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget -# to rename the binaries as instructed in the Wiki. -# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc" - -# Select between multiple alternative providers, if more than one is eligible. -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" - -# Uncomment this to specify where OE should create its temporary files. -# Note that a full build of everything in OE will take GigaBytes of hard -# disk space, so make sure to free enough space. The default TMPDIR is -# /tmp -TMPDIR = ${OEROOT}/tmp - -# Uncomment this to specify a machine to build for. See the conf directory -# for machines currently known to OpenEmbedded. -MACHINE = "nslu2" - -# Uncomment this to select a distribution policy. See the conf directory -# for distributions currently known to OpenEmbedded. -DISTRO = "openslug" - -# Add to this any extra projects (packages) to be built with the image -# (look in openembedded/packages/openslug-packages.bb for a list of -# packages known to build with openslug.) -OPENSLUG_EXTRA_DEPENDS = "" - -# Add to this specific built .ipk package names to add to the image. -# These will be included in the root flash file system stored on the -# NSLU2. Be careful not to fill the file system, OpenSlug will not -# boot if the file system is close to full. -OPENSLUG_EXTRA_RDEPENDS = "" - -# Support for a variety of file systems is built in to the openslug -# image, programs to format disks with these file systems may be -# added or removed. By default ext2. ext3 and reiserfs supported -# is included by the following lines. -# -# These lines add support for formatting ext2 and ext3 file systems -# on a hard disk attached to the NSLU2. ext3 is the standard Linux -# file system. (OPENSLUG_EXT2_PROGS is defined in -# openembedded/conf/distro/openslug.conf) -OPENSLUG_EXTRA_DEPENDS += "e2fsprogs" -OPENSLUG_EXTRA_RDEPENDS += "${OPENSLUG_EXT2_PROGS}" - -# These lines add support for formatting reiserfs file systems on -# a hard disk. -OPENSLUG_EXTRA_DEPENDS += "reiserfsprogs" -OPENSLUG_EXTRA_RDEPENDS += "reiserfsprogs" - -# These lines add a build of the 'upslug' program which may be -# used to download the final image to an NSLU2. The program can -# be found within the tmp/work/upslug-native* directory. -OPENSLUG_EXTRA_DEPENDS += "upslug-native" - -# These lines add support for an X/Y/ZModem package called lrzsz -# (this is of use for people with modified NSLU2 hardware which -# supports a serial port.) -OPENSLUG_EXTRA_DEPENDS += "lrzsz" -OPENSLUG_EXTRA_RDEPENDS += "lrzsz" - - -# Uncomment this to disable the parse cache (not recommended). -CACHE = "${OEROOT}/tmp/cache" - -# Uncomment this if you want OE to emit the log if a build fails. -OEINCLUDELOGS = "yes" - -# INHERIT += "src_distribute_local pkg_distribute" - -# EDIT THIS FILE and then remove the line below before using! diff --git a/ucslugc/.mtn2git_empty b/ucslugc/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ucslugc/conf/.mtn2git_empty b/ucslugc/conf/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ucslugc/conf/auto.conf b/ucslugc/conf/auto.conf deleted file mode 100644 index a70e98fc7b..0000000000 --- a/ucslugc/conf/auto.conf +++ /dev/null @@ -1,4 +0,0 @@ -# UcSlugC bitbake configuration -DISTRO="ucslugc" -MACHINE="nslu2" -MAKE_TARGET="ucslugc-packages" diff --git a/ucslugc/conf/local.conf.sample b/ucslugc/conf/local.conf.sample deleted file mode 100644 index d94379f7ac..0000000000 --- a/ucslugc/conf/local.conf.sample +++ /dev/null @@ -1,49 +0,0 @@ -# Sample local configuration -# -# You do not need a 'local.conf' file, however you may use one to alter -# how the UcSlugC build proceeds and to specify bitbake options. -# -#---------------------------------------------------------------------------------- -# bitbake options -#---------------------------------------------------------------------------------- -# -#BBINCLUDELOGS = "yes" -# bitbake logs build progress to per-package log files. By default if an -# error occurs bitbake outputs the name of this file with an error message. -# If you set BBINCLUDELOGS to 'yes' then bitbake will also output the log -# file itself. -# -#BBMASK = "regular expression" -# bitbake examines all the .bb files listed in the BBFILES variable. BBMASK -# can be used to exclude some (or, indeed, all) of these files by matching -# against a regular expression. Typically you do not want to do this because -# bitbake freeze can be used to generate a minimal list for BBFILES. -# -#NOTE: you may prefer to make a global local.conf file in common/conf to specify -# these options, however if you do this it will be overridden (ignored) if you also -# specify a local.conf here. -# -#---------------------------------------------------------------------------------- -# UcSlugC options -#---------------------------------------------------------------------------------- -#FEED_URIS = "##" -# Define local feeds - should be replaced by a name which identifies -# your local feed (not a generic name!) and should be the location of -# the Packages.gz file (and, therefore, all the ipks). This is not required; -# the feed defaults to the internet one. -# -#UCLIBC_EXTRA_DEPENDS = "packages to add to the build" -# Any packages in this list will be built as depenencies of the firmware -# image, but they will not be included in the image (see below). -# -#UCLIBC_EXTRA_RDEPENDS = "packages to add to the firmware image" -# Any packages in this list will be added to the firmware image. Please do -# not distribute such images - make a new DISTRO.conf file following the -# instructions in conf/distro/ucslugc.conf -# -#UCLIBC_EXTRA_BBFILES = "paths of extra .bb files" -# Files in this list will be parsed by bitbake to find packages in addition -# to the default list of bb files in conf/distro/ucslugc-packages.conf. The -# setting of this variable is irrelevant after bb freeze has been built or if -# bb unfreeze is built (in the latter case bitbake will examine all of the -# openembedded packages). diff --git a/unslung/.mtn2git_empty b/unslung/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/unslung/conf/.mtn2git_empty b/unslung/conf/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/unslung/conf/auto.conf b/unslung/conf/auto.conf deleted file mode 100644 index 7ec443ca0b..0000000000 --- a/unslung/conf/auto.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Unslung bitbake configuration -DISTRO="unslung" -MACHINE="nslu2" -MAKE_TARGET="unslung-packages" \ No newline at end of file diff --git a/unslung/conf/local.conf.template b/unslung/conf/local.conf.template deleted file mode 100644 index db24fdf849..0000000000 --- a/unslung/conf/local.conf.template +++ /dev/null @@ -1,57 +0,0 @@ -OEROOT = "%%%OEROOT%%%" - -# Use this to specify where OE should place the downloaded sources into -DL_DIR = "${OEROOT}/downloads" - -# BBFILES defines the list of .bb files to consider when looking for a -# way to build a package. This gets overridden in the openslug and -# unslung .conf files. PKGDIR defines where to find the 'packages' -# directory containing the package sub-directories. -PKGDIR := "${OEROOT}/openembedded" -BBFILES := "${PKGDIR}/packages/*/*.bb" - -# Use the OEMASK below to instruct OE to _NOT_ consider some .oe files -# This is a regulary expression, so be sure to get your parenthesis balanced. -OEMASK = "" - -# Uncomment this if you want to use a prebuilt toolchain. You will need to -# provide packages for toolchain and additional libraries yourself. You also -# have to set PATH in your environment to make sure OE finds additional binaries. -# Note: You will definitely need to say: -# ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" -# to build any of two Linux 2.4 Embedix kernels, -# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget -# to rename the binaries as instructed in the Wiki. -# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc" - -# Select between multiple alternative providers, if more than one is eligible. -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" - -# Uncomment this to specify where OE should create its temporary files. -# Note that a full build of everything in OE will take GigaBytes of hard -# disk space, so make sure to free enough space. The default TMPDIR is -# /tmp -TMPDIR = ${OEROOT}/tmp - -# Uncomment this to specify a machine to build for. See the conf directory -# for machines currently known to OpenEmbedded. -MACHINE = "nslu2" - -# Uncomment this to select a distribution policy. See the conf directory -# for distributions currently known to OpenEmbedded. -DISTRO = "unslung" - -OPENSLUG_EXTRA_DEPENDS = "" -OPENSLUG_EXTRA_RDEPENDS = "" - -# Uncomment this to disable the parse cache (not recommended). -CACHE = "${OEROOT}/tmp/cache" - -# Uncomment this if you want OE to emit the log if a build fails. -OEINCLUDELOGS = "yes" - -# INHERIT += "src_distribute_local pkg_distribute" - -# EDIT THIS FILE and then remove the line below before using! -- cgit v1.2.3 From c515e12bd98b5dd5868af100f917def8fbc2514b Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 1 Aug 2005 00:06:40 +0000 Subject: Added native compilation setup capability --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9c50396e34..4f541e002b 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,12 @@ SVN_USER ?= ${USER} CVS_USER ?= ${USER} SVN_SSH ?= "-l ${SVN_USER}" +HOST_MACHINE:=$(shell uname -m | sed \ + -e 's/i[3-9]86/i386/' \ + -e 's/armv5teb/armeb/' \ + -e 's/armv5b/armeb/' \ + ) + .PHONY: all all: update build @@ -97,7 +103,11 @@ setup-unslung setup-openslug setup-ucslugc: setup-%: MT/.configured [ -e $*/conf/site.conf ] || ( cd $*/conf ; ln -s ../../common/conf/site.conf . ) [ ! -f $*/conf/auto.conf ] || ( cd $*/conf ; rm -f auto.conf ) [ -e $*/conf/auto.conf ] || ( \ - echo "DISTRO=\"$*\"" > $*/conf/auto.conf ; \ + if [ "${HOST_MACHINE}" = "armeb" ] ; then \ + echo "DISTRO=\"$*-native\"" > $*/conf/auto.conf ; \ + else \ + echo "DISTRO=\"$*\"" > $*/conf/auto.conf ; \ + fi ; \ echo "MACHINE=\"nslu2\"" >> $*/conf/auto.conf \ ) rm -rf $*/tmp/cache -- cgit v1.2.3 From aeb8715da4be5c1d40f54be366316e66394f0692 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 1 Aug 2005 09:09:34 +0000 Subject: Fixed autobuild target --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 4f541e002b..785a0acc26 100644 --- a/Makefile +++ b/Makefile @@ -324,13 +324,13 @@ push-openembedded: update-openembedded .PHONY: autobuild autobuild: ( set errors=0 ; \ - ${MAKE} update || errors++; \ - ${MAKE} build-openslug upload-openslug-cross || errors++ ; \ - ${MAKE} build-ucslugc upload-ucslugc-cross || errors++; \ - ${MAKE} build-unslung upload-unslung-modules || errors++ ; \ - ${MAKE} build-optware-nslu2 upload-optware-nslu2-cross || errors++; \ - ${MAKE} build-optware-wl500g upload-optware-wl500g-cross || errors++; \ - ${MAKE} upload-sources || errors++ ; \ + ${MAKE} update || $$errors++; \ + ${MAKE} build-openslug upload-openslug-cross || $$errors++ ; \ + ${MAKE} build-ucslugc upload-ucslugc-cross || $$errors++; \ + ${MAKE} build-unslung upload-unslung-modules || $$errors++ ; \ + ${MAKE} build-optware-nslu2 upload-optware-nslu2-cross || $$errors++; \ + ${MAKE} build-optware-wl500g upload-optware-wl500g-cross || $$errors++; \ + ${MAKE} upload-sources || $$errors++ ; \ if [ "$$errors" != "0" ] ; then \ echo "*** Errors during autobuild: $$errors ***" ; \ fi \ -- cgit v1.2.3 From 5a716813245202993b3567d052cd4e931704c1bb Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 4 Aug 2005 00:47:50 +0000 Subject: Stopped the setup target removing an existing intended local.conf --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9c50396e34..9ea45aaf7c 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ setup-unslung setup-openslug setup-ucslugc: setup-%: MT/.configured [ -e $*/bitbake ] || ( cd $* ; ln -s ../bitbake . ) [ -e $*/openembedded ] || ( cd $* ; ln -s ../openembedded . ) [ -d $*/conf ] || ( mkdir -p $*/conf ) - [ ! -f $*/conf/local.conf ] || ( cd $*/conf ; mv local.conf local.conf.delete-me ) + [ ! -f $*/conf/local.conf -o -e $*/conf/auto.conf ] || ( cd $*/conf ; mv local.conf local.conf.delete-me ) [ -e $*/conf/local.conf.sample ] || ( cd $*/conf ; ln -s ../../common/conf/local.conf.sample . ) [ -e $*/conf/site.conf ] || ( cd $*/conf ; ln -s ../../common/conf/site.conf . ) [ ! -f $*/conf/auto.conf ] || ( cd $*/conf ; rm -f auto.conf ) -- cgit v1.2.3 From 991f815eae288dc7558e87e24e2b3f8491aac501 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 1 Aug 2005 17:15:34 +0000 Subject: Fixed the error check in autobuid --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 23acb086ca..34fd9506d4 100644 --- a/Makefile +++ b/Makefile @@ -331,7 +331,7 @@ autobuild: ${MAKE} build-optware-nslu2 upload-optware-nslu2-cross || $$errors++; \ ${MAKE} build-optware-wl500g upload-optware-wl500g-cross || $$errors++; \ ${MAKE} upload-sources || $$errors++ ; \ - if [ "$$errors" != "0" ] ; then \ + if [ $$errors ne 0 ] ; then \ echo "*** Errors during autobuild: $$errors ***" ; \ fi \ ) -- cgit v1.2.3 From d338b271e719e5b790958761742a890183805980 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 2 Aug 2005 06:47:53 +0000 Subject: Changed to new ipkg source location for uploads --- Makefile | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 34fd9506d4..c959bd1b61 100644 --- a/Makefile +++ b/Makefile @@ -342,28 +342,28 @@ upload: upload-openslug-cross upload-ucslugc-cross upload-unslung-modules upload .PHONY: upload-openslug-cross upload-openslug-cross: openslug/.configured rm -rf openslug/tmp/deploy/ipk/morgue - rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ + rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable - rsync -vl openslug/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ - rsync -vlrt --delete openslug/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/unstable/ + rsync -vl openslug/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ + rsync -vlrt --delete openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable .PHONY: upload-openslug-2.3-beta-cross upload-openslug-2.3-beta-cross: releases/OpenSlug-2.3-beta/.configured rm -rf releases/OpenSlug-2.3-beta/tmp/deploy/ipk/morgue - rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ + rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta - rsync -vl releases/OpenSlug-2.3-beta/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ - rsync -vlrt --delete releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/openslug/cross/2.3-beta/ + rsync -vl releases/OpenSlug-2.3-beta/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ + rsync -vlrt --delete releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta .PHONY: upload-ucslugc-cross upload-ucslugc-cross: ucslugc/.configured rm -rf ucslugc/tmp/deploy/ipk/morgue - rsync -vlrt --exclude='Packages*' ucslugc/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/ucslugc/cross/unstable/ + rsync -vlrt --exclude='Packages*' ucslugc/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross/unstable - rsync -vl ucslugc/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/ucslugc/cross/unstable/ - rsync -vlrt --delete ucslugc/tmp/deploy/ipk/ unslung@ipkg.nslu2-linux.org:nslu/feeds/ucslugc/cross/unstable/ + rsync -vl ucslugc/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ + rsync -vlrt --delete ucslugc/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross/unstable .PHONY: upload-unslung-modules @@ -373,26 +373,26 @@ upload-unslung-modules: unslung/.configured mv unslung/tmp/deploy/ipk/Packages.new unslung/tmp/deploy/ipk/Packages rm -f unslung/tmp/deploy/ipk/Packages.gz gzip -c unslung/tmp/deploy/ipk/Packages > unslung/tmp/deploy/ipk/Packages.gz - rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ + rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/oe - rsync -vl unslung/tmp/deploy/ipk/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ + rsync -vl unslung/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/oe -# rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/oe/ +# rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ .PHONY: upload-optware-nslu2-cross upload-optware-nslu2-cross: optware/nslu2/.configured - rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ + rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross - rsync -vl optware/nslu2/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ - rsync -vlrt --delete optware/nslu2/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/cross/ + rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ + rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/cross .PHONY: upload-optware-wl500g-cross upload-optware-wl500g-cross: optware/wl500g/.configured - rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ + rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g - rsync -vl optware/wl500g/packages/Packages* unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ - rsync -vlrt --delete optware/wl500g/packages/ unslung@ipkg.nslu2-linux.org:nslu/feeds/unslung/wl500g/ + rsync -vl optware/wl500g/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ + rsync -vlrt --delete optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/wl500g .PHONY: upload-sources -- cgit v1.2.3 From d9615965b21c283888f107603e85762eba2f13c6 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 09:07:01 +0000 Subject: Add setup-host-gentoo target --- Makefile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Makefile b/Makefile index c959bd1b61..6be9152e18 100644 --- a/Makefile +++ b/Makefile @@ -208,6 +208,27 @@ setup-host-debian: texinfo \ unzip +.PHONY: setup-host-gentoo +setup-host-gentoo: + sudo emerge \ + autoconf automake \ + bison \ + ccache \ + cvs \ + flex \ + gawk gettext \ + glib \ + libtool \ + m4 \ + make \ + patch \ + pkgconfig \ + sed \ + sys-apps/texinfo \ + unzip \ + psyco \ + svn + .PHONY: update-master update-master: MT/.configured monotone pull -- cgit v1.2.3 From 3342ab0abfe5bf660b342b82b24f6f627f04ecf1 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 09:18:56 +0000 Subject: Switch to su instead of sudo on Gentoo, correct svn -> subversion --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6be9152e18..a53bd3c540 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ setup-host-debian: .PHONY: setup-host-gentoo setup-host-gentoo: - sudo emerge \ + su - -c "emerge \ autoconf automake \ bison \ ccache \ @@ -227,7 +227,7 @@ setup-host-gentoo: sys-apps/texinfo \ unzip \ psyco \ - svn + subversion" .PHONY: update-master update-master: MT/.configured -- cgit v1.2.3 From 7abc501c97d3e3d855510e7804d3e11563d1dbb8 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 09:22:20 +0000 Subject: Make setup-host-gentoo skip already installed packages. emerge is slow enough already ;-) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a53bd3c540..6b7b586bb3 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ setup-host-debian: .PHONY: setup-host-gentoo setup-host-gentoo: - su - -c "emerge \ + su - -c "emerge -n \ autoconf automake \ bison \ ccache \ -- cgit v1.2.3 From 3a2f5494a6dbef3b4938a0320c22baa4c23f80f1 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 09:50:31 +0000 Subject: Add monotone and boost in package.keywords if they're not there already --- Makefile | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 6b7b586bb3..4a86847119 100644 --- a/Makefile +++ b/Makefile @@ -210,24 +210,29 @@ setup-host-debian: .PHONY: setup-host-gentoo setup-host-gentoo: - su - -c "emerge -n \ - autoconf automake \ - bison \ - ccache \ - cvs \ - flex \ - gawk gettext \ - glib \ - libtool \ - m4 \ - make \ - patch \ - pkgconfig \ - sed \ - sys-apps/texinfo \ - unzip \ - psyco \ - subversion" + su - -c "mkdir -p /etc/portage ; echo >> /etc/portage/package.keywords \ + ; grep monotone /etc/portage/package.keywords || \ + echo =dev-util/monotone-0.21 ~x86 >> /etc/portage/package.keywords ; \ + grep dev-libs/boost /etc/portage/package.keywords || \ + echo \>=dev-libs/boost-1.32 ~x86 >> /etc/portage/package.keywords ; \ + emerge -n \ + autoconf automake \ + bison \ + ccache \ + cvs \ + flex \ + glib \ + libtool \ + m4 \ + make \ + monotone \ + patch \ + pkgconfig \ + sed \ + sys-apps/texinfo \ + unzip \ + psyco \ + subversion" .PHONY: update-master update-master: MT/.configured -- cgit v1.2.3 From e3ab2222076c181d063fcbe9d33becddaabea21e Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 09:55:53 +0000 Subject: Change ~x86 to ~*, so that it'll work on other ARCHs --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4a86847119..7f64261bec 100644 --- a/Makefile +++ b/Makefile @@ -212,9 +212,9 @@ setup-host-debian: setup-host-gentoo: su - -c "mkdir -p /etc/portage ; echo >> /etc/portage/package.keywords \ ; grep monotone /etc/portage/package.keywords || \ - echo =dev-util/monotone-0.21 ~x86 >> /etc/portage/package.keywords ; \ + echo =dev-util/monotone-0.21 ~* >> /etc/portage/package.keywords ; \ grep dev-libs/boost /etc/portage/package.keywords || \ - echo \>=dev-libs/boost-1.32 ~x86 >> /etc/portage/package.keywords ; \ + echo \>=dev-libs/boost-1.32 ~* >> /etc/portage/package.keywords ; \ emerge -n \ autoconf automake \ bison \ -- cgit v1.2.3 From 41f52b2c060409081a04cdcce5f49fb2ec7a5f02 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 10:51:47 +0000 Subject: Remove erroneous whitespace --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7f64261bec..a9769ad3bd 100644 --- a/Makefile +++ b/Makefile @@ -220,7 +220,7 @@ setup-host-gentoo: bison \ ccache \ cvs \ - flex \ + flex \ glib \ libtool \ m4 \ -- cgit v1.2.3 From 7b60a8b7d3b6cd2146d03aa6a451f87aca17948e Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 11:55:24 +0000 Subject: Added SSH_KEY variable, fixed gentoo package masking --- Makefile | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index a9769ad3bd..81a4b91c39 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ SVN_USER ?= ${USER} CVS_USER ?= ${USER} SVN_SSH ?= "-l ${SVN_USER}" +SSH_KEY ?= "~/.ssh/id_dsa" # Default. Change if you have several keys you use on a regular basis HOST_MACHINE:=$(shell uname -m | sed \ -e 's/i[3-9]86/i386/' \ @@ -210,11 +211,11 @@ setup-host-debian: .PHONY: setup-host-gentoo setup-host-gentoo: - su - -c "mkdir -p /etc/portage ; echo >> /etc/portage/package.keywords \ + su - -c "mkdir -p /etc/portage ; echo >> /etc/portage/package.keywords \ ; grep monotone /etc/portage/package.keywords || \ - echo =dev-util/monotone-0.21 ~* >> /etc/portage/package.keywords ; \ + echo ~dev-util/monotone-0.21 ~* >> /etc/portage/package.keywords ; \ grep dev-libs/boost /etc/portage/package.keywords || \ - echo \>=dev-libs/boost-1.32 ~* >> /etc/portage/package.keywords ; \ + echo ~dev-libs/boost-1.32 ~* >> /etc/portage/package.keywords ; \ emerge -n \ autoconf automake \ bison \ @@ -335,7 +336,7 @@ push: push-master push-bitbake push-openembedded .PHONY: push-master push-master: update-master monotone push - scp Makefile slug@nugabe.nslu2-linux.org:htdocs/www/Makefile + scp -i $SSH_KEY Makefile slug@nugabe.nslu2-linux.org:htdocs/www/Makefile .PHONY: push-bitbake push-bitbake: update-bitbake @@ -369,28 +370,28 @@ upload: upload-openslug-cross upload-ucslugc-cross upload-unslung-modules upload upload-openslug-cross: openslug/.configured rm -rf openslug/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable rsync -vl openslug/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ rsync -vlrt --delete openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable .PHONY: upload-openslug-2.3-beta-cross upload-openslug-2.3-beta-cross: releases/OpenSlug-2.3-beta/.configured rm -rf releases/OpenSlug-2.3-beta/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta rsync -vl releases/OpenSlug-2.3-beta/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ rsync -vlrt --delete releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta .PHONY: upload-ucslugc-cross upload-ucslugc-cross: ucslugc/.configured rm -rf ucslugc/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' ucslugc/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross/unstable + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross/unstable rsync -vl ucslugc/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ rsync -vlrt --delete ucslugc/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross/unstable + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross/unstable .PHONY: upload-unslung-modules upload-unslung-modules: unslung/.configured @@ -400,26 +401,26 @@ upload-unslung-modules: unslung/.configured rm -f unslung/tmp/deploy/ipk/Packages.gz gzip -c unslung/tmp/deploy/ipk/Packages > unslung/tmp/deploy/ipk/Packages.gz rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/oe + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/oe rsync -vl unslung/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/oe + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/oe # rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ .PHONY: upload-optware-nslu2-cross upload-optware-nslu2-cross: optware/nslu2/.configured rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/cross + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/cross .PHONY: upload-optware-wl500g-cross upload-optware-wl500g-cross: optware/wl500g/.configured rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g rsync -vl optware/wl500g/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ rsync -vlrt --delete optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/wl500g + ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/wl500g .PHONY: upload-sources upload-sources: -- cgit v1.2.3 From c531cf53bf1b81581e035b3f84583210b63b50d4 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 12:04:33 +0000 Subject: Add nice curlybrackets around those SSH_KEY variables of mine --- Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 81a4b91c39..5d2551391f 100644 --- a/Makefile +++ b/Makefile @@ -336,7 +336,7 @@ push: push-master push-bitbake push-openembedded .PHONY: push-master push-master: update-master monotone push - scp -i $SSH_KEY Makefile slug@nugabe.nslu2-linux.org:htdocs/www/Makefile + scp -i ${SSH_KEY} Makefile slug@nugabe.nslu2-linux.org:htdocs/www/Makefile .PHONY: push-bitbake push-bitbake: update-bitbake @@ -370,28 +370,28 @@ upload: upload-openslug-cross upload-ucslugc-cross upload-unslung-modules upload upload-openslug-cross: openslug/.configured rm -rf openslug/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable rsync -vl openslug/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ rsync -vlrt --delete openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable .PHONY: upload-openslug-2.3-beta-cross upload-openslug-2.3-beta-cross: releases/OpenSlug-2.3-beta/.configured rm -rf releases/OpenSlug-2.3-beta/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta rsync -vl releases/OpenSlug-2.3-beta/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ rsync -vlrt --delete releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta .PHONY: upload-ucslugc-cross upload-ucslugc-cross: ucslugc/.configured rm -rf ucslugc/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' ucslugc/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross/unstable + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross/unstable rsync -vl ucslugc/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ rsync -vlrt --delete ucslugc/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross/unstable + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross/unstable .PHONY: upload-unslung-modules upload-unslung-modules: unslung/.configured @@ -401,26 +401,26 @@ upload-unslung-modules: unslung/.configured rm -f unslung/tmp/deploy/ipk/Packages.gz gzip -c unslung/tmp/deploy/ipk/Packages > unslung/tmp/deploy/ipk/Packages.gz rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/oe + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/oe rsync -vl unslung/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/oe + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/oe # rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ .PHONY: upload-optware-nslu2-cross upload-optware-nslu2-cross: optware/nslu2/.configured rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/cross + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/cross .PHONY: upload-optware-wl500g-cross upload-optware-wl500g-cross: optware/wl500g/.configured rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g rsync -vl optware/wl500g/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ rsync -vlrt --delete optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ - ssh -i $SSH_KEY nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/wl500g + ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/wl500g .PHONY: upload-sources upload-sources: -- cgit v1.2.3 From edaff2fb8298285c54837b508708beb3e8e632de Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 12:07:07 +0000 Subject: Ugh, unquote the contents of SSH_KEY variable so it's not looking for ~/.ssh/id_dsa in the current dir --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5d2551391f..e51509494e 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SVN_USER ?= ${USER} CVS_USER ?= ${USER} SVN_SSH ?= "-l ${SVN_USER}" -SSH_KEY ?= "~/.ssh/id_dsa" # Default. Change if you have several keys you use on a regular basis +SSH_KEY ?= ~/.ssh/id_dsa # Default. Change if you have several keys you use on a regular basis HOST_MACHINE:=$(shell uname -m | sed \ -e 's/i[3-9]86/i386/' \ -- cgit v1.2.3 From 04c29c8112a8bf7049c3347c54a9d1a20bb80636 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 12:17:42 +0000 Subject: Create a separate openslug-2.3-beta convenience target that does all my work --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e51509494e..9e023faa11 100644 --- a/Makefile +++ b/Makefile @@ -58,8 +58,11 @@ optware-nslu2 build-optware-nslu2: optware/nslu2/.configured optware-wl500g build-optware-wl500g: optware/wl500g/.configured ( cd optware/wl500g ; ${MAKE} autoclean ; ${MAKE} ) -.PHONY: openslug-2.3-beta build-openslug-2.3-beta -openslug-2.3-beta build-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured +.PHONY: openslug-2.3-beta +openslug-2.3-beta: update-openslug-2.3-beta build-openslug-2.3-beta upload-openslug-2.3-beta + +.PHONY: build-openslug-2.3-beta +build-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured ( cd releases/OpenSlug-2.3-beta ; ${MAKE} openslug-firmware ) .PHONY: setup-master -- cgit v1.2.3 From d541d60e7b546efdd553bf52fbcb262bd69e75b3 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 12:40:49 +0000 Subject: Move a ; from the beginning of a line --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9e023faa11..0241ee4ab5 100644 --- a/Makefile +++ b/Makefile @@ -214,8 +214,8 @@ setup-host-debian: .PHONY: setup-host-gentoo setup-host-gentoo: - su - -c "mkdir -p /etc/portage ; echo >> /etc/portage/package.keywords \ - ; grep monotone /etc/portage/package.keywords || \ + su - -c "mkdir -p /etc/portage ; echo >> /etc/portage/package.keywords ; \ + grep monotone /etc/portage/package.keywords || \ echo ~dev-util/monotone-0.21 ~* >> /etc/portage/package.keywords ; \ grep dev-libs/boost /etc/portage/package.keywords || \ echo ~dev-libs/boost-1.32 ~* >> /etc/portage/package.keywords ; \ -- cgit v1.2.3 From 39cc910f7ee0afb6339484b266fea62d91d6f9e9 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 3 Aug 2005 09:35:18 +0000 Subject: Removed the SSH_USER stuff --- Makefile | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 0241ee4ab5..e5b62511ff 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,6 @@ SVN_USER ?= ${USER} CVS_USER ?= ${USER} SVN_SSH ?= "-l ${SVN_USER}" -SSH_KEY ?= ~/.ssh/id_dsa # Default. Change if you have several keys you use on a regular basis HOST_MACHINE:=$(shell uname -m | sed \ -e 's/i[3-9]86/i386/' \ @@ -229,7 +228,7 @@ setup-host-gentoo: libtool \ m4 \ make \ - monotone \ + monotone \ patch \ pkgconfig \ sed \ @@ -339,7 +338,7 @@ push: push-master push-bitbake push-openembedded .PHONY: push-master push-master: update-master monotone push - scp -i ${SSH_KEY} Makefile slug@nugabe.nslu2-linux.org:htdocs/www/Makefile + scp Makefile slug@nugabe.nslu2-linux.org:htdocs/www/Makefile .PHONY: push-bitbake push-bitbake: update-bitbake @@ -353,16 +352,18 @@ push-openembedded: update-openembedded .PHONY: autobuild autobuild: - ( set errors=0 ; \ - ${MAKE} update || $$errors++; \ - ${MAKE} build-openslug upload-openslug-cross || $$errors++ ; \ - ${MAKE} build-ucslugc upload-ucslugc-cross || $$errors++; \ - ${MAKE} build-unslung upload-unslung-modules || $$errors++ ; \ - ${MAKE} build-optware-nslu2 upload-optware-nslu2-cross || $$errors++; \ - ${MAKE} build-optware-wl500g upload-optware-wl500g-cross || $$errors++; \ - ${MAKE} upload-sources || $$errors++ ; \ - if [ $$errors ne 0 ] ; then \ - echo "*** Errors during autobuild: $$errors ***" ; \ + ( rm -rf builderrors.log ; \ + ${MAKE} update || echo -n " update" >> builderrors.log ; \ + ${MAKE} build-openslug upload-openslug-cross || echo -n " openslug" >> builderrors.log ; \ + ${MAKE} build-ucslugc upload-ucslugc-cross || echo -n " ucslugc" >> builderrors.log ; \ + ${MAKE} build-unslung upload-unslung-modules || echo -n " unslung" >> builderrors.log ; \ + ${MAKE} build-optware-nslu2 upload-optware-nslu2-cross || echo -n " optware/nslu2" >> builderrors.log ; \ + ${MAKE} build-optware-wl500g upload-optware-wl500g-cross || echo -n " optware/wl500g" >> builderrors.log ; \ + ${MAKE} upload-sources || echo -n " upload-sources" >> builderrors.log ; \ + if [ -e builderrors.log ] ; then \ + echo -n "*** Errors during autobuild:" ; \ + cat builderrors.log ; \ + echo " ***" ; \ fi \ ) @@ -373,28 +374,28 @@ upload: upload-openslug-cross upload-ucslugc-cross upload-unslung-modules upload upload-openslug-cross: openslug/.configured rm -rf openslug/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable rsync -vl openslug/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ rsync -vlrt --delete openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable .PHONY: upload-openslug-2.3-beta-cross upload-openslug-2.3-beta-cross: releases/OpenSlug-2.3-beta/.configured rm -rf releases/OpenSlug-2.3-beta/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta rsync -vl releases/OpenSlug-2.3-beta/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ rsync -vlrt --delete releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta .PHONY: upload-ucslugc-cross upload-ucslugc-cross: ucslugc/.configured rm -rf ucslugc/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' ucslugc/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross/unstable + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross/unstable rsync -vl ucslugc/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ rsync -vlrt --delete ucslugc/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross/unstable + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross/unstable .PHONY: upload-unslung-modules upload-unslung-modules: unslung/.configured @@ -404,26 +405,26 @@ upload-unslung-modules: unslung/.configured rm -f unslung/tmp/deploy/ipk/Packages.gz gzip -c unslung/tmp/deploy/ipk/Packages > unslung/tmp/deploy/ipk/Packages.gz rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/oe + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/oe rsync -vl unslung/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/oe + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/oe # rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ .PHONY: upload-optware-nslu2-cross upload-optware-nslu2-cross: optware/nslu2/.configured rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/cross + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/cross .PHONY: upload-optware-wl500g-cross upload-optware-wl500g-cross: optware/wl500g/.configured rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g rsync -vl optware/wl500g/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ rsync -vlrt --delete optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ - ssh -i ${SSH_KEY} nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/wl500g + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/wl500g .PHONY: upload-sources upload-sources: -- cgit v1.2.3 From 6b567b077256fb9a595418e03c0492c22608f26a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 5 Aug 2005 12:52:02 +0000 Subject: Fix typo in openslug-2.3-beta target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e5b62511ff..740648770a 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ optware-wl500g build-optware-wl500g: optware/wl500g/.configured ( cd optware/wl500g ; ${MAKE} autoclean ; ${MAKE} ) .PHONY: openslug-2.3-beta -openslug-2.3-beta: update-openslug-2.3-beta build-openslug-2.3-beta upload-openslug-2.3-beta +openslug-2.3-beta: update-openslug-2.3-beta build-openslug-2.3-beta upload-openslug-2.3-beta-cross .PHONY: build-openslug-2.3-beta build-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured -- cgit v1.2.3 From adb956dde2b84c9f0d83543f17421b6d713e1323 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 3 Aug 2005 19:21:08 +0000 Subject: Renamed existing clobber targets to distclean, and added new clobber targets --- Makefile | 62 ++++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 740648770a..3f7321b8c1 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,11 @@ update: update-master update-bitbake update-openembedded update-optware status: status-master status-bitbake status-openembedded status-optware .PHONY: clobber -clobber: clobber-master clobber-bitbake clobber-openembedded \ - clobber-unslung clobber-openslug clobber-ucslugc clobber-optware clobber-releases +clobber: clobber-unslung clobber-openslug clobber-ucslugc clobber-optware + +.PHONY: distclean +distclean: distclean-master distclean-bitbake distclean-openembedded \ + distclean-unslung distclean-openslug distclean-ucslugc distclean-optware distclean-releases .PHONY: unslung build-unslung unslung build-unslung: unslung/.configured bitbake/.configured openembedded/.configured @@ -298,36 +301,59 @@ status-optware: optware/.configured status-openslug-2.3-beta: ( cd releases/OpenSlug-2.3-beta ; svn status ) -.PHONY: clobber-master -clobber-master: +.PHONY: clobber-unslung +clobber-unslung: + [ ! -e unslung/Makefile ] || ( cd unslung ; ${MAKE} clobber ) + +.PHONY: clobber-openslug +clobber-openslug: + [ ! -e openslug/Makefile ] || ( cd openslug ; ${MAKE} clobber ) + +.PHONY: clobber-ucslugc +clobber-ucslugc: + [ ! -e ucslugc/Makefile ] || ( cd ucslugc ; ${MAKE} clobber ) + +.PHONY: clobber-optware +clobber-optware: clobber-optware-nslu2 clobber-optware-wl500g + +.PHONY: clobber-optware-nslu2 +clobber-optware-nslu2: + [ ! -e optware/nslu2/Makefile ] || ( cd optware/nslu2 ; ${MAKE} distclean ) + +.PHONY: clobber-optware-wl500g +clobber-optware-wl500g: + [ ! -e optware/wl500g/Makefile ] || ( cd optware/wl500g ; ${MAKE} distclean ) + +.PHONY: distclean-master +distclean-master: rm -rf MT common downloads openslug scripts ucslugc unslung -.PHONY: clobber-bitbake -clobber-bitbake: +.PHONY: distclean-bitbake +distclean-bitbake: rm -rf bitbake -.PHONY: clobber-openembedded -clobber-openembedded: +.PHONY: distclean-openembedded +distclean-openembedded: rm -rf openembedded -.PHONY: clobber-unslung -clobber-unslung: +.PHONY: distclean-unslung +distclean-unslung: rm -rf unslung -.PHONY: clobber-openslug -clobber-openslug: +.PHONY: distclean-openslug +distclean-openslug: rm -rf openslug -.PHONY: clobber-ucslugc -clobber-ucslugc: +.PHONY: distclean-ucslugc +distclean-ucslugc: rm -rf ucslugc -.PHONY: clobber-optware -clobber-optware: +.PHONY: distclean-optware +distclean-optware: rm -rf optware -.PHONY: clobber-releases -clobber-releases: +.PHONY: distclean-releases +distclean-releases: rm -rf releases # Targets for use by those with write access to the repositories -- cgit v1.2.3 From 37b24fe2099e67df079a15ed252731bb2659c1c7 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 4 Aug 2005 01:43:43 +0000 Subject: Made the branches explicit in the initial monotone setup step. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3f7321b8c1..6ed682c7df 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ setup-master MT/.configured: gunzip monotone/nslu2-linux.db.gz ) - ( monotone -d monotone/nslu2-linux.db unset database default-server ) - ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) - ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) + ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.{nslu2-linux.*,openembedded.{dev,dreambox,nslu2-linux}} ) [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) touch MT/.configured -- cgit v1.2.3 From e848c22d519cf1e43594eb91ededde8fb84cc551 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 4 Aug 2005 10:31:28 +0000 Subject: Inserted conditional clauses for native compilation. --- Makefile | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 116 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 6ed682c7df..7165d32137 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,12 @@ HOST_MACHINE:=$(shell uname -m | sed \ -e 's/armv5b/armeb/' \ ) +HOST_FIRMWARE:=$(shell uname -m | sed \ + -e 's/i[3-9]86/Linux/' \ + -e 's/armv5teb/OpenSlug/' \ + -e 's/armv5b/Unslung/' \ + ) + .PHONY: all all: update build @@ -19,13 +25,29 @@ all: update build build: build-unslung build-openslug build-ucslugc build-optware .PHONY: setup +ifneq ($(HOST_MACHINE),armeb) setup: setup-master setup-bitbake setup-openembedded setup-unslung setup-openslug setup-ucslugc setup-optware +else +ifeq ($(HOST_FIRMWARE),OpenSlug) +setup: setup-master setup-bitbake setup-openembedded setup-openslug +else +setup: setup-master setup-optware +endif +endif .PHONY: setup-developer setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-developer .PHONY: update +ifneq ($(HOST_MACHINE),armeb) update: update-master update-bitbake update-openembedded update-optware +else +ifeq ($(HOST_FIRMWARE),OpenSlug) +update: update-master update-bitbake update-openembedded +else +update: update-master update-optware +endif +endif .PHONY: status status: status-master status-bitbake status-openembedded status-optware @@ -38,30 +60,60 @@ distclean: distclean-master distclean-bitbake distclean-openembedded \ distclean-unslung distclean-openslug distclean-ucslugc distclean-optware distclean-releases .PHONY: unslung build-unslung +ifneq ($(HOST_MACHINE),armeb) unslung build-unslung: unslung/.configured bitbake/.configured openembedded/.configured ( cd unslung ; ${MAKE} ) +else +unslung build-unslung: +endif .PHONY: openslug build-openslug +ifneq ($(HOST_MACHINE),armeb) +openslug build-openslug: openslug/.configured bitbake/.configured openembedded/.configured + ( cd openslug ; ${MAKE} ) +else +ifeq ($(HOST_FIRMWARE),OpenSlug) openslug build-openslug: openslug/.configured bitbake/.configured openembedded/.configured ( cd openslug ; ${MAKE} ) +else +openslug build-openslug: +endif +endif .PHONY: ucslugc build-ucslugc +ifneq ($(HOST_MACHINE),armeb) ucslugc build-ucslugc: ucslugc/.configured bitbake/.configured openembedded/.configured ( cd ucslugc ; ${MAKE} ) +else +ucslugc build-ucslugc: +endif .PHONY: optware build-optware optware build-optware: build-optware-nslu2 build-optware-wl500g .PHONY: optware-nslu2 build-optware-nslu2 +ifneq ($(HOST_MACHINE),armeb) +optware-nslu2 build-optware-nslu2: optware/nslu2/.configured + ( cd optware/nslu2 ; ${MAKE} autoclean ; ${MAKE} ) +else +ifeq ($(HOST_FIRMWARE),Unslung) optware-nslu2 build-optware-nslu2: optware/nslu2/.configured ( cd optware/nslu2 ; ${MAKE} autoclean ; ${MAKE} ) +else +optware-nslu2 build-optware-nslu2: +endif +endif .PHONY: optware-wl500g build-optware-wl500g +ifneq ($(HOST_MACHINE),armeb) optware-wl500g build-optware-wl500g: optware/wl500g/.configured ( cd optware/wl500g ; ${MAKE} autoclean ; ${MAKE} ) +else +optware-wl500g build-optware-wl500g: +endif .PHONY: openslug-2.3-beta -openslug-2.3-beta: update-openslug-2.3-beta build-openslug-2.3-beta upload-openslug-2.3-beta-cross +openslug-2.3-beta: update-openslug-2.3-beta build-openslug-2.3-beta upload-openslug-2.3-beta .PHONY: build-openslug-2.3-beta build-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured @@ -378,35 +430,66 @@ push-openembedded: update-openembedded .PHONY: autobuild autobuild: - ( rm -rf builderrors.log ; \ - ${MAKE} update || echo -n " update" >> builderrors.log ; \ - ${MAKE} build-openslug upload-openslug-cross || echo -n " openslug" >> builderrors.log ; \ - ${MAKE} build-ucslugc upload-ucslugc-cross || echo -n " ucslugc" >> builderrors.log ; \ - ${MAKE} build-unslung upload-unslung-modules || echo -n " unslung" >> builderrors.log ; \ - ${MAKE} build-optware-nslu2 upload-optware-nslu2-cross || echo -n " optware/nslu2" >> builderrors.log ; \ - ${MAKE} build-optware-wl500g upload-optware-wl500g-cross || echo -n " optware/wl500g" >> builderrors.log ; \ - ${MAKE} upload-sources || echo -n " upload-sources" >> builderrors.log ; \ + rm -rf builderrors.log + - ${MAKE} update || echo -n " update" >> builderrors.log +ifneq ($(HOST_MACHINE),armeb) + - ${MAKE} build-openslug upload-openslug || echo -n " openslug" >> builderrors.log + - ${MAKE} build-ucslugc upload-ucslugc || echo -n " ucslugc" >> builderrors.log + - ${MAKE} build-unslung upload-unslung-modules || echo -n " unslung" >> builderrors.log +else +ifeq ($(HOST_FIRMWARE),OpenSlug) + - ${MAKE} build-openslug upload-openslug || echo -n " openslug" >> builderrors.log +endif +endif +ifneq ($(HOST_MACHINE),armeb) + - ${MAKE} build-optware-nslu2 upload-optware-nslu2 || echo -n " optware/nslu2" >> builderrors.log + - ${MAKE} build-optware-wl500g upload-optware-wl500g || echo -n " optware/wl500g" >> builderrors.log +else +ifeq ($(HOST_FIRMWARE),Unslung) + - ${MAKE} build-optware-nslu2 upload-optware-nslu2 || echo -n " optware/nslu2" >> builderrors.log +endif +endif + - ${MAKE} upload-sources || echo -n " upload-sources" >> builderrors.log if [ -e builderrors.log ] ; then \ echo -n "*** Errors during autobuild:" ; \ cat builderrors.log ; \ echo " ***" ; \ - fi \ - ) + fi .PHONY: upload -upload: upload-openslug-cross upload-ucslugc-cross upload-unslung-modules upload-optware-nslu2-cross upload-optware-wl500g-cross upload-sources - -.PHONY: upload-openslug-cross -upload-openslug-cross: openslug/.configured +ifneq ($(HOST_MACHINE),armeb) +upload: upload-openslug upload-ucslugc upload-unslung-modules upload-optware-nslu2 upload-optware-wl500g upload-sources +else +ifeq ($(HOST_FIRMWARE),OpenSlug) +upload: upload-openslug upload-sources +else +ifeq ($(HOST_FIRMWARE),Unslung) +upload: upload-optware-nslu2 upload-sources +else +upload: upload-sources +endif +endif +endif + +.PHONY: upload-openslug +upload-openslug: openslug/.configured rm -rf openslug/tmp/deploy/ipk/morgue +ifneq ($(HOST_MACHINE),armeb) rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable rsync -vl openslug/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ rsync -vlrt --delete openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable - -.PHONY: upload-openslug-2.3-beta-cross -upload-openslug-2.3-beta-cross: releases/OpenSlug-2.3-beta/.configured +else + rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/native/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/native/unstable + rsync -vl openslug/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/native/unstable/ + rsync -vlrt --delete openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/native/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/native/unstable +endif + +.PHONY: upload-openslug-2.3-beta +upload-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured rm -rf releases/OpenSlug-2.3-beta/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta @@ -414,8 +497,8 @@ upload-openslug-2.3-beta-cross: releases/OpenSlug-2.3-beta/.configured rsync -vlrt --delete releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta -.PHONY: upload-ucslugc-cross -upload-ucslugc-cross: ucslugc/.configured +.PHONY: upload-ucslugc +upload-ucslugc: ucslugc/.configured rm -rf ucslugc/tmp/deploy/ipk/morgue rsync -vlrt --exclude='Packages*' ucslugc/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross/unstable @@ -436,16 +519,24 @@ upload-unslung-modules: unslung/.configured ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/oe # rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ -.PHONY: upload-optware-nslu2-cross -upload-optware-nslu2-cross: optware/nslu2/.configured +.PHONY: upload-optware-nslu2 +upload-optware-nslu2: optware/nslu2/.configured +ifneq ($(HOST_MACHINE),armeb) rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/cross - -.PHONY: upload-optware-wl500g-cross -upload-optware-wl500g-cross: optware/wl500g/.configured +else + rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/native/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/native + rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/native/ + rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/native/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/native +endif + +.PHONY: upload-optware-wl500g +upload-optware-wl500g: optware/wl500g/.configured rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g rsync -vl optware/wl500g/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ -- cgit v1.2.3 From f617cc7ddf8fcb4d95114b7edf10f1a3008cf9e2 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 7 Aug 2005 18:03:40 +0000 Subject: Updated for OpenSlug-2.5-beta --- Makefile | 56 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 7165d32137..37bbc62747 100644 --- a/Makefile +++ b/Makefile @@ -112,13 +112,15 @@ else optware-wl500g build-optware-wl500g: endif -.PHONY: openslug-2.3-beta -openslug-2.3-beta: update-openslug-2.3-beta build-openslug-2.3-beta upload-openslug-2.3-beta +openslug-%-beta: update-openslug-%-beta build-openslug-%-beta upload-openslug-%-beta + echo "$@ completed" -.PHONY: build-openslug-2.3-beta build-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured ( cd releases/OpenSlug-2.3-beta ; ${MAKE} openslug-firmware ) +build-openslug-%-beta: releases/OpenSlug-%-beta/.configured + ( cd releases/OpenSlug-$*-beta ; ${MAKE} firmware ) + .PHONY: setup-master setup-master MT/.configured: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && \ @@ -227,7 +229,6 @@ setup-apex apex/Makefile: setup-apex-developer: cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co apex -.PHONY: setup-openslug-2.3-beta setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/.configured: [ -e releases/OpenSlug-2.3-beta ] || ( \ mkdir -p releases ; \ @@ -239,14 +240,24 @@ setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/.configured: [ -e releases/OpenSlug-2.3-beta/downloads ] || ln -s ../../downloads releases/OpenSlug-2.3-beta/ touch releases/OpenSlug-2.3-beta/.configured -.PHONY: setup-openslug-2.3-beta-developer -setup-openslug-2.3-beta-developer: - [ -e releases/OpenSlug-2.3-beta ] || ( \ +setup-openslug-%-beta releases/OpenSlug-%-beta/.configured: + [ -e releases/OpenSlug-$*-beta ] || ( \ mkdir -p releases ; \ - svn checkout svn+ssh://svn.berlios.de/svnroot/repos/openslug/releases/OpenSlug-2.3-beta \ - releases/OpenSlug-2.3-beta \ + svn checkout svn://svn.berlios.de/openslug/releases/OpenSlug-$*-beta \ + releases/OpenSlug-$*-beta \ + ) + ( cd releases/OpenSlug-$*-beta ; ${MAKE} setup-env ) + [ -e downloads ] || ( mkdir -p downloads ) + [ -e releases/OpenSlug-$*-beta/downloads ] || ln -s ../../downloads releases/OpenSlug-$*-beta/ + touch releases/OpenSlug-$*-beta/.configured + +setup-openslug-%-beta-developer: + [ -e releases/OpenSlug-$*-beta ] || ( \ + mkdir -p releases ; \ + svn checkout svn+ssh://svn.berlios.de/svnroot/repos/openslug/releases/OpenSlug-$*-beta \ + releases/OpenSlug-$*-beta \ ) - ${MAKE} setup-openslug-2.3-beta + ${MAKE} setup-openslug-$*-beta .PHONY: setup-host-debian setup-host-debian: @@ -329,9 +340,8 @@ update-openembedded: openembedded/.configured update-optware: optware/.configured ( cd optware ; cvs -q update -d -P ) -.PHONY: update-openslug-2.3-beta -update-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured - ( cd releases/OpenSlug-2.3-beta ; svn up ) +update-openslug-%-beta: releases/OpenSlug-%-beta/.configured + ( cd releases/OpenSlug-$*-beta ; svn up ) .PHONY: status-master status-master: MT/.configured @@ -349,9 +359,8 @@ status-openembedded: openembedded/.configured status-optware: optware/.configured ( cd optware ; cvs -q update -d -P ) -.PHONY: status-openslug-2.3-beta -status-openslug-2.3-beta: - ( cd releases/OpenSlug-2.3-beta ; svn status ) +status-openslug-%-beta: + ( cd releases/OpenSlug-$*-beta ; svn status ) .PHONY: clobber-unslung clobber-unslung: @@ -488,14 +497,13 @@ else ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/native/unstable endif -.PHONY: upload-openslug-2.3-beta -upload-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured - rm -rf releases/OpenSlug-2.3-beta/tmp/deploy/ipk/morgue - rsync -vlrt --exclude='Packages*' releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/2.3-beta - rsync -vl releases/OpenSlug-2.3-beta/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ - rsync -vlrt --delete releases/OpenSlug-2.3-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/2.3-beta/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/2.3-beta +upload-openslug-%-beta: releases/OpenSlug-%-beta/.configured + rm -rf releases/OpenSlug-$*-beta/tmp/deploy/ipk/morgue + rsync -vlrt --exclude='Packages*' releases/OpenSlug-$*-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/$*-beta/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/$*-beta + rsync -vl releases/OpenSlug-$*-beta/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/$*-beta/ + rsync -vlrt --delete releases/OpenSlug-$*-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/$*-beta/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/$*-beta .PHONY: upload-ucslugc upload-ucslugc: ucslugc/.configured -- cgit v1.2.3 From d9f6d44c1e1df19157cebf76898ffb99c16dd332 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 6 Aug 2005 21:39:24 +0000 Subject: Updated the setup-host-debian target (thanks to blaster8). --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 37bbc62747..8d167ababa 100644 --- a/Makefile +++ b/Makefile @@ -261,7 +261,8 @@ setup-openslug-%-beta-developer: .PHONY: setup-host-debian setup-host-debian: - sudo apt-get install \ + su - -c " \ + apt-get install \ autoconf automake automake1.9 \ bison \ ccache \ @@ -275,7 +276,10 @@ setup-host-debian: python python-dev python-psyco python2.4 python2.4-dev \ sed \ texinfo \ - unzip + unzip \ + subversion \ + bzip2" + echo "You will have to install monotone separately. See http://venge.net/monotone/" .PHONY: setup-host-gentoo setup-host-gentoo: @@ -301,7 +305,8 @@ setup-host-gentoo: sys-apps/texinfo \ unzip \ psyco \ - subversion" + subversion \ + bzip2" .PHONY: update-master update-master: MT/.configured @@ -447,6 +452,7 @@ ifneq ($(HOST_MACHINE),armeb) - ${MAKE} build-unslung upload-unslung-modules || echo -n " unslung" >> builderrors.log else ifeq ($(HOST_FIRMWARE),OpenSlug) + rm -rf openslug/tmp/cache - ${MAKE} build-openslug upload-openslug || echo -n " openslug" >> builderrors.log endif endif -- cgit v1.2.3 From 300ed72988df7da578ee92fe9eeeedd5ed2addfb Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 6 Aug 2005 21:47:18 +0000 Subject: Fixed the setup-host-gentoo target (thanks again to blaster8) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8d167ababa..5236c28f12 100644 --- a/Makefile +++ b/Makefile @@ -284,9 +284,9 @@ setup-host-debian: .PHONY: setup-host-gentoo setup-host-gentoo: su - -c "mkdir -p /etc/portage ; echo >> /etc/portage/package.keywords ; \ - grep monotone /etc/portage/package.keywords || \ + grep monotone-0.21 /etc/portage/package.keywords || \ echo ~dev-util/monotone-0.21 ~* >> /etc/portage/package.keywords ; \ - grep dev-libs/boost /etc/portage/package.keywords || \ + grep dev-libs/boost-1.32 /etc/portage/package.keywords || \ echo ~dev-libs/boost-1.32 ~* >> /etc/portage/package.keywords ; \ emerge -n \ autoconf automake \ -- cgit v1.2.3 From af90a141207f3faae55a08d8baed1abd4a8320e2 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 7 Aug 2005 06:33:04 +0000 Subject: Added the top-level prefetch target, and added BITBAKE variable to openembedded.mk to allow options to be added. --- Makefile | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ common/openembedded.mk | 7 +++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5236c28f12..f13a93373b 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,9 @@ HOST_FIRMWARE:=$(shell uname -m | sed \ .PHONY: all all: update build +.PHONY: prefetch +prefetch: prefetch-unslung prefetch-openslug prefetch-ucslugc prefetch-optware + .PHONY: build build: build-unslung build-openslug build-ucslugc build-optware @@ -59,6 +62,62 @@ clobber: clobber-unslung clobber-openslug clobber-ucslugc clobber-optware distclean: distclean-master distclean-bitbake distclean-openembedded \ distclean-unslung distclean-openslug distclean-ucslugc distclean-optware distclean-releases +.PHONY: prefetch-unslung +ifneq ($(HOST_MACHINE),armeb) +prefetch-unslung: unslung/.configured bitbake/.configured openembedded/.configured + ( cd unslung ; ${MAKE} prefetch ) +else +prefetch-unslung: +endif + +.PHONY: prefetch-openslug +ifneq ($(HOST_MACHINE),armeb) +prefetch-openslug: openslug/.configured bitbake/.configured openembedded/.configured + ( cd openslug ; ${MAKE} prefetch ) +else +ifeq ($(HOST_FIRMWARE),OpenSlug) +prefetch-openslug: openslug/.configured bitbake/.configured openembedded/.configured + ( cd openslug ; ${MAKE} prefetch ) +else +prefetch-openslug: +endif +endif + +.PHONY: prefetch-ucslugc +ifneq ($(HOST_MACHINE),armeb) +prefetch-ucslugc: ucslugc/.configured bitbake/.configured openembedded/.configured + ( cd ucslugc ; ${MAKE} prefetch ) +else +prefetch-ucslugc: +endif + +.PHONY: prefetch-optware +prefetch-optware: prefetch-optware-nslu2 prefetch-optware-wl500g + +.PHONY: prefetch-optware-nslu2 +ifneq ($(HOST_MACHINE),armeb) +prefetch-optware-nslu2: optware/nslu2/.configured + ( cd optware/nslu2 ; ${MAKE} source ) +else +ifeq ($(HOST_FIRMWARE),Unslung) +prefetch-optware-nslu2: optware/nslu2/.configured + ( cd optware/nslu2 ; ${MAKE} source ) +else +prefetch-optware-nslu2: +endif +endif + +.PHONY: prefetch-optware-wl500g +ifneq ($(HOST_MACHINE),armeb) +prefetch-optware-wl500g: optware/wl500g/.configured + ( cd optware/wl500g ; ${MAKE} source ) +else +prefetch-optware-wl500g: +endif + +prefetch-openslug-%-beta: releases/OpenSlug-%-beta/.configured + ( cd releases/OpenSlug-$*-beta ; ${MAKE} prefetch ) + .PHONY: unslung build-unslung ifneq ($(HOST_MACHINE),armeb) unslung build-unslung: unslung/.configured bitbake/.configured openembedded/.configured diff --git a/common/openembedded.mk b/common/openembedded.mk index c23f206122..c4b5d564fe 100644 --- a/common/openembedded.mk +++ b/common/openembedded.mk @@ -15,16 +15,21 @@ include conf/auto.conf BUILD_DIRS = downloads REQUIRED_DIRS = bitbake openembedded FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) +BITBAKE = bitbake # The default rule is to build the firmware in an unprotected environment. firmware: $(FIRMWARE_DEPS) - . ./setup-env; exec bitbake $(DISTRO)-packages + . ./setup-env; exec ${BITBAKE} $(DISTRO)-packages # This rule clobbers the environment (note that ccache uses '$HOME' by # default, so the cache will end up there). firmware-safe: env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) firmware +# The default rule is to build the firmware in an unprotected environment. +prefetch: $(FIRMWARE_DEPS) + . ./setup-env; exec ${BITBAKE} -cfetch $(DISTRO)-packages + # topdir.conf is re-created automatically if the directory is # moved - this will cause a full bitbake reparse .PHONY: create-topdir -- cgit v1.2.3 From fb3a445fc4793b83725a478a0a305f059fee234a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 9 Aug 2005 18:37:12 +0000 Subject: autobuild now stores log on www.nslu2-linux.org --- Makefile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f13a93373b..9350aa27d9 100644 --- a/Makefile +++ b/Makefile @@ -503,6 +503,7 @@ push-openembedded: update-openembedded .PHONY: autobuild autobuild: + date rm -rf builderrors.log - ${MAKE} update || echo -n " update" >> builderrors.log ifneq ($(HOST_MACHINE),armeb) @@ -524,10 +525,20 @@ ifeq ($(HOST_FIRMWARE),Unslung) endif endif - ${MAKE} upload-sources || echo -n " upload-sources" >> builderrors.log + + date if [ -e builderrors.log ] ; then \ - echo -n "*** Errors during autobuild:" ; \ - cat builderrors.log ; \ - echo " ***" ; \ + echo -n "*** Errors during autobuild:" ; \ + cat builderrors.log ; \ + echo " ***" ; \ + if [ -e autobuild.log ] ; then \ + rsync autobuild.log slug@nugabe.nslu2-linux.org:htdocs/www/autobuild-nudi-last.txt ; \ + fi \ + else \ + if [ -e autobuild.log ] ; then \ + ssh slug@nugabe.nslu2-linux.org mv htdocs/www/autobuild-nudi-last.txt htdocs/www/autobuild-nudi-prev.txt ; \ + rsync autobuild.log slug@nugabe.nslu2-linux.org:htdocs/www/autobuild-nudi-last.txt ; \ + fi \ fi .PHONY: upload -- cgit v1.2.3 From effd85158c0b171f0c9115cdba6d8c0636758ec7 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 13 Aug 2005 10:42:14 +0000 Subject: Added targets for unslung-binary-kernel --- Makefile | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9350aa27d9..ce6b9e066e 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,14 @@ else prefetch-unslung: endif +.PHONY: prefetch-unslung-binary-kernel +ifneq ($(HOST_MACHINE),armeb) +prefetch-unslung-binary-kernel: unslung-binary-kernel/.configured bitbake/.configured openembedded/.configured + ( cd unslung-binary-kernel ; ${MAKE} prefetch ) +else +prefetch-unslung-binary-kernel: +endif + .PHONY: prefetch-openslug ifneq ($(HOST_MACHINE),armeb) prefetch-openslug: openslug/.configured bitbake/.configured openembedded/.configured @@ -126,6 +134,14 @@ else unslung build-unslung: endif +.PHONY: unslung-binary-kernel build-unslung-binary-kernel +ifneq ($(HOST_MACHINE),armeb) +unslung-binary-kernel build-unslung-binary-kernel: unslung-binary-kernel/.configured bitbake/.configured openembedded/.configured + ( cd unslung-binary-kernel ; ${MAKE} ) +else +unslung-binary-kernel build-unslung-binary-kernel: +endif + .PHONY: openslug build-openslug ifneq ($(HOST_MACHINE),armeb) openslug build-openslug: openslug/.configured bitbake/.configured openembedded/.configured @@ -201,8 +217,8 @@ setup-openembedded openembedded/.configured: MT/.configured [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded touch openembedded/.configured -.PHONY: setup-unslung setup-openslug setup-ucslugc -setup-unslung setup-openslug setup-ucslugc: setup-%: MT/.configured +.PHONY: setup-unslung setup-unslung-binary-kernel setup-openslug setup-ucslugc +setup-unslung setup-unslung-binary-kernel setup-openslug setup-ucslugc: setup-%: MT/.configured rm -rf $*/.configured ${MAKE} $*/.configured @@ -430,6 +446,10 @@ status-openslug-%-beta: clobber-unslung: [ ! -e unslung/Makefile ] || ( cd unslung ; ${MAKE} clobber ) +.PHONY: clobber-unslung-binary-kernel +clobber-unslung-binary-kernel: + [ ! -e unslung-binary-kernel/Makefile ] || ( cd unslung-binary-kernel ; ${MAKE} clobber ) + .PHONY: clobber-openslug clobber-openslug: [ ! -e openslug/Makefile ] || ( cd openslug ; ${MAKE} clobber ) @@ -465,6 +485,10 @@ distclean-openembedded: distclean-unslung: rm -rf unslung +.PHONY: distclean-unslung-binary-kernel +distclean-unslung-binary-kernel: + rm -rf unslung-binary-kernel + .PHONY: distclean-openslug distclean-openslug: rm -rf openslug -- cgit v1.2.3 From 527002a63efeb0fcf7361d2b381f6913d0ded12c Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 15 Aug 2005 20:45:04 +0000 Subject: Update setup-host targets --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ce6b9e066e..f1c6e6e9f1 100644 --- a/Makefile +++ b/Makefile @@ -353,16 +353,17 @@ setup-host-debian: texinfo \ unzip \ subversion \ - bzip2" - echo "You will have to install monotone separately. See http://venge.net/monotone/" + bzip2 ;\ + echo You will have to install monotone separately. See http://venge.net/monotone/ + " .PHONY: setup-host-gentoo setup-host-gentoo: su - -c "mkdir -p /etc/portage ; echo >> /etc/portage/package.keywords ; \ - grep monotone-0.21 /etc/portage/package.keywords || \ - echo ~dev-util/monotone-0.21 ~* >> /etc/portage/package.keywords ; \ - grep dev-libs/boost-1.32 /etc/portage/package.keywords || \ - echo ~dev-libs/boost-1.32 ~* >> /etc/portage/package.keywords ; \ + grep monotone-0.22 /etc/portage/package.keywords || \ + echo ~dev-util/monotone-0.22 ~* >> /etc/portage/package.keywords ; \ + grep dev-libs/boost-1.32.0 /etc/portage/package.keywords || \ + echo ~dev-libs/boost-1.32.0 ~* >> /etc/portage/package.keywords ; \ emerge -n \ autoconf automake \ bison \ -- cgit v1.2.3 From 3af5a5191a9d9239489cad3510d0569cc0e29c1d Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 17 Aug 2005 01:53:47 +0000 Subject: Fix quoting on setup-host-debian --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f1c6e6e9f1..f54fa2a3ff 100644 --- a/Makefile +++ b/Makefile @@ -354,8 +354,7 @@ setup-host-debian: unzip \ subversion \ bzip2 ;\ - echo You will have to install monotone separately. See http://venge.net/monotone/ - " + echo You will have to install monotone separately. See http://venge.net/monotone/ " .PHONY: setup-host-gentoo setup-host-gentoo: -- cgit v1.2.3 From 08c511dfa7c2412d762796fdeb2fbf4fc6794bd1 Mon Sep 17 00:00:00 2001 From: Tom King Date: Wed, 17 Aug 2005 08:54:55 +0000 Subject: Added the Ubuntu-host-setup target --- Makefile | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f54fa2a3ff..001db20187 100644 --- a/Makefile +++ b/Makefile @@ -354,7 +354,32 @@ setup-host-debian: unzip \ subversion \ bzip2 ;\ - echo You will have to install monotone separately. See http://venge.net/monotone/ " + echo You will have to install monotone separately. See http://venge.net/monotone/ \ + " + +.PHONY: setup-host-ubuntu +setup-host-ubuntu: + su - -c " \ + apt-get install \ + autoconf automake automake1.9 \ + bison \ + ccache \ + cvs \ + docbook \ + flex \ + g++ gawk gcj gettext \ + libc6-dev libglib2.0-dev libtool \ + m4 make \ + patch pkg-config \ + python python-dev python2.4-psyco python2.4 python2.4-dev \ + sed \ + texinfo \ + unzip \ + subversion \ + bzip2 ;\ + echo You will have to install monotone separately. See http://venge.net/monotone/ \ + " + .PHONY: setup-host-gentoo setup-host-gentoo: -- cgit v1.2.3 From f3eab4be9d189f0044ad6d1a49d15511dee51dfc Mon Sep 17 00:00:00 2001 From: Tom King Date: Wed, 17 Aug 2005 09:01:27 +0000 Subject: Fix the added the Ubuntu-host-setup target --- Makefile | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 001db20187..d61a0f18d9 100644 --- a/Makefile +++ b/Makefile @@ -359,25 +359,25 @@ setup-host-debian: .PHONY: setup-host-ubuntu setup-host-ubuntu: - su - -c " \ - apt-get install \ - autoconf automake automake1.9 \ - bison \ - ccache \ - cvs \ - docbook \ - flex \ - g++ gawk gcj gettext \ - libc6-dev libglib2.0-dev libtool \ - m4 make \ - patch pkg-config \ - python python-dev python2.4-psyco python2.4 python2.4-dev \ - sed \ - texinfo \ - unzip \ - subversion \ - bzip2 ;\ - echo You will have to install monotone separately. See http://venge.net/monotone/ \ + su - -c " \ + apt-get install \ + autoconf automake automake1.9 \ + bison \ + ccache \ + cvs \ + docbook \ + flex \ + g++ gawk gcj gettext \ + libc6-dev libglib2.0-dev libtool \ + m4 make \ + patch pkg-config \ + python python-dev python2.4-psyco python2.4 python2.4-dev \ + sed \ + texinfo \ + unzip \ + subversion \ + bzip2 ;\ + echo You will have to install monotone separately. See http://venge.net/monotone/ \ " -- cgit v1.2.3 From 77e8dd1885302eaf7c7baf31dadf800618592112 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Wed, 17 Aug 2005 09:17:12 +0000 Subject: Housecleaning --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index d61a0f18d9..a3f67beb2c 100644 --- a/Makefile +++ b/Makefile @@ -410,6 +410,9 @@ setup-host-gentoo: .PHONY: update-master update-master: MT/.configured + if [ `monotone -d monotone/nslu2-linux.db list keys nslu2-linux@nslu2-linux.org | wc -l` == 8 ] ; then \ + monotone -d monotone/nslu2-linux.db dropkey nslu2-linux@nslu2-linux.org ; \ + fi monotone pull if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ monotone merge -b org.nslu2-linux.dev ; \ -- cgit v1.2.3 From b84743e7dbf038bf9729849df4d11fa3cea09459 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Thu, 18 Aug 2005 03:09:15 +0000 Subject: Fixed the syntax --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a3f67beb2c..ff350daed4 100644 --- a/Makefile +++ b/Makefile @@ -410,7 +410,7 @@ setup-host-gentoo: .PHONY: update-master update-master: MT/.configured - if [ `monotone -d monotone/nslu2-linux.db list keys nslu2-linux@nslu2-linux.org | wc -l` == 8 ] ; then \ + if [ `monotone -d monotone/nslu2-linux.db list keys nslu2-linux@nslu2-linux.org | wc -l` = 8 ] ; then \ monotone -d monotone/nslu2-linux.db dropkey nslu2-linux@nslu2-linux.org ; \ fi monotone pull -- cgit v1.2.3 From 6e2df86b89234a0f95e39df3d50e3e909c481cd6 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 19 Aug 2005 01:23:56 +0000 Subject: Moved build logs to logs.nslu2-linux.org --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ff350daed4..850b403d8a 100644 --- a/Makefile +++ b/Makefile @@ -584,12 +584,12 @@ endif cat builderrors.log ; \ echo " ***" ; \ if [ -e autobuild.log ] ; then \ - rsync autobuild.log slug@nugabe.nslu2-linux.org:htdocs/www/autobuild-nudi-last.txt ; \ + rsync autobuild.log slug@nugabe.nslu2-linux.org:htdocs/logs/buildlogs/autobuild-`hostname`-last.txt ; \ fi \ else \ if [ -e autobuild.log ] ; then \ - ssh slug@nugabe.nslu2-linux.org mv htdocs/www/autobuild-nudi-last.txt htdocs/www/autobuild-nudi-prev.txt ; \ - rsync autobuild.log slug@nugabe.nslu2-linux.org:htdocs/www/autobuild-nudi-last.txt ; \ + ssh slug@nugabe.nslu2-linux.org mv htdocs/logs/buildlogs/autobuild-`hostname`-last.txt htdocs/logs/buildlogs/autobuild-`hostname`-prev.txt ; \ + rsync autobuild.log slug@nugabe.nslu2-linux.org:htdocs/logs/buildlogs/autobuild-`hostname`-last.txt ; \ fi \ fi -- cgit v1.2.3 From e970042576eb8601bff99fd3c465f8a16c911619 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 17 Aug 2005 22:28:53 +0000 Subject: Updated to new feed locations --- Makefile | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 850b403d8a..168c5ad318 100644 --- a/Makefile +++ b/Makefile @@ -649,35 +649,35 @@ upload-unslung-modules: unslung/.configured mv unslung/tmp/deploy/ipk/Packages.new unslung/tmp/deploy/ipk/Packages rm -f unslung/tmp/deploy/ipk/Packages.gz gzip -c unslung/tmp/deploy/ipk/Packages > unslung/tmp/deploy/ipk/Packages.gz - rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/oe - rsync -vl unslung/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/oe -# rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/oe/ + rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/modules/stable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/modules/stable + rsync -vl unslung/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/modules/stable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/modules/stable +# rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/modules/stable/ .PHONY: upload-optware-nslu2 upload-optware-nslu2: optware/nslu2/.configured ifneq ($(HOST_MACHINE),armeb) - rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/cross - rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ - rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/cross/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/cross + rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/cross/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk optware/nslu2/cross/unstable + rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/cross/unstable/ + rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/cross/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean optware/nslu2/cross/unstable else - rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/native/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/native - rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/native/ - rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/native/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/native + rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/native/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk optware/nslu2/native/unstable + rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/native/unstable/ + rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/native/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean optware/nslu2/native/unstable endif .PHONY: upload-optware-wl500g upload-optware-wl500g: optware/wl500g/.configured - rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/wl500g - rsync -vl optware/wl500g/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ - rsync -vlrt --delete optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/wl500g/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/wl500g + rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/wl500g/cross/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk optware/wl500g/cross/unstable + rsync -vl optware/wl500g/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/wl500g/cross/unstable/ + rsync -vlrt --delete optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/wl500g/cross/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean optware/wl500g/cross/unstable .PHONY: upload-sources upload-sources: -- cgit v1.2.3 From f5157f9feaec424422c369a006cc840354c32787 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 18 Aug 2005 04:22:15 +0000 Subject: org.openembedded.nslu2-linux branch is now deprecated - use org.openembedded.dev instead --- Makefile | 45 +++++++++------------------------------------ 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index 168c5ad318..e76395651d 100644 --- a/Makefile +++ b/Makefile @@ -214,7 +214,7 @@ setup-bitbake bitbake/.configured: MT/.configured .PHONY: setup-openembedded setup-openembedded openembedded/.configured: MT/.configured - [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded + [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.dev openembedded touch openembedded/.configured .PHONY: setup-unslung setup-unslung-binary-kernel setup-openslug setup-ucslugc @@ -435,13 +435,17 @@ update-bitbake: bitbake/.configured .PHONY: update-openembedded update-openembedded: openembedded/.configured + if grep "org.openembedded.nslu2-linux" openembedded/MT/options >/dev/null 2>&1 ; then \ + sed -i -e 's/org.openembedded.nslu2-linux/org.openembedded.dev/' openembedded/MT/options ; \ + monotone propagate org.openembedded.nslu2-linux org.openembedded.dev ; \ + fi monotone pull - if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ - monotone merge -b org.openembedded.nslu2-linux ; \ + if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.dev ; \ fi ( cd openembedded ; monotone update ) - if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ - monotone merge -b org.openembedded.nslu2-linux ; \ + if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.dev ; \ fi .PHONY: update-optware @@ -691,35 +695,4 @@ import-bitbake: bitbake/.configured rm -rf bitbake.old ( cd bitbake ; rm -rf .svn ; monotone status ) -.PHONY: import-openembedded -import-openembedded: openembedded/.configured - monotone pull monotone.vanille.de org.openembedded.* - if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ - monotone merge -b org.openembedded.dev ; \ - fi - if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ - monotone merge -b org.openembedded.nslu2-linux ; \ - fi - monotone propagate org.openembedded.dev org.openembedded.nslu2-linux - if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ - monotone merge -b org.openembedded.nslu2-linux ; \ - fi - -.PHONY: export-openembedded -export-openembedded: openembedded/.configured - if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ - monotone merge -b org.openembedded.nslu2-linux ; \ - fi - if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ - monotone merge -b org.openembedded.dev ; \ - fi - monotone propagate org.openembedded.nslu2-linux org.openembedded.dev - if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ - monotone merge -b org.openembedded.dev ; \ - fi - monotone push monotone.vanille.de org.openembedded.* - -.PHONY: publish-openembedded -publish-openembedded: import-openembedded update-openembedded push-openembedded export-openembedded - # End of Makefile -- cgit v1.2.3 From 4030c1a232ddfc79bf568eb25abe7fbee02bd13e Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 18 Aug 2005 05:29:57 +0000 Subject: Removed org.openembedded.nslu2-linux from the initial setup steps --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e76395651d..df292455b0 100644 --- a/Makefile +++ b/Makefile @@ -203,7 +203,7 @@ setup-master MT/.configured: gunzip monotone/nslu2-linux.db.gz ) - ( monotone -d monotone/nslu2-linux.db unset database default-server ) - ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) - ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.{nslu2-linux.*,openembedded.{dev,dreambox,nslu2-linux}} ) + ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.{nslu2-linux.*,openembedded.dev} ) [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) touch MT/.configured -- cgit v1.2.3 From 9f1e67ff0e167b03bbb4ef154ad48d2bd477b953 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 18 Aug 2005 08:08:16 +0000 Subject: Commented out dropkey code --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index df292455b0..e984bd7de3 100644 --- a/Makefile +++ b/Makefile @@ -410,9 +410,9 @@ setup-host-gentoo: .PHONY: update-master update-master: MT/.configured - if [ `monotone -d monotone/nslu2-linux.db list keys nslu2-linux@nslu2-linux.org | wc -l` = 8 ] ; then \ - monotone -d monotone/nslu2-linux.db dropkey nslu2-linux@nslu2-linux.org ; \ - fi +# if [ `monotone -d monotone/nslu2-linux.db list keys nslu2-linux@nslu2-linux.org | wc -l` = 8 ] ; then \ +# monotone -d monotone/nslu2-linux.db dropkey nslu2-linux@nslu2-linux.org ; \ +# fi monotone pull if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ monotone merge -b org.nslu2-linux.dev ; \ -- cgit v1.2.3 From e56f2097187d89bb84abfda58de9585a5bec4073 Mon Sep 17 00:00:00 2001 From: Tom King Date: Sun, 21 Aug 2005 00:57:04 +0000 Subject: Added back in -image targets for Master makes for unslung, openembedded, and ucslugc --- Makefile | 26 ++++++++++++++++++++++++-- common/openembedded.mk | 12 ++++++++---- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e984bd7de3..c94f257eb6 100644 --- a/Makefile +++ b/Makefile @@ -163,8 +163,30 @@ else ucslugc build-ucslugc: endif -.PHONY: optware build-optware -optware build-optware: build-optware-nslu2 build-optware-wl500g + +.PHONY: unslung-image build-unslung-image +ifneq ($(HOST_MACHINE),armeb) +unslung-image build-unslung-image: unslung/.configured bitbake/.configured openembedded/.configured + ( cd unslung ; ${MAKE} image) +else +unslung-image build-unslung-image: +endif + +.PHONY: openslug-image build-openslug-image +ifneq ($(HOST_MACHINE),armeb) +openslug-image build-openslug-image: openslug/.configured bitbake/.configured openembedded/.configured + ( cd openslug ; ${MAKE} image ) +else +openslug build-openslug: +endif + +.PHONY: ucslugc build-ucslugc +ifneq ($(HOST_MACHINE),armeb) +ucslugc-image build-ucslugc-image: ucslugc/.configured bitbake/.configured openembedded/.configured + ( cd ucslugc ; ${MAKE} image) +else +ucslugc build-ucslugc: +endif .PHONY: optware-nslu2 build-optware-nslu2 ifneq ($(HOST_MACHINE),armeb) diff --git a/common/openembedded.mk b/common/openembedded.mk index c4b5d564fe..bf691ce069 100644 --- a/common/openembedded.mk +++ b/common/openembedded.mk @@ -17,14 +17,18 @@ REQUIRED_DIRS = bitbake openembedded FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) BITBAKE = bitbake -# The default rule is to build the firmware in an unprotected environment. -firmware: $(FIRMWARE_DEPS) +# The default rule is to build everything in an unprotected environment. +distro: $(FIRMWARE_DEPS) . ./setup-env; exec ${BITBAKE} $(DISTRO)-packages +# The default rule is to build the firmware in an unprotected environment. +image: $(FIRMWARE_DEPS) + . ./setup-env; exec ${BITBAKE} $(DISTRO)-image + # This rule clobbers the environment (note that ccache uses '$HOME' by # default, so the cache will end up there). -firmware-safe: - env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) firmware +distro-safe: + env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) distro # The default rule is to build the firmware in an unprotected environment. prefetch: $(FIRMWARE_DEPS) -- cgit v1.2.3 From 005f9dbd4fba8e6b32d9c17f6fc61c23c91e544c Mon Sep 17 00:00:00 2001 From: Tom King Date: Sun, 21 Aug 2005 01:35:09 +0000 Subject: Fix .PHONY line for ucslugc-image --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c94f257eb6..7d3e2371af 100644 --- a/Makefile +++ b/Makefile @@ -180,7 +180,7 @@ else openslug build-openslug: endif -.PHONY: ucslugc build-ucslugc +.PHONY: ucslugc-image build-ucslugc-image ifneq ($(HOST_MACHINE),armeb) ucslugc-image build-ucslugc-image: ucslugc/.configured bitbake/.configured openembedded/.configured ( cd ucslugc ; ${MAKE} image) -- cgit v1.2.3 From 245325fd2f15742ac857b9f10a1442562b1c9f3f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 25 Aug 2005 10:15:15 +0000 Subject: Fixed else clause of -image targets. --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7d3e2371af..ea1934cf3a 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,6 @@ else ucslugc build-ucslugc: endif - .PHONY: unslung-image build-unslung-image ifneq ($(HOST_MACHINE),armeb) unslung-image build-unslung-image: unslung/.configured bitbake/.configured openembedded/.configured @@ -177,7 +176,7 @@ ifneq ($(HOST_MACHINE),armeb) openslug-image build-openslug-image: openslug/.configured bitbake/.configured openembedded/.configured ( cd openslug ; ${MAKE} image ) else -openslug build-openslug: +openslug-image build-openslug-image: endif .PHONY: ucslugc-image build-ucslugc-image @@ -185,9 +184,12 @@ ifneq ($(HOST_MACHINE),armeb) ucslugc-image build-ucslugc-image: ucslugc/.configured bitbake/.configured openembedded/.configured ( cd ucslugc ; ${MAKE} image) else -ucslugc build-ucslugc: +ucslugc-image build-ucslugc-image: endif +.PHONY: build-optware +build-optware: build-optware-nslu2 build-optware-wl500g + .PHONY: optware-nslu2 build-optware-nslu2 ifneq ($(HOST_MACHINE),armeb) optware-nslu2 build-optware-nslu2: optware/nslu2/.configured -- cgit v1.2.3 From 5ccd078e12b0beb585fd258e6c03b1b42a10c89d Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 30 Aug 2005 00:07:07 +0000 Subject: Added optware/ds101 and optware/ds101g --- Makefile | 120 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 62 insertions(+), 58 deletions(-) diff --git a/Makefile b/Makefile index ea1934cf3a..16344827f1 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,7 @@ prefetch-ucslugc: endif .PHONY: prefetch-optware -prefetch-optware: prefetch-optware-nslu2 prefetch-optware-wl500g +prefetch-optware: prefetch-optware-nslu2 prefetch-optware-wl500g prefetch-optware-ds101 prefetch-optware-ds101g .PHONY: prefetch-optware-nslu2 ifneq ($(HOST_MACHINE),armeb) @@ -115,12 +115,12 @@ prefetch-optware-nslu2: endif endif -.PHONY: prefetch-optware-wl500g +.PHONY: prefetch-optware-% ifneq ($(HOST_MACHINE),armeb) -prefetch-optware-wl500g: optware/wl500g/.configured - ( cd optware/wl500g ; ${MAKE} source ) +prefetch-optware-%: optware/%/.configured + ( cd optware/$* ; ${MAKE} source ) else -prefetch-optware-wl500g: +prefetch-optware-%: endif prefetch-openslug-%-beta: releases/OpenSlug-%-beta/.configured @@ -188,7 +188,7 @@ ucslugc-image build-ucslugc-image: endif .PHONY: build-optware -build-optware: build-optware-nslu2 build-optware-wl500g +build-optware: build-optware-nslu2 build-optware-wl500g build-optware-ds101 build-optware-ds101g .PHONY: optware-nslu2 build-optware-nslu2 ifneq ($(HOST_MACHINE),armeb) @@ -211,6 +211,22 @@ else optware-wl500g build-optware-wl500g: endif +.PHONY: optware-ds101 build-optware-ds101 +ifneq ($(HOST_MACHINE),armeb) +optware-ds101 build-optware-ds101: optware/ds101/.configured + ( cd optware/ds101 ; ${MAKE} autoclean ; ${MAKE} ) +else +optware-ds101 build-optware-ds101: +endif + +.PHONY: optware-ds101g build-optware-ds101g +ifneq ($(HOST_MACHINE),armeb) +optware-ds101g build-optware-ds101g: optware/ds101g/.configured + ( cd optware/ds101g ; ${MAKE} autoclean ; ${MAKE} ) +else +optware-ds101g build-optware-ds101g: +endif + openslug-%-beta: update-openslug-%-beta build-openslug-%-beta upload-openslug-%-beta echo "$@ completed" @@ -241,6 +257,31 @@ setup-openembedded openembedded/.configured: MT/.configured [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.dev openembedded touch openembedded/.configured +.PHONY: setup-optware +setup-optware optware/.configured: MT/.configured + [ -e downloads ] || ( mkdir -p downloads ) + [ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) + touch optware/.configured + +# This pattern rule has to come before the subsequent %/.configured openembedded pattern rule. +optware/%/.configured: optware/.configured + [ -e optware/$*/Makefile ] || ( \ + mkdir -p optware/$* ; \ + echo "OPTWARE_TARGET=$*" > optware/$*/Makefile ; \ + echo "include ../Makefile" >> optware/$*/Makefile ; \ + ln -s ../../downloads optware/$*/downloads ; \ + ln -s ../make optware/$*/make ; \ + ln -s ../scripts optware/$*/scripts ; \ + ln -s ../sources optware/$*/sources ; \ + ) + touch optware/$*/.configured + +.PHONY: setup-optware-developer +setup-optware-developer: + [ ! -e optware ] || ( mv optware optware-user ) + cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung + ${MAKE} setup-optware + .PHONY: setup-unslung setup-unslung-binary-kernel setup-openslug setup-ucslugc setup-unslung setup-unslung-binary-kernel setup-openslug setup-ucslugc: setup-%: MT/.configured rm -rf $*/.configured @@ -272,42 +313,6 @@ setup-unslung setup-unslung-binary-kernel setup-openslug setup-ucslugc: setup-%: rm -rf $*/tmp/cache touch $*/.configured -.PHONY: setup-optware -setup-optware optware/.configured: MT/.configured - [ -e downloads ] || ( mkdir -p downloads ) - [ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) - touch optware/.configured - -optware/nslu2/.configured: optware/.configured - [ -e optware/nslu2/Makefile ] || ( \ - mkdir -p optware/nslu2 ; \ - echo "OPTWARE_TARGET=nslu2" > optware/nslu2/Makefile ; \ - echo "include ../Makefile" >> optware/nslu2/Makefile ; \ - ln -s ../../downloads optware/nslu2/downloads ; \ - ln -s ../make optware/nslu2/make ; \ - ln -s ../scripts optware/nslu2/scripts ; \ - ln -s ../sources optware/nslu2/sources ; \ - ) - touch optware/nslu2/.configured - -optware/wl500g/.configured: optware/.configured - [ -e optware/wl500g/Makefile ] || ( \ - mkdir -p optware/wl500g ; \ - echo "OPTWARE_TARGET=wl500g" > optware/wl500g/Makefile ; \ - echo "include ../Makefile" >> optware/wl500g/Makefile ; \ - ln -s ../../downloads optware/wl500g/downloads ; \ - ln -s ../make optware/wl500g/make ; \ - ln -s ../scripts optware/wl500g/scripts ; \ - ln -s ../sources optware/wl500g/sources ; \ - ) - touch optware/wl500g/.configured - -.PHONY: setup-optware-developer -setup-optware-developer: - [ ! -e optware ] || ( mv optware optware-user ) - cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung - ${MAKE} setup-optware - .PHONY: setup-slugimage-developer setup-slugimage-developer: cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co slugimage @@ -515,15 +520,11 @@ clobber-ucslugc: [ ! -e ucslugc/Makefile ] || ( cd ucslugc ; ${MAKE} clobber ) .PHONY: clobber-optware -clobber-optware: clobber-optware-nslu2 clobber-optware-wl500g - -.PHONY: clobber-optware-nslu2 -clobber-optware-nslu2: - [ ! -e optware/nslu2/Makefile ] || ( cd optware/nslu2 ; ${MAKE} distclean ) +clobber-optware: clobber-optware-nslu2 clobber-optware-wl500g clobber-optware-ds101 clobber-optware-ds101g -.PHONY: clobber-optware-wl500g -clobber-optware-wl500g: - [ ! -e optware/wl500g/Makefile ] || ( cd optware/wl500g ; ${MAKE} distclean ) +.PHONY: clobber-optware-% +clobber-optware-%: + [ ! -e optware/$*/Makefile ] || ( cd optware/$* ; ${MAKE} distclean ) .PHONY: distclean-master distclean-master: @@ -599,6 +600,8 @@ endif ifneq ($(HOST_MACHINE),armeb) - ${MAKE} build-optware-nslu2 upload-optware-nslu2 || echo -n " optware/nslu2" >> builderrors.log - ${MAKE} build-optware-wl500g upload-optware-wl500g || echo -n " optware/wl500g" >> builderrors.log +# - ${MAKE} build-optware-ds101 upload-optware-ds101 || echo -n " optware/ds101" >> builderrors.log +# - ${MAKE} build-optware-ds101g upload-optware-ds101g || echo -n " optware/ds101g" >> builderrors.log else ifeq ($(HOST_FIRMWARE),Unslung) - ${MAKE} build-optware-nslu2 upload-optware-nslu2 || echo -n " optware/nslu2" >> builderrors.log @@ -623,7 +626,8 @@ endif .PHONY: upload ifneq ($(HOST_MACHINE),armeb) -upload: upload-openslug upload-ucslugc upload-unslung-modules upload-optware-nslu2 upload-optware-wl500g upload-sources +upload: upload-openslug upload-ucslugc upload-unslung-modules \ + upload-optware-nslu2 upload-optware-wl500g upload-optware-ds101 upload-optware-ds101g upload-sources else ifeq ($(HOST_FIRMWARE),OpenSlug) upload: upload-openslug upload-sources @@ -699,13 +703,13 @@ else ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean optware/nslu2/native/unstable endif -.PHONY: upload-optware-wl500g -upload-optware-wl500g: optware/wl500g/.configured - rsync -vlrt --exclude='Packages*' optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/wl500g/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk optware/wl500g/cross/unstable - rsync -vl optware/wl500g/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/wl500g/cross/unstable/ - rsync -vlrt --delete optware/wl500g/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/wl500g/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean optware/wl500g/cross/unstable +.PHONY: upload-optware-% +upload-optware-%: optware/%/.configured + rsync -vlrt --exclude='Packages*' optware/$*/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/$*/cross/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk optware/$*/cross/unstable + rsync -vl optware/$*/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/$*/cross/unstable/ + rsync -vlrt --delete optware/$*/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/$*/cross/unstable/ + ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean optware/$*/cross/unstable .PHONY: upload-sources upload-sources: -- cgit v1.2.3 From e10e3278e52e899dece2624b59da3bdf51817e24 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 31 Aug 2005 01:41:01 +0000 Subject: Enabled ds101 and ds101g+ autobuilds. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 16344827f1..bc4029ae02 100644 --- a/Makefile +++ b/Makefile @@ -600,8 +600,8 @@ endif ifneq ($(HOST_MACHINE),armeb) - ${MAKE} build-optware-nslu2 upload-optware-nslu2 || echo -n " optware/nslu2" >> builderrors.log - ${MAKE} build-optware-wl500g upload-optware-wl500g || echo -n " optware/wl500g" >> builderrors.log -# - ${MAKE} build-optware-ds101 upload-optware-ds101 || echo -n " optware/ds101" >> builderrors.log -# - ${MAKE} build-optware-ds101g upload-optware-ds101g || echo -n " optware/ds101g" >> builderrors.log + - ${MAKE} build-optware-ds101 upload-optware-ds101 || echo -n " optware/ds101" >> builderrors.log + - ${MAKE} build-optware-ds101g upload-optware-ds101g || echo -n " optware/ds101g" >> builderrors.log else ifeq ($(HOST_FIRMWARE),Unslung) - ${MAKE} build-optware-nslu2 upload-optware-nslu2 || echo -n " optware/nslu2" >> builderrors.log -- cgit v1.2.3 From 132345792c8a91ca1640b5e1962e0bc2530d41ea Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 31 Aug 2005 10:45:16 +0000 Subject: Turned off ds101g autobuilds, cause the toolchain build fails. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bc4029ae02..57f9e040ad 100644 --- a/Makefile +++ b/Makefile @@ -600,7 +600,7 @@ endif ifneq ($(HOST_MACHINE),armeb) - ${MAKE} build-optware-nslu2 upload-optware-nslu2 || echo -n " optware/nslu2" >> builderrors.log - ${MAKE} build-optware-wl500g upload-optware-wl500g || echo -n " optware/wl500g" >> builderrors.log - - ${MAKE} build-optware-ds101 upload-optware-ds101 || echo -n " optware/ds101" >> builderrors.log +# - ${MAKE} build-optware-ds101 upload-optware-ds101 || echo -n " optware/ds101" >> builderrors.log - ${MAKE} build-optware-ds101g upload-optware-ds101g || echo -n " optware/ds101g" >> builderrors.log else ifeq ($(HOST_FIRMWARE),Unslung) -- cgit v1.2.3 From 63bd6bf58d7fe049e837f3d23f378535a39f5a86 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 3 Sep 2005 17:14:20 +0000 Subject: Re-enable ds101 target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 57f9e040ad..bc4029ae02 100644 --- a/Makefile +++ b/Makefile @@ -600,7 +600,7 @@ endif ifneq ($(HOST_MACHINE),armeb) - ${MAKE} build-optware-nslu2 upload-optware-nslu2 || echo -n " optware/nslu2" >> builderrors.log - ${MAKE} build-optware-wl500g upload-optware-wl500g || echo -n " optware/wl500g" >> builderrors.log -# - ${MAKE} build-optware-ds101 upload-optware-ds101 || echo -n " optware/ds101" >> builderrors.log + - ${MAKE} build-optware-ds101 upload-optware-ds101 || echo -n " optware/ds101" >> builderrors.log - ${MAKE} build-optware-ds101g upload-optware-ds101g || echo -n " optware/ds101g" >> builderrors.log else ifeq ($(HOST_FIRMWARE),Unslung) -- cgit v1.2.3 From 24271df7e941f2bccc7878fb6fcfdfd1f85ab26b Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 4 Sep 2005 01:33:36 +0000 Subject: Fix up setup-host-ubuntu target --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bc4029ae02..011c72e901 100644 --- a/Makefile +++ b/Makefile @@ -400,13 +400,15 @@ setup-host-ubuntu: libc6-dev libglib2.0-dev libtool \ m4 make \ patch pkg-config \ - python python-dev python2.4-psyco python2.4 python2.4-dev \ + python python-dev python2.4 python2.4-dev \ sed \ texinfo \ unzip \ subversion \ bzip2 ;\ echo You will have to install monotone separately. See http://venge.net/monotone/ \ + echo To get python2.4-psyco (Recommended to speed up builds), please read \ + echo http://ubuntuguide.org/#extrarepositories \ " -- cgit v1.2.3 From 03717e7f49180d2b582a2c488199e882f7c57c08 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 4 Sep 2005 01:36:55 +0000 Subject: setup-host-ubuntu lacked gcc too --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 011c72e901..4f53e0402b 100644 --- a/Makefile +++ b/Makefile @@ -396,7 +396,7 @@ setup-host-ubuntu: cvs \ docbook \ flex \ - g++ gawk gcj gettext \ + gcc g++ gawk gcj gettext \ libc6-dev libglib2.0-dev libtool \ m4 make \ patch pkg-config \ -- cgit v1.2.3 From 0bbb91bbed51820be5339c2577a4d2c7aa8cf68f Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 4 Sep 2005 03:17:31 +0000 Subject: setup-host-ubuntu lacked texinfo (for makeinfo) --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 4f53e0402b..3d9273fc92 100644 --- a/Makefile +++ b/Makefile @@ -405,6 +405,7 @@ setup-host-ubuntu: texinfo \ unzip \ subversion \ + texinfo \ bzip2 ;\ echo You will have to install monotone separately. See http://venge.net/monotone/ \ echo To get python2.4-psyco (Recommended to speed up builds), please read \ -- cgit v1.2.3 From 3d286d7276a1e7b78941c92b602ab6224245a029 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 26 Sep 2005 09:07:48 +0000 Subject: Moved the autobuild targets to a separate script, since normal developers don't run them. --- Makefile | 138 +-------------------------------------------------------------- 1 file changed, 2 insertions(+), 136 deletions(-) diff --git a/Makefile b/Makefile index 3d9273fc92..84b8bde8f3 100644 --- a/Makefile +++ b/Makefile @@ -227,7 +227,7 @@ else optware-ds101g build-optware-ds101g: endif -openslug-%-beta: update-openslug-%-beta build-openslug-%-beta upload-openslug-%-beta +openslug-%-beta: update-openslug-%-beta build-openslug-%-beta echo "$@ completed" build-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured @@ -408,7 +408,7 @@ setup-host-ubuntu: texinfo \ bzip2 ;\ echo You will have to install monotone separately. See http://venge.net/monotone/ \ - echo To get python2.4-psyco (Recommended to speed up builds), please read \ + echo To get python2.4-psyco (Recommended to speed up builds), please read \ echo http://ubuntuguide.org/#extrarepositories \ " @@ -573,7 +573,6 @@ push: push-master push-bitbake push-openembedded .PHONY: push-master push-master: update-master monotone push - scp Makefile slug@nugabe.nslu2-linux.org:htdocs/www/Makefile .PHONY: push-bitbake push-bitbake: update-bitbake @@ -585,139 +584,6 @@ push-openembedded: update-openembedded # Targets for use by core team members only -.PHONY: autobuild -autobuild: - date - rm -rf builderrors.log - - ${MAKE} update || echo -n " update" >> builderrors.log -ifneq ($(HOST_MACHINE),armeb) - - ${MAKE} build-openslug upload-openslug || echo -n " openslug" >> builderrors.log - - ${MAKE} build-ucslugc upload-ucslugc || echo -n " ucslugc" >> builderrors.log - - ${MAKE} build-unslung upload-unslung-modules || echo -n " unslung" >> builderrors.log -else -ifeq ($(HOST_FIRMWARE),OpenSlug) - rm -rf openslug/tmp/cache - - ${MAKE} build-openslug upload-openslug || echo -n " openslug" >> builderrors.log -endif -endif -ifneq ($(HOST_MACHINE),armeb) - - ${MAKE} build-optware-nslu2 upload-optware-nslu2 || echo -n " optware/nslu2" >> builderrors.log - - ${MAKE} build-optware-wl500g upload-optware-wl500g || echo -n " optware/wl500g" >> builderrors.log - - ${MAKE} build-optware-ds101 upload-optware-ds101 || echo -n " optware/ds101" >> builderrors.log - - ${MAKE} build-optware-ds101g upload-optware-ds101g || echo -n " optware/ds101g" >> builderrors.log -else -ifeq ($(HOST_FIRMWARE),Unslung) - - ${MAKE} build-optware-nslu2 upload-optware-nslu2 || echo -n " optware/nslu2" >> builderrors.log -endif -endif - - ${MAKE} upload-sources || echo -n " upload-sources" >> builderrors.log - - date - if [ -e builderrors.log ] ; then \ - echo -n "*** Errors during autobuild:" ; \ - cat builderrors.log ; \ - echo " ***" ; \ - if [ -e autobuild.log ] ; then \ - rsync autobuild.log slug@nugabe.nslu2-linux.org:htdocs/logs/buildlogs/autobuild-`hostname`-last.txt ; \ - fi \ - else \ - if [ -e autobuild.log ] ; then \ - ssh slug@nugabe.nslu2-linux.org mv htdocs/logs/buildlogs/autobuild-`hostname`-last.txt htdocs/logs/buildlogs/autobuild-`hostname`-prev.txt ; \ - rsync autobuild.log slug@nugabe.nslu2-linux.org:htdocs/logs/buildlogs/autobuild-`hostname`-last.txt ; \ - fi \ - fi - -.PHONY: upload -ifneq ($(HOST_MACHINE),armeb) -upload: upload-openslug upload-ucslugc upload-unslung-modules \ - upload-optware-nslu2 upload-optware-wl500g upload-optware-ds101 upload-optware-ds101g upload-sources -else -ifeq ($(HOST_FIRMWARE),OpenSlug) -upload: upload-openslug upload-sources -else -ifeq ($(HOST_FIRMWARE),Unslung) -upload: upload-optware-nslu2 upload-sources -else -upload: upload-sources -endif -endif -endif - -.PHONY: upload-openslug -upload-openslug: openslug/.configured - rm -rf openslug/tmp/deploy/ipk/morgue -ifneq ($(HOST_MACHINE),armeb) - rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/unstable - rsync -vl openslug/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ - rsync -vlrt --delete openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/unstable -else - rsync -vlrt --exclude='Packages*' openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/native/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/native/unstable - rsync -vl openslug/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/native/unstable/ - rsync -vlrt --delete openslug/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/native/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/native/unstable -endif - -upload-openslug-%-beta: releases/OpenSlug-%-beta/.configured - rm -rf releases/OpenSlug-$*-beta/tmp/deploy/ipk/morgue - rsync -vlrt --exclude='Packages*' releases/OpenSlug-$*-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/$*-beta/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk openslug/cross/$*-beta - rsync -vl releases/OpenSlug-$*-beta/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/$*-beta/ - rsync -vlrt --delete releases/OpenSlug-$*-beta/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/openslug/cross/$*-beta/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean openslug/cross/$*-beta - -.PHONY: upload-ucslugc -upload-ucslugc: ucslugc/.configured - rm -rf ucslugc/tmp/deploy/ipk/morgue - rsync -vlrt --exclude='Packages*' ucslugc/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk ucslugc/cross/unstable - rsync -vl ucslugc/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ - rsync -vlrt --delete ucslugc/tmp/deploy/ipk/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/ucslugc/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean ucslugc/cross/unstable - -.PHONY: upload-unslung-modules -upload-unslung-modules: unslung/.configured - rm -rf unslung/tmp/deploy/ipk/morgue - scripts/package-strip.pl kernel-module-\* unslung/tmp/deploy/ipk/Packages unslung/tmp/deploy/ipk/Packages.new - mv unslung/tmp/deploy/ipk/Packages.new unslung/tmp/deploy/ipk/Packages - rm -f unslung/tmp/deploy/ipk/Packages.gz - gzip -c unslung/tmp/deploy/ipk/Packages > unslung/tmp/deploy/ipk/Packages.gz - rsync -vlt unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/modules/stable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk unslung/modules/stable - rsync -vl unslung/tmp/deploy/ipk/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/modules/stable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean unslung/modules/stable -# rsync -vlt --delete unslung/tmp/deploy/ipk/kernel-module-* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/unslung/modules/stable/ - -.PHONY: upload-optware-nslu2 -upload-optware-nslu2: optware/nslu2/.configured -ifneq ($(HOST_MACHINE),armeb) - rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk optware/nslu2/cross/unstable - rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/cross/unstable/ - rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean optware/nslu2/cross/unstable -else - rsync -vlrt --exclude='Packages*' optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/native/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk optware/nslu2/native/unstable - rsync -vl optware/nslu2/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/native/unstable/ - rsync -vlrt --delete optware/nslu2/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/nslu2/native/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean optware/nslu2/native/unstable -endif - -.PHONY: upload-optware-% -upload-optware-%: optware/%/.configured - rsync -vlrt --exclude='Packages*' optware/$*/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/$*/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-ipk optware/$*/cross/unstable - rsync -vl optware/$*/packages/Packages* slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/$*/cross/unstable/ - rsync -vlrt --delete optware/$*/packages/ slug@nugabe.nslu2-linux.org:htdocs/ipkg/feeds/optware/$*/cross/unstable/ - ssh nslu2@sources.nslu2-linux.org mirror/sync-packages-clean optware/$*/cross/unstable - -.PHONY: upload-sources -upload-sources: - rsync -vlrt --exclude='ixp400*' downloads/ nslu2@sources.nslu2-linux.org:ipkg/sources/ - .PHONY: import-bitbake import-bitbake: bitbake/.configured mv bitbake bitbake.old -- cgit v1.2.3 From 61582a6aad4cada89081a682c82a456e4d2811eb Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 28 Sep 2005 08:43:55 +0000 Subject: Added foo-kernel targets --- Makefile | 52 +++++++++++++++++++++++++------------------------- common/openembedded.mk | 4 ++++ 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 84b8bde8f3..aec0489e3b 100644 --- a/Makefile +++ b/Makefile @@ -70,14 +70,6 @@ else prefetch-unslung: endif -.PHONY: prefetch-unslung-binary-kernel -ifneq ($(HOST_MACHINE),armeb) -prefetch-unslung-binary-kernel: unslung-binary-kernel/.configured bitbake/.configured openembedded/.configured - ( cd unslung-binary-kernel ; ${MAKE} prefetch ) -else -prefetch-unslung-binary-kernel: -endif - .PHONY: prefetch-openslug ifneq ($(HOST_MACHINE),armeb) prefetch-openslug: openslug/.configured bitbake/.configured openembedded/.configured @@ -134,14 +126,6 @@ else unslung build-unslung: endif -.PHONY: unslung-binary-kernel build-unslung-binary-kernel -ifneq ($(HOST_MACHINE),armeb) -unslung-binary-kernel build-unslung-binary-kernel: unslung-binary-kernel/.configured bitbake/.configured openembedded/.configured - ( cd unslung-binary-kernel ; ${MAKE} ) -else -unslung-binary-kernel build-unslung-binary-kernel: -endif - .PHONY: openslug build-openslug ifneq ($(HOST_MACHINE),armeb) openslug build-openslug: openslug/.configured bitbake/.configured openembedded/.configured @@ -187,6 +171,30 @@ else ucslugc-image build-ucslugc-image: endif +.PHONY: unslung-kernel build-unslung-kernel +ifneq ($(HOST_MACHINE),armeb) +unslung-kernel build-unslung-kernel: unslung/.configured bitbake/.configured openembedded/.configured + ( cd unslung ; ${MAKE} kernel) +else +unslung-kernel build-unslung-kernel: +endif + +.PHONY: openslug-kernel build-openslug-kernel +ifneq ($(HOST_MACHINE),armeb) +openslug-kernel build-openslug-kernel: openslug/.configured bitbake/.configured openembedded/.configured + ( cd openslug ; ${MAKE} kernel ) +else +openslug-kernel build-openslug-kernel: +endif + +.PHONY: ucslugc-kernel build-ucslugc-kernel +ifneq ($(HOST_MACHINE),armeb) +ucslugc-kernel build-ucslugc-kernel: ucslugc/.configured bitbake/.configured openembedded/.configured + ( cd ucslugc ; ${MAKE} kernel) +else +ucslugc-kernel build-ucslugc-kernel: +endif + .PHONY: build-optware build-optware: build-optware-nslu2 build-optware-wl500g build-optware-ds101 build-optware-ds101g @@ -282,8 +290,8 @@ setup-optware-developer: cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung ${MAKE} setup-optware -.PHONY: setup-unslung setup-unslung-binary-kernel setup-openslug setup-ucslugc -setup-unslung setup-unslung-binary-kernel setup-openslug setup-ucslugc: setup-%: MT/.configured +.PHONY: setup-unslung setup-openslug setup-ucslugc +setup-unslung setup-openslug setup-ucslugc: setup-%: MT/.configured rm -rf $*/.configured ${MAKE} $*/.configured @@ -510,10 +518,6 @@ status-openslug-%-beta: clobber-unslung: [ ! -e unslung/Makefile ] || ( cd unslung ; ${MAKE} clobber ) -.PHONY: clobber-unslung-binary-kernel -clobber-unslung-binary-kernel: - [ ! -e unslung-binary-kernel/Makefile ] || ( cd unslung-binary-kernel ; ${MAKE} clobber ) - .PHONY: clobber-openslug clobber-openslug: [ ! -e openslug/Makefile ] || ( cd openslug ; ${MAKE} clobber ) @@ -545,10 +549,6 @@ distclean-openembedded: distclean-unslung: rm -rf unslung -.PHONY: distclean-unslung-binary-kernel -distclean-unslung-binary-kernel: - rm -rf unslung-binary-kernel - .PHONY: distclean-openslug distclean-openslug: rm -rf openslug diff --git a/common/openembedded.mk b/common/openembedded.mk index bf691ce069..cf452cf721 100644 --- a/common/openembedded.mk +++ b/common/openembedded.mk @@ -25,6 +25,10 @@ distro: $(FIRMWARE_DEPS) image: $(FIRMWARE_DEPS) . ./setup-env; exec ${BITBAKE} $(DISTRO)-image +# The default rule is to build the firmware in an unprotected environment. +kernel: $(FIRMWARE_DEPS) + . ./setup-env; exec ${BITBAKE} virtual/kernel + # This rule clobbers the environment (note that ccache uses '$HOME' by # default, so the cache will end up there). distro-safe: -- cgit v1.2.3 From 7d0a002ab020ee056426dab23a047b1bda765dc6 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 20 Oct 2005 15:31:59 +0000 Subject: Added 20051016 snapshot (now supports 2.6.14) --- openembedded/.mtn2git_empty | 0 openembedded/packages/.mtn2git_empty | 0 openembedded/packages/pvrusb2-mci/.mtn2git_empty | 0 .../pvrusb2-mci-20051016/.mtn2git_empty | 0 .../pvrusb2-mci-20051016/Makefile.patch | 15 +++++++++++ .../packages/pvrusb2-mci/pvrusb2-mci_20051016.bb | 29 ++++++++++++++++++++++ 6 files changed, 44 insertions(+) create mode 100644 openembedded/.mtn2git_empty create mode 100644 openembedded/packages/.mtn2git_empty create mode 100644 openembedded/packages/pvrusb2-mci/.mtn2git_empty create mode 100644 openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty create mode 100644 openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch create mode 100644 openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb diff --git a/openembedded/.mtn2git_empty b/openembedded/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openembedded/packages/.mtn2git_empty b/openembedded/packages/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openembedded/packages/pvrusb2-mci/.mtn2git_empty b/openembedded/packages/pvrusb2-mci/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty b/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch b/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch new file mode 100644 index 0000000000..829c741b69 --- /dev/null +++ b/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch @@ -0,0 +1,15 @@ +--- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000 ++++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000 +@@ -37,10 +37,10 @@ + all: modules + + modules modules_install clean: +- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ + + install: +- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install + + else + diff --git a/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb b/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb new file mode 100644 index 0000000000..6b27baf17b --- /dev/null +++ b/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "dyoung " +LICENSE = "GPL" +PR = "r0" +# It in fact requires these modules, but for now is using the local ones. +# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051016.tar.bz2 \ + file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-20051016/driver" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-D__LINUX_ARM_ARCH__=5'" + +EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} + -- cgit v1.2.3 From 7adabd7dffa510d614b4a681c912909b354c1ed6 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 5 Nov 2005 21:33:13 +0000 Subject: pvrusb2-mci: also pass TARGET_CFLAGS to the make command in order to get all comnpiler flags. (actually this is not really satisfying as it should pick this up from the kernel config, but it doesn't and despite several hours of debugging I did not manage to find the cause. This patch works around the problem) --- openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch | 4 ++-- openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch b/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch index 829c741b69..b79c42e2c5 100644 --- a/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch +++ b/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch @@ -5,11 +5,11 @@ modules modules_install clean: - $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ install: - $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install else diff --git a/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb b/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb index 6b27baf17b..bd3362c730 100644 --- a/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb +++ b/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" SECTION = "kernel/modules" MAINTAINER = "dyoung " LICENSE = "GPL" -PR = "r0" +PR = "r1" # It in fact requires these modules, but for now is using the local ones. # RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" -- cgit v1.2.3 From 6229c268c24c9516841060ea34c483c84cd6cd82 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 26 Nov 2005 19:33:30 +0000 Subject: pvrusb2-mci: added release 20051113 --- openslug/.mtn2git_empty | 0 openslug/openembedded/.mtn2git_empty | 0 openslug/openembedded/packages/.mtn2git_empty | 0 .../packages/pvrusb2-mci/.mtn2git_empty | 0 .../pvrusb2-mci-20051113/.mtn2git_empty | 0 .../pvrusb2-mci-20051113/Makefile.patch | 15 ++++++++ .../packages/pvrusb2-mci/pvrusb2-mci_20051113.bb | 41 ++++++++++++++++++++++ 7 files changed, 56 insertions(+) create mode 100644 openslug/.mtn2git_empty create mode 100644 openslug/openembedded/.mtn2git_empty create mode 100644 openslug/openembedded/packages/.mtn2git_empty create mode 100644 openslug/openembedded/packages/pvrusb2-mci/.mtn2git_empty create mode 100644 openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty create mode 100644 openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch create mode 100644 openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb diff --git a/openslug/.mtn2git_empty b/openslug/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openslug/openembedded/.mtn2git_empty b/openslug/openembedded/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openslug/openembedded/packages/.mtn2git_empty b/openslug/openembedded/packages/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openslug/openembedded/packages/pvrusb2-mci/.mtn2git_empty b/openslug/openembedded/packages/pvrusb2-mci/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty b/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch b/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch new file mode 100644 index 0000000000..b79c42e2c5 --- /dev/null +++ b/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch @@ -0,0 +1,15 @@ +--- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000 ++++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000 +@@ -37,10 +37,10 @@ + all: modules + + modules modules_install clean: +- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ + + install: +- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install + + else + diff --git a/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb new file mode 100644 index 0000000000..5ac677e329 --- /dev/null +++ b/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "dyoung " +LICENSE = "GPL" +PR = "r0" +# It in fact requires these modules, but for now is using the local ones. +# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2" + +#SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2 \ +# file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-20051113" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-D__LINUX_ARM_ARCH__=5'" + +EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ + -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib" + + +do_compile() { + cd ivtv; oe_runmake + cd ../driver; oe_runmake +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} + -- cgit v1.2.3 From 0dd6ab7a56866cbedbcba43115530ff9e42b86e5 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 26 Nov 2005 23:04:34 +0000 Subject: cdstatus created package (rel 0.96.05) --- .../openembedded/packages/cdstatus/.mtn2git_empty | 0 .../packages/cdstatus/cdstatus-0.96.05.bb | 25 ++++ .../cdstatus/cdstatus-0.96.05/.mtn2git_empty | 0 .../cdstatus/cdstatus-0.96.05/cdstatus.patch | 131 +++++++++++++++++++++ 4 files changed, 156 insertions(+) create mode 100644 openslug/openembedded/packages/cdstatus/.mtn2git_empty create mode 100644 openslug/openembedded/packages/cdstatus/cdstatus-0.96.05.bb create mode 100644 openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty create mode 100644 openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch diff --git a/openslug/openembedded/packages/cdstatus/.mtn2git_empty b/openslug/openembedded/packages/cdstatus/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05.bb b/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05.bb new file mode 100644 index 0000000000..1ae728f836 --- /dev/null +++ b/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05.bb @@ -0,0 +1,25 @@ +# cdstatus OE build file + +PR="r0" +LICENSE="GPL" +HOMEPAGE = "http://cdstatus.sourceforge.net/" +FILES_${PN} += ${datadir}/cdstatus.cfg + +SRC_URI="${SOURCEFORGE_MIRROR}/cdstatus/cdstatus-0.96.05.tar.gz \ + file://cdstatus.patch;patch=1" + +S="${WORKDIR}/cdstatus-0.96.05" + +inherit autotools + +TARGET_LDFLAGS="" + +do_install() { + install -d 0755 ${D}/${bindir} + install -d 0755 ${D}/${datadir} + install -d 0755 ${D}/${mandir} + install -m 0755 src/cdstatus ${D}/${bindir} + install -m 0644 cdstatus.cfg ${D}/${datadir} + install -m 0644 cdstatus.1 ${D}/${mandir} + +} diff --git a/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty b/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch b/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch new file mode 100644 index 0000000000..913cd721e0 --- /dev/null +++ b/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch @@ -0,0 +1,131 @@ +*** cdstatus-0.96.05/src/cdstatus.c.orig 2005-11-26 16:23:27.000000000 +0100 +--- cdstatus-0.96.05/src/cdstatus.c 2005-11-26 19:06:57.000000000 +0100 +*************** +*** 436,441 **** +--- 436,501 ---- + return 0; + } + ++ /* following code copied from ++ http://www.gamedev.net/reference/articles/article2091.asp ++ it has been slightly modified as we did not have a reason to output ++ big endian or float ++ */ ++ static short ShortSwap( short s ) ++ { ++ unsigned char b1, b2; ++ ++ b1 = s & 255; ++ b2 = (s >> 8) & 255; ++ ++ return (b1 << 8) + b2; ++ } ++ ++ static short ShortNoSwap( short s ) ++ { ++ return s; ++ } ++ ++ static int LongSwap (int i) ++ { ++ unsigned char b1, b2, b3, b4; ++ ++ b1 = i & 255; ++ b2 = ( i >> 8 ) & 255; ++ b3 = ( i>>16 ) & 255; ++ b4 = ( i>>24 ) & 255; ++ ++ return ((int)b1 << 24) + ((int)b2 << 16) + ((int)b3 << 8) + b4; ++ } ++ ++ static int LongNoSwap( int i ) ++ { ++ return i; ++ } ++ ++ static short (*LittleShort) ( short s ); ++ static int (*LittleLong) ( int i ); ++ ++ static void InitEndian( void ) ++ { ++ char SwapTest[2] = { 1, 0 }; ++ ++ if( *(short *) SwapTest == 1 ) ++ { ++ // little endian ++ //set func pointers to correct funcs ++ LittleShort = ShortNoSwap; ++ LittleLong = LongNoSwap; ++ } ++ else ++ { ++ // big endian ++ LittleShort = ShortSwap; ++ LittleLong = LongSwap; ++ } ++ } ++ /* end of copied code */ ++ + static void writeWavHeader(unsigned int readframes, FILE * audio_out) + { + long int chunksize; +*************** +*** 456,478 **** + + wavHeader wHeader; + + /* "RIFF" */ +! wHeader.RIFF_header = 0x46464952; + + chunksize = readframes * CD_FRAMESIZE_RAW; +! wHeader.total_size = (int32_t)(chunksize + sizeof(wavHeader)); + + /* "WAVEfmt " */ +! wHeader.WAVE = 0x45564157; +! wHeader.fmt = 0x20746D66; + +! wHeader.subchunk_size = 16; +! wHeader.audio_format = 1; +! wHeader.number_channels = 2; +! wHeader.sampling_rate = 44100; +! wHeader.byte_rate = 176400; +! wHeader.block_align = 4; +! wHeader.bits_per_sample = 16; + + if(fwrite((const void *) &wHeader, sizeof(wavHeader), (size_t) 1, audio_out)!=1) + { +--- 516,539 ---- + + wavHeader wHeader; + ++ InitEndian(); + /* "RIFF" */ +! wHeader.RIFF_header = LittleLong(0x46464952); + + chunksize = readframes * CD_FRAMESIZE_RAW; +! wHeader.total_size = LittleLong((int32_t)(chunksize + sizeof(wavHeader))); + + /* "WAVEfmt " */ +! wHeader.WAVE = LittleLong(0x45564157); +! wHeader.fmt = LittleLong(0x20746D66); + +! wHeader.subchunk_size = LittleLong(16); +! wHeader.audio_format = LittleShort(1); +! wHeader.number_channels = LittleShort(2); +! wHeader.sampling_rate = LittleLong(44100); +! wHeader.byte_rate = LittleLong(176400); +! wHeader.block_align = LittleShort(4); +! wHeader.bits_per_sample = LittleShort(16); + + if(fwrite((const void *) &wHeader, sizeof(wavHeader), (size_t) 1, audio_out)!=1) + { +*************** +*** 492,497 **** +--- 553,559 ---- + } + exit(EXIT_FAILURE); + } ++ chunksize = LittleLong(chunksize); + if(fwrite((const void *) &chunksize, sizeof(long int), (size_t) 1, audio_out)!=1) + { + perror("Error writing wav file chunksize header"); -- cgit v1.2.3 From 67e02356abe26ec5c8fd4cf5b183a52f2631092e Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 29 Nov 2005 08:20:29 +0000 Subject: cdstatus: added unneeded definition of TARGET_LDFLAGS in .bb file --- packages/cdstatus/cdstatus-0.96.05.bb | 4 +--- packages/ixp4xx/ixp4xx-csr_2.1.bb | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/packages/cdstatus/cdstatus-0.96.05.bb b/packages/cdstatus/cdstatus-0.96.05.bb index 1ae728f836..a2b3a0484a 100644 --- a/packages/cdstatus/cdstatus-0.96.05.bb +++ b/packages/cdstatus/cdstatus-0.96.05.bb @@ -1,6 +1,6 @@ # cdstatus OE build file -PR="r0" +PR="r1" LICENSE="GPL" HOMEPAGE = "http://cdstatus.sourceforge.net/" FILES_${PN} += ${datadir}/cdstatus.cfg @@ -12,8 +12,6 @@ S="${WORKDIR}/cdstatus-0.96.05" inherit autotools -TARGET_LDFLAGS="" - do_install() { install -d 0755 ${D}/${bindir} install -d 0755 ${D}/${datadir} diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb index f8b29f11f1..4b3482c838 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb @@ -89,20 +89,20 @@ do_stage () { # Since Module.symvers in the kernel staging directory doesn't include # the symbols from ixp400.o we need to add them to another file for # the ixp400-eth build - rm -f '${STAGING_KERNEL_DIR}/ixp400-csr.symvers' - . '${KCONFIG_FILE}' - if '${STAGING_KERNEL_DIR}/scripts/mod/modpost' \ - ${CONFIG_MODVERSIONS:+-m} \ - ${CONFIG_MODULE_SRCVERSION_ALL:+-a} \ - -i '${STAGING_KERNEL_DIR}/Module.symvers' \ - -o '${STAGING_KERNEL_DIR}/ixp400-csr.symvers' \ - ${MAKE_TARGETS} >&2 | egrep . - then - echo "MODPOST errors - see above" - return 1 - else - return 0 - fi +# rm -f '${STAGING_KERNEL_DIR}/ixp400-csr.symvers' +# . '${KCONFIG_FILE}' +# if '${STAGING_KERNEL_DIR}/scripts/mod/modpost' \ +# ${CONFIG_MODVERSIONS:+-m} \ +# ${CONFIG_MODULE_SRCVERSION_ALL:+-a} \ +# -i '${STAGING_KERNEL_DIR}/Module.symvers' \ +# -o '${STAGING_KERNEL_DIR}/ixp400-csr.symvers' \ +# ${MAKE_TARGETS} >&2 | egrep . +# then +# echo "MODPOST errors - see above" +# return 1 +# else +# return 0 +# fi } PACKAGES = "${PN}" -- cgit v1.2.3 From fe3eab8f4b97b657330f493a774096ed44ad7866 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 25 Nov 2005 16:10:41 +0000 Subject: Fixed eFfeM's mess by removing the nslu2-linux files that he added to the wrong monotone branch. --- Makefile | 595 --------------------- common/.mtn2git_empty | 0 common/conf/.mtn2git_empty | 0 common/conf/local.conf.sample | 45 -- common/conf/site.conf | 43 -- common/openembedded.mk | 80 --- common/setup-env | 46 -- openembedded/.mtn2git_empty | 0 openembedded/packages/.mtn2git_empty | 0 openembedded/packages/pvrusb2-mci/.mtn2git_empty | 0 .../pvrusb2-mci-20051016/.mtn2git_empty | 0 .../pvrusb2-mci-20051016/Makefile.patch | 15 - .../packages/pvrusb2-mci/pvrusb2-mci_20051016.bb | 29 - openslug/.mtn2git_empty | 0 openslug/openembedded/.mtn2git_empty | 0 openslug/openembedded/packages/.mtn2git_empty | 0 .../openembedded/packages/cdstatus/.mtn2git_empty | 0 .../packages/cdstatus/cdstatus-0.96.05.bb | 25 - .../cdstatus/cdstatus-0.96.05/.mtn2git_empty | 0 .../cdstatus/cdstatus-0.96.05/cdstatus.patch | 131 ----- .../packages/pvrusb2-mci/.mtn2git_empty | 0 .../pvrusb2-mci-20051113/.mtn2git_empty | 0 .../pvrusb2-mci-20051113/Makefile.patch | 15 - .../packages/pvrusb2-mci/pvrusb2-mci_20051113.bb | 41 -- scripts/.mtn2git_empty | 0 scripts/package-strip.pl | 28 - 26 files changed, 1093 deletions(-) delete mode 100644 Makefile delete mode 100644 common/.mtn2git_empty delete mode 100644 common/conf/.mtn2git_empty delete mode 100644 common/conf/local.conf.sample delete mode 100644 common/conf/site.conf delete mode 100644 common/openembedded.mk delete mode 100644 common/setup-env delete mode 100644 openembedded/.mtn2git_empty delete mode 100644 openembedded/packages/.mtn2git_empty delete mode 100644 openembedded/packages/pvrusb2-mci/.mtn2git_empty delete mode 100644 openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty delete mode 100644 openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch delete mode 100644 openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb delete mode 100644 openslug/.mtn2git_empty delete mode 100644 openslug/openembedded/.mtn2git_empty delete mode 100644 openslug/openembedded/packages/.mtn2git_empty delete mode 100644 openslug/openembedded/packages/cdstatus/.mtn2git_empty delete mode 100644 openslug/openembedded/packages/cdstatus/cdstatus-0.96.05.bb delete mode 100644 openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty delete mode 100644 openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch delete mode 100644 openslug/openembedded/packages/pvrusb2-mci/.mtn2git_empty delete mode 100644 openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty delete mode 100644 openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch delete mode 100644 openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb delete mode 100644 scripts/.mtn2git_empty delete mode 100644 scripts/package-strip.pl diff --git a/Makefile b/Makefile deleted file mode 100644 index aec0489e3b..0000000000 --- a/Makefile +++ /dev/null @@ -1,595 +0,0 @@ -# Makefile for the NSLU2 Linux development system -# Licensed under the GPL v2 or later - -# Change these if you are unfortunate enough to have a split net personality. -SVN_USER ?= ${USER} -CVS_USER ?= ${USER} -SVN_SSH ?= "-l ${SVN_USER}" - -HOST_MACHINE:=$(shell uname -m | sed \ - -e 's/i[3-9]86/i386/' \ - -e 's/armv5teb/armeb/' \ - -e 's/armv5b/armeb/' \ - ) - -HOST_FIRMWARE:=$(shell uname -m | sed \ - -e 's/i[3-9]86/Linux/' \ - -e 's/armv5teb/OpenSlug/' \ - -e 's/armv5b/Unslung/' \ - ) - -.PHONY: all -all: update build - -.PHONY: prefetch -prefetch: prefetch-unslung prefetch-openslug prefetch-ucslugc prefetch-optware - -.PHONY: build -build: build-unslung build-openslug build-ucslugc build-optware - -.PHONY: setup -ifneq ($(HOST_MACHINE),armeb) -setup: setup-master setup-bitbake setup-openembedded setup-unslung setup-openslug setup-ucslugc setup-optware -else -ifeq ($(HOST_FIRMWARE),OpenSlug) -setup: setup-master setup-bitbake setup-openembedded setup-openslug -else -setup: setup-master setup-optware -endif -endif - -.PHONY: setup-developer -setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-developer - -.PHONY: update -ifneq ($(HOST_MACHINE),armeb) -update: update-master update-bitbake update-openembedded update-optware -else -ifeq ($(HOST_FIRMWARE),OpenSlug) -update: update-master update-bitbake update-openembedded -else -update: update-master update-optware -endif -endif - -.PHONY: status -status: status-master status-bitbake status-openembedded status-optware - -.PHONY: clobber -clobber: clobber-unslung clobber-openslug clobber-ucslugc clobber-optware - -.PHONY: distclean -distclean: distclean-master distclean-bitbake distclean-openembedded \ - distclean-unslung distclean-openslug distclean-ucslugc distclean-optware distclean-releases - -.PHONY: prefetch-unslung -ifneq ($(HOST_MACHINE),armeb) -prefetch-unslung: unslung/.configured bitbake/.configured openembedded/.configured - ( cd unslung ; ${MAKE} prefetch ) -else -prefetch-unslung: -endif - -.PHONY: prefetch-openslug -ifneq ($(HOST_MACHINE),armeb) -prefetch-openslug: openslug/.configured bitbake/.configured openembedded/.configured - ( cd openslug ; ${MAKE} prefetch ) -else -ifeq ($(HOST_FIRMWARE),OpenSlug) -prefetch-openslug: openslug/.configured bitbake/.configured openembedded/.configured - ( cd openslug ; ${MAKE} prefetch ) -else -prefetch-openslug: -endif -endif - -.PHONY: prefetch-ucslugc -ifneq ($(HOST_MACHINE),armeb) -prefetch-ucslugc: ucslugc/.configured bitbake/.configured openembedded/.configured - ( cd ucslugc ; ${MAKE} prefetch ) -else -prefetch-ucslugc: -endif - -.PHONY: prefetch-optware -prefetch-optware: prefetch-optware-nslu2 prefetch-optware-wl500g prefetch-optware-ds101 prefetch-optware-ds101g - -.PHONY: prefetch-optware-nslu2 -ifneq ($(HOST_MACHINE),armeb) -prefetch-optware-nslu2: optware/nslu2/.configured - ( cd optware/nslu2 ; ${MAKE} source ) -else -ifeq ($(HOST_FIRMWARE),Unslung) -prefetch-optware-nslu2: optware/nslu2/.configured - ( cd optware/nslu2 ; ${MAKE} source ) -else -prefetch-optware-nslu2: -endif -endif - -.PHONY: prefetch-optware-% -ifneq ($(HOST_MACHINE),armeb) -prefetch-optware-%: optware/%/.configured - ( cd optware/$* ; ${MAKE} source ) -else -prefetch-optware-%: -endif - -prefetch-openslug-%-beta: releases/OpenSlug-%-beta/.configured - ( cd releases/OpenSlug-$*-beta ; ${MAKE} prefetch ) - -.PHONY: unslung build-unslung -ifneq ($(HOST_MACHINE),armeb) -unslung build-unslung: unslung/.configured bitbake/.configured openembedded/.configured - ( cd unslung ; ${MAKE} ) -else -unslung build-unslung: -endif - -.PHONY: openslug build-openslug -ifneq ($(HOST_MACHINE),armeb) -openslug build-openslug: openslug/.configured bitbake/.configured openembedded/.configured - ( cd openslug ; ${MAKE} ) -else -ifeq ($(HOST_FIRMWARE),OpenSlug) -openslug build-openslug: openslug/.configured bitbake/.configured openembedded/.configured - ( cd openslug ; ${MAKE} ) -else -openslug build-openslug: -endif -endif - -.PHONY: ucslugc build-ucslugc -ifneq ($(HOST_MACHINE),armeb) -ucslugc build-ucslugc: ucslugc/.configured bitbake/.configured openembedded/.configured - ( cd ucslugc ; ${MAKE} ) -else -ucslugc build-ucslugc: -endif - -.PHONY: unslung-image build-unslung-image -ifneq ($(HOST_MACHINE),armeb) -unslung-image build-unslung-image: unslung/.configured bitbake/.configured openembedded/.configured - ( cd unslung ; ${MAKE} image) -else -unslung-image build-unslung-image: -endif - -.PHONY: openslug-image build-openslug-image -ifneq ($(HOST_MACHINE),armeb) -openslug-image build-openslug-image: openslug/.configured bitbake/.configured openembedded/.configured - ( cd openslug ; ${MAKE} image ) -else -openslug-image build-openslug-image: -endif - -.PHONY: ucslugc-image build-ucslugc-image -ifneq ($(HOST_MACHINE),armeb) -ucslugc-image build-ucslugc-image: ucslugc/.configured bitbake/.configured openembedded/.configured - ( cd ucslugc ; ${MAKE} image) -else -ucslugc-image build-ucslugc-image: -endif - -.PHONY: unslung-kernel build-unslung-kernel -ifneq ($(HOST_MACHINE),armeb) -unslung-kernel build-unslung-kernel: unslung/.configured bitbake/.configured openembedded/.configured - ( cd unslung ; ${MAKE} kernel) -else -unslung-kernel build-unslung-kernel: -endif - -.PHONY: openslug-kernel build-openslug-kernel -ifneq ($(HOST_MACHINE),armeb) -openslug-kernel build-openslug-kernel: openslug/.configured bitbake/.configured openembedded/.configured - ( cd openslug ; ${MAKE} kernel ) -else -openslug-kernel build-openslug-kernel: -endif - -.PHONY: ucslugc-kernel build-ucslugc-kernel -ifneq ($(HOST_MACHINE),armeb) -ucslugc-kernel build-ucslugc-kernel: ucslugc/.configured bitbake/.configured openembedded/.configured - ( cd ucslugc ; ${MAKE} kernel) -else -ucslugc-kernel build-ucslugc-kernel: -endif - -.PHONY: build-optware -build-optware: build-optware-nslu2 build-optware-wl500g build-optware-ds101 build-optware-ds101g - -.PHONY: optware-nslu2 build-optware-nslu2 -ifneq ($(HOST_MACHINE),armeb) -optware-nslu2 build-optware-nslu2: optware/nslu2/.configured - ( cd optware/nslu2 ; ${MAKE} autoclean ; ${MAKE} ) -else -ifeq ($(HOST_FIRMWARE),Unslung) -optware-nslu2 build-optware-nslu2: optware/nslu2/.configured - ( cd optware/nslu2 ; ${MAKE} autoclean ; ${MAKE} ) -else -optware-nslu2 build-optware-nslu2: -endif -endif - -.PHONY: optware-wl500g build-optware-wl500g -ifneq ($(HOST_MACHINE),armeb) -optware-wl500g build-optware-wl500g: optware/wl500g/.configured - ( cd optware/wl500g ; ${MAKE} autoclean ; ${MAKE} ) -else -optware-wl500g build-optware-wl500g: -endif - -.PHONY: optware-ds101 build-optware-ds101 -ifneq ($(HOST_MACHINE),armeb) -optware-ds101 build-optware-ds101: optware/ds101/.configured - ( cd optware/ds101 ; ${MAKE} autoclean ; ${MAKE} ) -else -optware-ds101 build-optware-ds101: -endif - -.PHONY: optware-ds101g build-optware-ds101g -ifneq ($(HOST_MACHINE),armeb) -optware-ds101g build-optware-ds101g: optware/ds101g/.configured - ( cd optware/ds101g ; ${MAKE} autoclean ; ${MAKE} ) -else -optware-ds101g build-optware-ds101g: -endif - -openslug-%-beta: update-openslug-%-beta build-openslug-%-beta - echo "$@ completed" - -build-openslug-2.3-beta: releases/OpenSlug-2.3-beta/.configured - ( cd releases/OpenSlug-2.3-beta ; ${MAKE} openslug-firmware ) - -build-openslug-%-beta: releases/OpenSlug-%-beta/.configured - ( cd releases/OpenSlug-$*-beta ; ${MAKE} firmware ) - -.PHONY: setup-master -setup-master MT/.configured: - [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && \ - wget http://sources.nslu2-linux.org/monotone/nslu2-linux.db.gz -O monotone/nslu2-linux.db.gz && \ - gunzip monotone/nslu2-linux.db.gz ) - - ( monotone -d monotone/nslu2-linux.db unset database default-server ) - - ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) - ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.{nslu2-linux.*,openembedded.dev} ) - [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) - touch MT/.configured - -.PHONY: setup-bitbake -setup-bitbake bitbake/.configured: MT/.configured - [ -e bitbake/bin/bitbake ] || monotone co -b org.nslu2-linux.bitbake bitbake - touch bitbake/.configured - -.PHONY: setup-openembedded -setup-openembedded openembedded/.configured: MT/.configured - [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.dev openembedded - touch openembedded/.configured - -.PHONY: setup-optware -setup-optware optware/.configured: MT/.configured - [ -e downloads ] || ( mkdir -p downloads ) - [ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) - touch optware/.configured - -# This pattern rule has to come before the subsequent %/.configured openembedded pattern rule. -optware/%/.configured: optware/.configured - [ -e optware/$*/Makefile ] || ( \ - mkdir -p optware/$* ; \ - echo "OPTWARE_TARGET=$*" > optware/$*/Makefile ; \ - echo "include ../Makefile" >> optware/$*/Makefile ; \ - ln -s ../../downloads optware/$*/downloads ; \ - ln -s ../make optware/$*/make ; \ - ln -s ../scripts optware/$*/scripts ; \ - ln -s ../sources optware/$*/sources ; \ - ) - touch optware/$*/.configured - -.PHONY: setup-optware-developer -setup-optware-developer: - [ ! -e optware ] || ( mv optware optware-user ) - cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung - ${MAKE} setup-optware - -.PHONY: setup-unslung setup-openslug setup-ucslugc -setup-unslung setup-openslug setup-ucslugc: setup-%: MT/.configured - rm -rf $*/.configured - ${MAKE} $*/.configured - -%/.configured: MT/.configured - [ -d $* ] || ( mkdir -p $* ) - [ -e downloads ] || ( mkdir -p downloads ) - [ -L $*/Makefile -o ! -e $*/Makefile ] || ( cd $* ; mv Makefile Makefile.delete-me) - [ -e $*/Makefile ] || ( cd $* ; ln -s ../common/openembedded.mk Makefile ) - [ -L $*/setup-env -o ! -e $*/setup-env ] || ( cd $* ; mv setup-env setup-env.delete-me ) - [ -e $*/setup-env ] || ( cd $* ; ln -s ../common/setup-env . ) - [ -e $*/downloads ] || ( cd $* ; ln -s ../downloads . ) - [ -e $*/bitbake ] || ( cd $* ; ln -s ../bitbake . ) - [ -e $*/openembedded ] || ( cd $* ; ln -s ../openembedded . ) - [ -d $*/conf ] || ( mkdir -p $*/conf ) - [ ! -f $*/conf/local.conf -o -e $*/conf/auto.conf ] || ( cd $*/conf ; mv local.conf local.conf.delete-me ) - [ -e $*/conf/local.conf.sample ] || ( cd $*/conf ; ln -s ../../common/conf/local.conf.sample . ) - [ -e $*/conf/site.conf ] || ( cd $*/conf ; ln -s ../../common/conf/site.conf . ) - [ ! -f $*/conf/auto.conf ] || ( cd $*/conf ; rm -f auto.conf ) - [ -e $*/conf/auto.conf ] || ( \ - if [ "${HOST_MACHINE}" = "armeb" ] ; then \ - echo "DISTRO=\"$*-native\"" > $*/conf/auto.conf ; \ - else \ - echo "DISTRO=\"$*\"" > $*/conf/auto.conf ; \ - fi ; \ - echo "MACHINE=\"nslu2\"" >> $*/conf/auto.conf \ - ) - rm -rf $*/tmp/cache - touch $*/.configured - -.PHONY: setup-slugimage-developer -setup-slugimage-developer: - cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co slugimage - -.PHONY: setup-upslug-developer -setup-upslug-developer: - cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co upslug - -.PHONY: setup-sluggo-developer -setup-sluggo-developer: - cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co sluggo - -.PHONY: setup-apex -setup-apex apex/Makefile: - cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co apex - -.PHONY: setup-apex-developer -setup-apex-developer: - cvs -q -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co apex - -setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/.configured: - [ -e releases/OpenSlug-2.3-beta ] || ( \ - mkdir -p releases ; \ - svn checkout svn://svn.berlios.de/openslug/releases/OpenSlug-2.3-beta \ - releases/OpenSlug-2.3-beta \ - ) - ( cd releases/OpenSlug-2.3-beta ; ${MAKE} conf/local.conf setup-env ) - [ -e downloads ] || ( mkdir -p downloads ) - [ -e releases/OpenSlug-2.3-beta/downloads ] || ln -s ../../downloads releases/OpenSlug-2.3-beta/ - touch releases/OpenSlug-2.3-beta/.configured - -setup-openslug-%-beta releases/OpenSlug-%-beta/.configured: - [ -e releases/OpenSlug-$*-beta ] || ( \ - mkdir -p releases ; \ - svn checkout svn://svn.berlios.de/openslug/releases/OpenSlug-$*-beta \ - releases/OpenSlug-$*-beta \ - ) - ( cd releases/OpenSlug-$*-beta ; ${MAKE} setup-env ) - [ -e downloads ] || ( mkdir -p downloads ) - [ -e releases/OpenSlug-$*-beta/downloads ] || ln -s ../../downloads releases/OpenSlug-$*-beta/ - touch releases/OpenSlug-$*-beta/.configured - -setup-openslug-%-beta-developer: - [ -e releases/OpenSlug-$*-beta ] || ( \ - mkdir -p releases ; \ - svn checkout svn+ssh://svn.berlios.de/svnroot/repos/openslug/releases/OpenSlug-$*-beta \ - releases/OpenSlug-$*-beta \ - ) - ${MAKE} setup-openslug-$*-beta - -.PHONY: setup-host-debian -setup-host-debian: - su - -c " \ - apt-get install \ - autoconf automake automake1.9 \ - bison \ - ccache \ - cvs \ - docbook \ - flex \ - g++ gawk gcj gettext \ - libc6-dev libglib2.0-dev libtool \ - m4 make \ - patch pkg-config \ - python python-dev python-psyco python2.4 python2.4-dev \ - sed \ - texinfo \ - unzip \ - subversion \ - bzip2 ;\ - echo You will have to install monotone separately. See http://venge.net/monotone/ \ - " - -.PHONY: setup-host-ubuntu -setup-host-ubuntu: - su - -c " \ - apt-get install \ - autoconf automake automake1.9 \ - bison \ - ccache \ - cvs \ - docbook \ - flex \ - gcc g++ gawk gcj gettext \ - libc6-dev libglib2.0-dev libtool \ - m4 make \ - patch pkg-config \ - python python-dev python2.4 python2.4-dev \ - sed \ - texinfo \ - unzip \ - subversion \ - texinfo \ - bzip2 ;\ - echo You will have to install monotone separately. See http://venge.net/monotone/ \ - echo To get python2.4-psyco (Recommended to speed up builds), please read \ - echo http://ubuntuguide.org/#extrarepositories \ - " - - -.PHONY: setup-host-gentoo -setup-host-gentoo: - su - -c "mkdir -p /etc/portage ; echo >> /etc/portage/package.keywords ; \ - grep monotone-0.22 /etc/portage/package.keywords || \ - echo ~dev-util/monotone-0.22 ~* >> /etc/portage/package.keywords ; \ - grep dev-libs/boost-1.32.0 /etc/portage/package.keywords || \ - echo ~dev-libs/boost-1.32.0 ~* >> /etc/portage/package.keywords ; \ - emerge -n \ - autoconf automake \ - bison \ - ccache \ - cvs \ - flex \ - glib \ - libtool \ - m4 \ - make \ - monotone \ - patch \ - pkgconfig \ - sed \ - sys-apps/texinfo \ - unzip \ - psyco \ - subversion \ - bzip2" - -.PHONY: update-master -update-master: MT/.configured -# if [ `monotone -d monotone/nslu2-linux.db list keys nslu2-linux@nslu2-linux.org | wc -l` = 8 ] ; then \ -# monotone -d monotone/nslu2-linux.db dropkey nslu2-linux@nslu2-linux.org ; \ -# fi - monotone pull - if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ - monotone merge -b org.nslu2-linux.dev ; \ - fi - monotone update - if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ - monotone merge -b org.nslu2-linux.dev ; \ - fi - -.PHONY: update-bitbake -update-bitbake: bitbake/.configured - monotone pull - if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1" ] ; then \ - monotone merge -b org.nslu2-linux.bitbake ; \ - fi - ( cd bitbake ; monotone update ) - if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1" ] ; then \ - monotone merge -b org.nslu2-linux.bitbake ; \ - fi - -.PHONY: update-openembedded -update-openembedded: openembedded/.configured - if grep "org.openembedded.nslu2-linux" openembedded/MT/options >/dev/null 2>&1 ; then \ - sed -i -e 's/org.openembedded.nslu2-linux/org.openembedded.dev/' openembedded/MT/options ; \ - monotone propagate org.openembedded.nslu2-linux org.openembedded.dev ; \ - fi - monotone pull - if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ - monotone merge -b org.openembedded.dev ; \ - fi - ( cd openembedded ; monotone update ) - if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ - monotone merge -b org.openembedded.dev ; \ - fi - -.PHONY: update-optware -update-optware: optware/.configured - ( cd optware ; cvs -q update -d -P ) - -update-openslug-%-beta: releases/OpenSlug-%-beta/.configured - ( cd releases/OpenSlug-$*-beta ; svn up ) - -.PHONY: status-master -status-master: MT/.configured - monotone status --brief - -.PHONY: status-bitbake -status-bitbake: bitbake/.configured - ( cd bitbake ; monotone status --brief ) - -.PHONY: status-openembedded -status-openembedded: openembedded/.configured - ( cd openembedded ; monotone status --brief ) - -.PHONY: status-optware -status-optware: optware/.configured - ( cd optware ; cvs -q update -d -P ) - -status-openslug-%-beta: - ( cd releases/OpenSlug-$*-beta ; svn status ) - -.PHONY: clobber-unslung -clobber-unslung: - [ ! -e unslung/Makefile ] || ( cd unslung ; ${MAKE} clobber ) - -.PHONY: clobber-openslug -clobber-openslug: - [ ! -e openslug/Makefile ] || ( cd openslug ; ${MAKE} clobber ) - -.PHONY: clobber-ucslugc -clobber-ucslugc: - [ ! -e ucslugc/Makefile ] || ( cd ucslugc ; ${MAKE} clobber ) - -.PHONY: clobber-optware -clobber-optware: clobber-optware-nslu2 clobber-optware-wl500g clobber-optware-ds101 clobber-optware-ds101g - -.PHONY: clobber-optware-% -clobber-optware-%: - [ ! -e optware/$*/Makefile ] || ( cd optware/$* ; ${MAKE} distclean ) - -.PHONY: distclean-master -distclean-master: - rm -rf MT common downloads openslug scripts ucslugc unslung - -.PHONY: distclean-bitbake -distclean-bitbake: - rm -rf bitbake - -.PHONY: distclean-openembedded -distclean-openembedded: - rm -rf openembedded - -.PHONY: distclean-unslung -distclean-unslung: - rm -rf unslung - -.PHONY: distclean-openslug -distclean-openslug: - rm -rf openslug - -.PHONY: distclean-ucslugc -distclean-ucslugc: - rm -rf ucslugc - -.PHONY: distclean-optware -distclean-optware: - rm -rf optware - -.PHONY: distclean-releases -distclean-releases: - rm -rf releases - -# Targets for use by those with write access to the repositories - -.PHONY: push -push: push-master push-bitbake push-openembedded - -.PHONY: push-master -push-master: update-master - monotone push - -.PHONY: push-bitbake -push-bitbake: update-bitbake - ( cd bitbake ; monotone push ) - -.PHONY: push-openembedded -push-openembedded: update-openembedded - ( cd openembedded ; monotone push ) - -# Targets for use by core team members only - -.PHONY: import-bitbake -import-bitbake: bitbake/.configured - mv bitbake bitbake.old - svn co svn://svn.berlios.de/bitbake/trunk/bitbake - cp -rp bitbake.old/MT bitbake.old/.mt-attrs bitbake - rm -rf bitbake.old - ( cd bitbake ; rm -rf .svn ; monotone status ) - -# End of Makefile diff --git a/common/.mtn2git_empty b/common/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/common/conf/.mtn2git_empty b/common/conf/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/common/conf/local.conf.sample b/common/conf/local.conf.sample deleted file mode 100644 index c191c8ff63..0000000000 --- a/common/conf/local.conf.sample +++ /dev/null @@ -1,45 +0,0 @@ -# Sample local configuration -# -# You do not need a 'local.conf' file, however you may use one to alter -# how the build proceeds and to specify bitbake options. -# -#---------------------------------------------------------------------------------- -# bitbake options -#---------------------------------------------------------------------------------- -# -#BBINCLUDELOGS = "yes" -# bitbake logs build progress to per-package log files. By default if an -# error occurs bitbake outputs the name of this file with an error message. -# If you set BBINCLUDELOGS to 'yes' then bitbake will also output the log -# file itself. -# -#BBMASK = "regular expression" -# bitbake examines all the .bb files listed in the BBFILES variable. BBMASK -# can be used to exclude some (or, indeed, all) of these files by matching -# against a regular expression. Typically you do not want to do this because -# bitbake freeze can be used to generate a minimal list for BBFILES. -# -#---------------------------------------------------------------------------------- -# OpenSlug (and derivatives) options -#---------------------------------------------------------------------------------- -#FEED_URIS = "##" -# Define local feeds - should be replaced by a name which identifies -# your local feed (not a generic name!) and should be the location of -# the Packages.gz file (and, therefore, all the ipks). This is not required; -# the feed defaults to the internet one. -# -#_EXTRA_DEPENDS = "packages to add to the build" -# Any packages in this list will be built as depenencies of the firmware -# image, but they will not be included in the image (see below). -# -#_EXTRA_RDEPENDS = "packages to add to the firmware image" -# Any packages in this list will be added to the firmware image. Please do -# not distribute such images - make a new DISTRO.conf file following the -# instructions in conf/distro/ucslugc.conf -# -#_EXTRA_BBFILES = "paths of extra .bb files" -# Files in this list will be parsed by bitbake to find packages in addition -# to the default list of bb files in conf/distro/-packages.conf. The -# setting of this variable is irrelevant after bb freeze has been built or if -# bb unfreeze is built (in the latter case bitbake will examine all of the -# openembedded packages). diff --git a/common/conf/site.conf b/common/conf/site.conf deleted file mode 100644 index f40ae58e3d..0000000000 --- a/common/conf/site.conf +++ /dev/null @@ -1,43 +0,0 @@ -# NSLU2 master makefile bitbake site configuration -# It should not be necessary to alter this file! -# -# This configuration defines the location of the directories -# bitbake requires to build a particular distribution (DISTRO) -# -# Each DISTRO must create a appropriate topdir file containing -# (just) the definition of TOPDIR -include conf/topdir.conf - -# These definitions should be the same for every DISTRO - if -# a change is necessary make it in the DISTRO auto.conf. The -# rvalues are evaluated here for safety (i.e. to prevent accidents -# if something else defines TOPDIR). -TMPDIR := "${TOPDIR}/tmp" -CACHE := "${TMPDIR}/cache" -DL_DIR := "${TOPDIR}/downloads" - -# The following is not defined or used by the standard bitbake -# configuration files, however it must be defined here for 'freeze' -# and 'unfreeze' to work correctly -PKGDIR := "${TOPDIR}/openembedded" - -# BBFILES is the list of all the .bb files bitbake looks at when -# working out how to build a package. By default this value is -# overridden later in the ${DISTRO}.conf file (when it includes -# conf/distro/freeze.conf). -BBFILES := "${PKGDIR}/packages/*/*.bb" - -# The distro must create the following directories - either by -# populating them with the required files or, in the master makefile -# environment, by symbolic links to the relevant shared directories -# (which are directories of the same name in ..) -# -# common - contains conf/site.conf - this file -# bitbake - the directory containing the bitbake program -# downloads - contains the source files downloaded from the network -# openembedded - the directory containing the OE source -# -# All these directories may be shared between multiple distros. -# The 'tmp' directory may not be shared, however bitbake will create -# it automatically when required. The 'downloads' directory will also -# be created if required by bitbake. diff --git a/common/openembedded.mk b/common/openembedded.mk deleted file mode 100644 index cf452cf721..0000000000 --- a/common/openembedded.mk +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/make -# Makefile for OpenEmbedded builds -# Licensed under the GPL v2 or later -# -# conf/auto.conf must exist in the same directory as the Makefile (i.e. -# the directory where Makefile is used - it may be a symbolic link to -# this file). conf/auto.conf defines: -# -# DISTRO - the OpenEmbedded 'distro' to build -# MACHINE - the OpenEmbedded build target machine -# -# All of these values are (should be, must be) quoted in double quotes -include conf/auto.conf - -BUILD_DIRS = downloads -REQUIRED_DIRS = bitbake openembedded -FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) -BITBAKE = bitbake - -# The default rule is to build everything in an unprotected environment. -distro: $(FIRMWARE_DEPS) - . ./setup-env; exec ${BITBAKE} $(DISTRO)-packages - -# The default rule is to build the firmware in an unprotected environment. -image: $(FIRMWARE_DEPS) - . ./setup-env; exec ${BITBAKE} $(DISTRO)-image - -# The default rule is to build the firmware in an unprotected environment. -kernel: $(FIRMWARE_DEPS) - . ./setup-env; exec ${BITBAKE} virtual/kernel - -# This rule clobbers the environment (note that ccache uses '$HOME' by -# default, so the cache will end up there). -distro-safe: - env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) distro - -# The default rule is to build the firmware in an unprotected environment. -prefetch: $(FIRMWARE_DEPS) - . ./setup-env; exec ${BITBAKE} -cfetch $(DISTRO)-packages - -# topdir.conf is re-created automatically if the directory is -# moved - this will cause a full bitbake reparse -.PHONY: create-topdir -create-topdir: conf/topdir.conf - . conf/topdir.conf && test "`pwd`" = "$$TOPDIR" || echo "TOPDIR='`pwd`'" > conf/topdir.conf - -conf/topdir.conf: - echo "TOPDIR='`pwd`'" >$@ - -# rules for directories - if a symlink exists and the target does not -# exist something will go wrong in the build, therefore cause a failure -# here by the mkdir. -$(BUILD_DIRS): - test -d $@ || if test -d ../$@; then ln -s ../$@ .; else mkdir $@; fi - -# these directories must already exist - either in TOPDIR (here) or in .. -$(REQUIRED_DIRS): - test -d $@ || if test -d ../$@; then ln -s ../$@ .; else exit 1; fi - -.PHONY: clobber -clobber: - rm -rf tmp - -.PHONY: source -source: $(REQUIRED_DIRS) - tar zcf $(DISTRO).tar.gz --exclude=MT Makefile setup-env conf/site.conf conf/auto.conf \ - conf/local.conf.sample $(REQUIRED_DIRS:=/.) - -# This target probably isn't important any longer, because the -source -# target above does the right thing -.PHONY: -distclean: clobber - rm -rf conf/topdir.conf conf/local.conf $(BUILD_DIRS) - -# This target is mainly for testing - it is intended to put the disto directory -# back to its original state, it will destroy a source-tarball system (because -# it removes directories from the tarball). -.PHONY: -really-clean: distclean - rm -rf $(REQUIRED_DIRS) $(DISTRO)-source.tar.gz diff --git a/common/setup-env b/common/setup-env deleted file mode 100644 index a1e0d3fbd5..0000000000 --- a/common/setup-env +++ /dev/null @@ -1,46 +0,0 @@ -# setup up the environment for a bitbake build. This is used -# by the makefile and may also be directly sourced from an -# interactive shell. The makefile uses 'env -i' to ensure -# no variables are inherited apart from CCACHE_DISABLE and -# CCACHE_DIR -# -# topdir must exist in the directory and define TOPDIR to -# the full path name of the working directory -. ./conf/topdir.conf -test -n "$TOPDIR" -a -d "$TOPDIR" || { - echo "environment: TOPDIR not defined" >&2 - exit 1 -} - -# -# the following must match the definitions in common/conf/site.conf -export PYTHONPATH="${TOPDIR}/bitbake/lib" -export BBPATH="${TOPDIR}:${TOPDIR}/openembedded:${TOPDIR}/bitbake" -export PATH="${TOPDIR}/bitbake/bin:${PATH}" -export LD_LIBRARY_PATH= -export LANG=C -#NOTE: if you add export definitions here add them below too! -# -# unset the following (unnecessary for the makefile, but safe) -unset LC_CTYPE -unset CC -unset CXX -unset MFLAGS -unset MAKEFLAGS -unset DISTRO -unset MACHINE -unset MAKE_TARGET -# -# make bb into a 'safe' bitbake -alias bb-safe="env -i \ - HOME='${HOME}' \ - PYTHONPATH='${PYTHONPATH}' \ - BBPATH='${BBPATH}' \ - PATH='${PATH}' \ - LD_LIBRARY_PATH='${LD_LIBRARY_PATH}' \ - LANG='${LANG}' \ - '${TOPDIR}/bitbake/bin/bitbake'" -alias bb="'${TOPDIR}/bitbake/bin/bitbake'" -# -# remove TOPDIR - not required -unset TOPDIR diff --git a/openembedded/.mtn2git_empty b/openembedded/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openembedded/packages/.mtn2git_empty b/openembedded/packages/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openembedded/packages/pvrusb2-mci/.mtn2git_empty b/openembedded/packages/pvrusb2-mci/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty b/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch b/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch deleted file mode 100644 index b79c42e2c5..0000000000 --- a/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000 -+++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000 -@@ -37,10 +37,10 @@ - all: modules - - modules modules_install clean: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ - - install: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install - - else - diff --git a/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb b/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb deleted file mode 100644 index bd3362c730..0000000000 --- a/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "dyoung " -LICENSE = "GPL" -PR = "r1" -# It in fact requires these modules, but for now is using the local ones. -# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051016.tar.bz2 \ - file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-20051016/driver" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-D__LINUX_ARM_ARCH__=5'" - -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} - diff --git a/openslug/.mtn2git_empty b/openslug/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openslug/openembedded/.mtn2git_empty b/openslug/openembedded/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openslug/openembedded/packages/.mtn2git_empty b/openslug/openembedded/packages/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openslug/openembedded/packages/cdstatus/.mtn2git_empty b/openslug/openembedded/packages/cdstatus/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05.bb b/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05.bb deleted file mode 100644 index 1ae728f836..0000000000 --- a/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05.bb +++ /dev/null @@ -1,25 +0,0 @@ -# cdstatus OE build file - -PR="r0" -LICENSE="GPL" -HOMEPAGE = "http://cdstatus.sourceforge.net/" -FILES_${PN} += ${datadir}/cdstatus.cfg - -SRC_URI="${SOURCEFORGE_MIRROR}/cdstatus/cdstatus-0.96.05.tar.gz \ - file://cdstatus.patch;patch=1" - -S="${WORKDIR}/cdstatus-0.96.05" - -inherit autotools - -TARGET_LDFLAGS="" - -do_install() { - install -d 0755 ${D}/${bindir} - install -d 0755 ${D}/${datadir} - install -d 0755 ${D}/${mandir} - install -m 0755 src/cdstatus ${D}/${bindir} - install -m 0644 cdstatus.cfg ${D}/${datadir} - install -m 0644 cdstatus.1 ${D}/${mandir} - -} diff --git a/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty b/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch b/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch deleted file mode 100644 index 913cd721e0..0000000000 --- a/openslug/openembedded/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch +++ /dev/null @@ -1,131 +0,0 @@ -*** cdstatus-0.96.05/src/cdstatus.c.orig 2005-11-26 16:23:27.000000000 +0100 ---- cdstatus-0.96.05/src/cdstatus.c 2005-11-26 19:06:57.000000000 +0100 -*************** -*** 436,441 **** ---- 436,501 ---- - return 0; - } - -+ /* following code copied from -+ http://www.gamedev.net/reference/articles/article2091.asp -+ it has been slightly modified as we did not have a reason to output -+ big endian or float -+ */ -+ static short ShortSwap( short s ) -+ { -+ unsigned char b1, b2; -+ -+ b1 = s & 255; -+ b2 = (s >> 8) & 255; -+ -+ return (b1 << 8) + b2; -+ } -+ -+ static short ShortNoSwap( short s ) -+ { -+ return s; -+ } -+ -+ static int LongSwap (int i) -+ { -+ unsigned char b1, b2, b3, b4; -+ -+ b1 = i & 255; -+ b2 = ( i >> 8 ) & 255; -+ b3 = ( i>>16 ) & 255; -+ b4 = ( i>>24 ) & 255; -+ -+ return ((int)b1 << 24) + ((int)b2 << 16) + ((int)b3 << 8) + b4; -+ } -+ -+ static int LongNoSwap( int i ) -+ { -+ return i; -+ } -+ -+ static short (*LittleShort) ( short s ); -+ static int (*LittleLong) ( int i ); -+ -+ static void InitEndian( void ) -+ { -+ char SwapTest[2] = { 1, 0 }; -+ -+ if( *(short *) SwapTest == 1 ) -+ { -+ // little endian -+ //set func pointers to correct funcs -+ LittleShort = ShortNoSwap; -+ LittleLong = LongNoSwap; -+ } -+ else -+ { -+ // big endian -+ LittleShort = ShortSwap; -+ LittleLong = LongSwap; -+ } -+ } -+ /* end of copied code */ -+ - static void writeWavHeader(unsigned int readframes, FILE * audio_out) - { - long int chunksize; -*************** -*** 456,478 **** - - wavHeader wHeader; - - /* "RIFF" */ -! wHeader.RIFF_header = 0x46464952; - - chunksize = readframes * CD_FRAMESIZE_RAW; -! wHeader.total_size = (int32_t)(chunksize + sizeof(wavHeader)); - - /* "WAVEfmt " */ -! wHeader.WAVE = 0x45564157; -! wHeader.fmt = 0x20746D66; - -! wHeader.subchunk_size = 16; -! wHeader.audio_format = 1; -! wHeader.number_channels = 2; -! wHeader.sampling_rate = 44100; -! wHeader.byte_rate = 176400; -! wHeader.block_align = 4; -! wHeader.bits_per_sample = 16; - - if(fwrite((const void *) &wHeader, sizeof(wavHeader), (size_t) 1, audio_out)!=1) - { ---- 516,539 ---- - - wavHeader wHeader; - -+ InitEndian(); - /* "RIFF" */ -! wHeader.RIFF_header = LittleLong(0x46464952); - - chunksize = readframes * CD_FRAMESIZE_RAW; -! wHeader.total_size = LittleLong((int32_t)(chunksize + sizeof(wavHeader))); - - /* "WAVEfmt " */ -! wHeader.WAVE = LittleLong(0x45564157); -! wHeader.fmt = LittleLong(0x20746D66); - -! wHeader.subchunk_size = LittleLong(16); -! wHeader.audio_format = LittleShort(1); -! wHeader.number_channels = LittleShort(2); -! wHeader.sampling_rate = LittleLong(44100); -! wHeader.byte_rate = LittleLong(176400); -! wHeader.block_align = LittleShort(4); -! wHeader.bits_per_sample = LittleShort(16); - - if(fwrite((const void *) &wHeader, sizeof(wavHeader), (size_t) 1, audio_out)!=1) - { -*************** -*** 492,497 **** ---- 553,559 ---- - } - exit(EXIT_FAILURE); - } -+ chunksize = LittleLong(chunksize); - if(fwrite((const void *) &chunksize, sizeof(long int), (size_t) 1, audio_out)!=1) - { - perror("Error writing wav file chunksize header"); diff --git a/openslug/openembedded/packages/pvrusb2-mci/.mtn2git_empty b/openslug/openembedded/packages/pvrusb2-mci/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty b/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch b/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch deleted file mode 100644 index b79c42e2c5..0000000000 --- a/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000 -+++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000 -@@ -37,10 +37,10 @@ - all: modules - - modules modules_install clean: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ - - install: -- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install -+ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install - - else - diff --git a/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb deleted file mode 100644 index 5ac677e329..0000000000 --- a/openslug/openembedded/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "dyoung " -LICENSE = "GPL" -PR = "r0" -# It in fact requires these modules, but for now is using the local ones. -# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" - -SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2" - -#SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2 \ -# file://Makefile.patch;patch=1" - -S = "${WORKDIR}/pvrusb2-mci-20051113" - -inherit module - -CFLAGS = "'-I${KERNEL_SOURCE}/include' \ - '-D__LINUX_ARM_ARCH__=5'" - -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' \ - 'KDIR=${STAGING_KERNEL_DIR}'" - -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib" - - -do_compile() { - cd ivtv; oe_runmake - cd ../driver; oe_runmake -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media - install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media -} - diff --git a/scripts/.mtn2git_empty b/scripts/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/scripts/package-strip.pl b/scripts/package-strip.pl deleted file mode 100644 index 45c64134f8..0000000000 --- a/scripts/package-strip.pl +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/perl - -my $pat = shift(@ARGV) || usage(1); -my $infile = shift(@ARGV) || usage(1); -my $outfile = shift(@ARGV) || "-"; -print STDERR "Package-strip processing input file $infile\n"; -print STDERR "Output to " . ($outfile ne "-" ? $outfile : "stdout") . "\n"; - -# massage the regexp to accept semi-shell-style * -$pat =~ s/\*/.*/g; - -open (I,"<$infile") || die $@; -open (O,">>$outfile") || die $@; -undef $/; -my $srctext = ; -close(I); - -my @srclist = split(/\012\012\012/,$srctext); -my @outlist = grep(/Package: $pat/,@srclist); -print O join("\012\012\012",@outlist); -print O "\012\012\012"; - -sub usage { - my $cack = shift(@_); - print STDERR "usage: Package-strip [output filename]\nRemember to escape wildcard characters for the shell."; - die if $cack; -} - -- cgit v1.2.3 From dec9d7e9d8e2ab4c8693921517bc92f37ebe64b1 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 3 Dec 2005 17:59:18 +0000 Subject: groff: ported 1.19.2 added patch for Makefile.in to exclude contrib/groffer and the html doc groffer did not build and html lead to package errors added patch for src/include/Makefile.in: fontpath and tmacpath pointed to the path in the crossbuild env this gave a wrong src/include/defs.h Changed this somewhat crude by replacing with a hardcoded path (in /usr/share) --- packages/groff/groff/Makefile.in.patch | 31 +++++++++++++++++++++++++++++++ packages/groff/groff/Makefile.sub.patch | 21 +++++++++++++++++++++ packages/groff/groff_1.19.2.bb | 23 +++++++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 packages/groff/groff/Makefile.in.patch create mode 100644 packages/groff/groff/Makefile.sub.patch create mode 100644 packages/groff/groff_1.19.2.bb diff --git a/packages/groff/groff/Makefile.in.patch b/packages/groff/groff/Makefile.in.patch new file mode 100644 index 0000000000..30aac8cbf0 --- /dev/null +++ b/packages/groff/groff/Makefile.in.patch @@ -0,0 +1,31 @@ +*** groff-1.19.2/Makefile.in.orig Sun Aug 7 10:03:33 2005 +--- groff-1.19.2/Makefile.in Sat Dec 3 16:44:50 2005 +*************** +*** 242,249 **** + + # The configure script checks whether all necessary utility programs for + # grohtml are available -- only then we can build the HTML documentation. +! make_html=@make_html@ +! make_install_html=@make_install_html@ + + # The configure script also checks whether all necessary utility programs + # for pdfroff are available -- only then we can build PDF documentation. +--- 242,249 ---- + + # The configure script checks whether all necessary utility programs for + # grohtml are available -- only then we can build the HTML documentation. +! make_html= +! make_install_html= + + # The configure script also checks whether all necessary utility programs + # for pdfroff are available -- only then we can build PDF documentation. +*************** +*** 549,555 **** + contrib/pic2graph \ + contrib/eqn2graph \ + contrib/grap2graph \ +- contrib/groffer \ + contrib/mom \ + contrib/pdfmark \ + contrib/gdiffmk +--- 549,554 ---- diff --git a/packages/groff/groff/Makefile.sub.patch b/packages/groff/groff/Makefile.sub.patch new file mode 100644 index 0000000000..1b5a7dfac5 --- /dev/null +++ b/packages/groff/groff/Makefile.sub.patch @@ -0,0 +1,21 @@ +*** groff-1.19.2/src/include/Makefile.sub.orig Thu Jun 23 13:27:53 2005 +--- groff-1.19.2/src/include/Makefile.sub Sat Dec 3 18:35:40 2005 +*************** +*** 39,46 **** + "DEVICE=\"$(DEVICE)\"" \ + "INSTALLPATH=\"$(prefix)\"" \ + "BINPATH=\"$(bindir)\"" \ +! "FONTPATH=\"$(fontpath)\"" \ +! "MACROPATH=\"$(tmacpath)\"" \ + "INDEX_SUFFIX=\"$(indexext)\"" \ + "COMMON_WORDS_FILE=\"$(common_words_file)\"" \ + "DEFAULT_INDEX_DIR=\"$(indexdir)\"" \ +--- 39,46 ---- + "DEVICE=\"$(DEVICE)\"" \ + "INSTALLPATH=\"$(prefix)\"" \ + "BINPATH=\"$(bindir)\"" \ +! "FONTPATH=\"/usr/share/groff/site-font:/usr/share/groff/1.19.2/font:/usr/lib/font\"" \ +! "MACROPATH=\"/usr/lib/groff/site-tmac:/usr/share/groff/site-tmac:/usr/share/groff/1.19.2/tmac\"" \ + "INDEX_SUFFIX=\"$(indexext)\"" \ + "COMMON_WORDS_FILE=\"$(common_words_file)\"" \ + "DEFAULT_INDEX_DIR=\"$(indexdir)\"" \ diff --git a/packages/groff/groff_1.19.2.bb b/packages/groff/groff_1.19.2.bb new file mode 100644 index 0000000000..7381bb3687 --- /dev/null +++ b/packages/groff/groff_1.19.2.bb @@ -0,0 +1,23 @@ +LICENSE = "GPL" +SECTION = "base" +DESCRIPTION = "GNU roff" +RDEPENDS="libstdc++6" +MAINTAINER = "Inge Arnesen " +SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \ + file://Makefile.in.patch;patch=1 \ + file://Makefile.sub.patch;patch=1 \ + file://groff.patch;patch=1" + +# prefix and exec-prefix are broken and the .in file is broken too +# and can't be autoreconf'ed, so specify every dir +EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}/usr/bin --datadir=${D}/usr/share --mandir=${D}/usr/man --infodir=${D}/usr/share/info" +inherit autotools + +do_configure () { + oe_runconf +} + +#do_install() { +# oe_runmake 'PREFIX=${D}' install +#} + -- cgit v1.2.3 From fd131518625c38f2104cc515bd0d8879437b0bcd Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 3 Dec 2005 18:58:56 +0000 Subject: openslug-packages.conf: added groff --- conf/distro/openslug-packages.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index ea126d9032..6b173f2f21 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -58,6 +58,7 @@ ${PKGDIR}/packages/glibc/*.bb \ ${PKGDIR}/packages/gnu-config/*.bb \ ${PKGDIR}/packages/gphoto2/*.bb \ ${PKGDIR}/packages/grep/*.bb \ +${PKGDIR}/packages/groff/*.bb \ ${PKGDIR}/packages/gtk-doc/*.bb \ ${PKGDIR}/packages/gzip/*.bb \ ${PKGDIR}/packages/hal/*.bb \ -- cgit v1.2.3 From 984f0d7238867e3581f016ecbd6930d6ca85e950 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 3 Dec 2005 21:51:02 +0000 Subject: conf/distro/openslug-packages.conf: added libiconv to packages list, needed for php --- conf/distro/openslug-packages.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 6b173f2f21..0c743ef64f 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -85,6 +85,7 @@ ${PKGDIR}/packages/libdvb/*.bb \ ${PKGDIR}/packages/libexif/*.bb \ ${PKGDIR}/packages/libgphoto2/*.bb \ ${PKGDIR}/packages/libgsm/*.bb \ +${PKGDIR}/packages/libiconv/*.bb \ ${PKGDIR}/packages/libid3tag/*.bb \ ${PKGDIR}/packages/liblockfile/*.bb \ ${PKGDIR}/packages/libmad/*.bb \ -- cgit v1.2.3 From 41ecbe24d23330ba8007ddd6d85760464918566d Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 4 Dec 2005 20:57:47 +0000 Subject: unslung-kernel: Added R29 to R63 patch from Tiersten and marceln --- .../unslung-kernel/linux-kernel-R29_to_R63.patch | 6399 ++++++++++++++++++++ 1 file changed, 6399 insertions(+) create mode 100644 packages/linux/unslung-kernel/linux-kernel-R29_to_R63.patch diff --git a/packages/linux/unslung-kernel/linux-kernel-R29_to_R63.patch b/packages/linux/unslung-kernel/linux-kernel-R29_to_R63.patch new file mode 100644 index 0000000000..f676df36ad --- /dev/null +++ b/packages/linux/unslung-kernel/linux-kernel-R29_to_R63.patch @@ -0,0 +1,6399 @@ +--- linux-2.4.22-r29/drivers/ixp400/Makefile 2005-11-27 21:09:09.000000000 +0100 ++++ linux-2.4.22/drivers/ixp400/Makefile 2005-11-27 21:25:15.000000000 +0100 +@@ -80,9 +80,9 @@ + # -- End Intel/GPL Copyright Notice -- + # + + ifdef CONFIG_IXP425_CSR +-include $(ROOTDIR)/IXP400lib/ixp400_xscale_sw/buildUtils/environment.linux ++# include $(ROOTDIR)/IXP400lib/ixp400_xscale_sw/buildUtils/environment.linux + # IX_XSCALE_SW=$(ROOTDIR)/IXP400lib/ixp400_xscale_sw/ + # The kernel makefiles override the value of CFLAGS on the make + # commandline. Because the xscale_sw makefile is supposed to be + # stand-alone, we don't want this. So we reset the special variable +@@ -136,15 +136,15 @@ + # This rule builds the modules. + # The dependency on modversions.h is needed here so it'll be built for + # us in a 'make modules'. + build_ixp400_modules: force $(TOPDIR)/include/linux/modversions.h +- cd $(IX_XSCALE_SW); $(MAKE) IX_NOSYM=1 $(REAL_IXP400_MODULES:$(IX_XSCALE_SW)/%=%) ++# cd $(IX_XSCALE_SW); $(MAKE) IX_NOSYM=1 $(REAL_IXP400_MODULES:$(IX_XSCALE_SW)/%=%) + + # After building the modules, we copy them to this directory as that's + # where the kernel makefiles expect to find them. We can't use + # symlinks, as Jungo's 'make ramdisk' rule would just copy the links. + $(IXP400_MODULES): $(REAL_IXP400_MODULES) +- cp $(IX_XSCALE_SW)/lib/linuxbe/$@ $@ ++# cp $(IX_XSCALE_SW)/lib/linuxbe/$@ $@ + + # This macro is the interface to the rules in $(TOPDIR)/Rules.make. It + # contains the names of all module files that can be built in this + # directory. Note that they must be filenames in this directory - the +--- R29/drivers/Makefile 2004-03-24 19:55:04.000000000 +0000 ++++ R63/drivers/Makefile 2005-08-30 06:06:00.000000000 +0100 +@@ -48,9 +48,4 @@ + subdir-$(CONFIG_PCF8594C2) += i2c/pcf8594c-2 + + subdir-$(CONFIG_BLUEZ) += bluetooth +- +-ifdef CONFIG_ARCH_IXP425 +-subdir-$(CONFIG_IXP425_CSR) += ixp400 +-endif +- + include $(TOPDIR)/Rules.make +--- R29/drivers/net/Makefile 2004-03-24 19:55:20.000000000 +0000 ++++ R63/drivers/net/Makefile 2005-08-23 06:20:03.000000000 +0100 +@@ -28,10 +28,7 @@ + obj-$(CONFIG_OCP_NET) += ibm_emac/ocp.o + + ifdef CONFIG_IXP425_CSR +-include $(ROOTDIR)/IXP400lib/ixp400_xscale_sw/buildUtils/environment.linux +-CFLAGS_ixp425_eth.o = -I$(IX_XSCALE_SW)/src/linux \ +- -I$(IX_XSCALE_SW)/src/include +-obj-m += ixp425_eth.o ++#obj-m += ixp425_eth.o + endif + + ifeq ($(CONFIG_E1000),y) +--- R29/drivers/scsi/hosts.c 2004-03-24 19:55:43.000000000 +0000 ++++ R63/drivers/scsi/hosts.c 2005-04-05 02:40:53.000000000 +0100 +@@ -36,12 +36,15 @@ + #define __KERNEL_SYSCALLS__ + + #include +- ++//pete ++#include ++#include ++// + #include "scsi.h" + #include "hosts.h" + + /* +-static const char RCSid[] = "$Header: /home/cvsroot/NSLU2/linux-2.4.x/drivers/scsi/hosts.c,v 1.1.1.1 2004/03/24 19:55:43 sure Exp $"; ++static const char RCSid[] = "$Header: /home/nas-cvsroot/NSLU2_V2/linux-2.4.x/drivers/scsi/hosts.c,v 1.2 2005/04/05 01:40:53 shearer Exp $"; + */ + + /* +@@ -84,6 +87,12 @@ + int max_scsi_hosts; /* host_no for next new host */ + int next_scsi_host; /* count of registered scsi hosts */ + ++//pete ++extern pid_t sd_mc_thread_pid; ++//extern DECLARE_COMPLETION(scsi_mc_thread_exited); ++extern struct completion sd_mc_thread_exited; ++// ++ + void + scsi_unregister(struct Scsi_Host * sh){ + struct Scsi_Host * shpnt; +@@ -110,6 +119,15 @@ + + next_scsi_host--; + ++ //pete ++ //printk("+++++ scsi_unregister:next_scsi_host:%d\n", next_scsi_host); ++ if( next_scsi_host == 0){ ++ /* Send a signal to exit the thread. */ ++ kill_proc(sd_mc_thread_pid, SIGTERM, 1); ++ /* If no scsi host left, we wait the thread to exit. */ ++ wait_for_completion(&sd_mc_thread_exited); ++ } ++ // + kfree((char *) sh); + } + +--- R29/drivers/scsi/scsi.c 2004-03-24 19:55:45.000000000 +0000 ++++ R63/drivers/scsi/scsi.c 2005-05-31 10:38:52.000000000 +0100 +@@ -84,7 +84,7 @@ + #endif + + /* +- static const char RCSid[] = "$Header: /home/cvsroot/NSLU2/linux-2.4.x/drivers/scsi/scsi.c,v 1.1.1.1 2004/03/24 19:55:45 sure Exp $"; ++ static const char RCSid[] = "$Header: /home/nas-cvsroot/NSLU2_V2/linux-2.4.x/drivers/scsi/scsi.c,v 1.2 2005/05/31 09:38:52 shearer Exp $"; + */ + + /* +@@ -1991,9 +1991,10 @@ + for (shpnt = scsi_hostlist; shpnt; shpnt = shpnt->next) { + for (SDpnt = shpnt->host_queue; SDpnt; SDpnt = SDpnt->next) + if (SDpnt->host->hostt == tpnt) { +- for (sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next) +- if (sdtpnt->attach) +- (*sdtpnt->attach) (SDpnt); ++ for (sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next) ++ if (sdtpnt->attach){ ++ (*sdtpnt->attach) (SDpnt); ++ } + if (SDpnt->attached) { + scsi_build_commandblocks(SDpnt); + if (0 == SDpnt->has_cmdblocks) +@@ -2049,7 +2050,7 @@ + char name[10]; /* host_no>=10^9? I don't think so. */ + + /* get the big kernel lock, so we don't race with open() */ +- lock_kernel(); ++ lock_kernel(); + + /* + * First verify that this host adapter is completely free with no pending +--- R29/drivers/scsi/scsi.h 2004-07-07 09:01:24.000000000 +0100 ++++ R63/drivers/scsi/scsi.h 2005-03-31 05:58:07.000000000 +0100 +@@ -575,6 +575,9 @@ + char type; + char scsi_level; + char vendor[8], model[16], rev[4]; ++ //pete ++ char node[6]; ++ // + unsigned char current_tag; /* current tag */ + unsigned char sync_min_period; /* Not less than this period */ + unsigned char sync_max_offset; /* Not greater than this offset */ +--- R29/drivers/scsi/scsi_proc.c 2004-03-24 19:55:45.000000000 +0000 ++++ R63/drivers/scsi/scsi_proc.c 2004-10-28 09:54:56.000000000 +0100 +@@ -263,8 +263,8 @@ + extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE]; + + y = sprintf(buffer + len, +- "Host: scsi%d Channel: %02d Id: %02d Lun: %02d\n Vendor: ", +- scd->host->host_no, scd->channel, scd->id, scd->lun); ++ "Host: scsi%d-%s Channel: %02d Id: %02d Lun: %02d\n Vendor: ", ++ scd->host->host_no, /*pete*/scd->node, scd->channel, scd->id, scd->lun); + for (x = 0; x < 8; x++) { + if (scd->vendor[x] >= 0x20) + y += sprintf(buffer + len + y, "%c", scd->vendor[x]); +--- linux-2.4.22-r29/drivers/scsi/sd.c 2005-11-27 21:08:49.000000000 +0100 ++++ linux-2.4.22/drivers/scsi/sd.c 2005-11-27 21:15:45.000000000 +0100 +@@ -61,6 +61,10 @@ + + #include + ++//pete ++#include ++// ++ + /* + * static const char RCSid[] = "$Header:"; + */ +@@ -81,6 +85,9 @@ + #define N_USED_SD_MAJORS (N_USED_SCSI_DISKS / SCSI_DISKS_PER_MAJOR) + + #define MAX_RETRIES 5 ++//pete ++#define SCSI_SEND_CMND_INTERVAL 5*HZ ++// + + /* + * Time out in seconds for disks and Magneto-opticals (which are slower). +@@ -89,11 +96,16 @@ + #define SD_TIMEOUT (30 * HZ) + #define SD_MOD_TIMEOUT (75 * HZ) + ++// + /* grant */ + //#define GUID_EQUAL(x,y) (x[0]==y[0] && x[1]==y[1] && x[2]==y[2]) + ++//pete ++static int port2_attached; ++pid_t sd_mc_thread_pid; ++DECLARE_COMPLETION(sd_mc_thread_exited); ++// + static Scsi_Disk *rscsi_disks; +-//static Scsi_Disk *rscsi_disks; + static struct gendisk *sd_gendisks; + static int *sd_sizes; + static int *sd_blocksizes; +@@ -104,7 +116,9 @@ + static int fop_revalidate_scsidisk(kdev_t); + + static int sd_init_onedisk(int); +- ++//pete ++static int sd_send_cmnd_one(int); ++// + + static int sd_init(void); + static void sd_finish(void); +@@ -113,6 +127,7 @@ + static void sd_detach(Scsi_Device *); + static int sd_init_command(Scsi_Cmnd *); + ++ + static struct Scsi_Device_Template sd_template = { + name:"disk", + tag:"sd", +@@ -783,6 +798,11 @@ + unsigned int the_result; + int sector_size; + Scsi_Request *SRpnt; ++ ++ //pete ++ char flash[12]="flash_"; ++ char hdd[10]="hdd_"; ++ // + + /* + * Get the name of the disk, in case we need to log it somewhere. +@@ -1053,6 +1073,7 @@ + "%u %d-byte hdwr sectors (%u MB)\n", + nbuff, rscsi_disks[i].capacity, + hard_sector, (sz - sz/625 + 974)/1950); ++ + } + + /* Rescale capacity to 512-byte units */ +@@ -1065,6 +1086,55 @@ + if (sector_size == 256) + rscsi_disks[i].capacity >>= 1; + } ++ // add by super, moified by pete ++ if (rscsi_disks[i].device->removable){ ++ if(0x32 == rscsi_disks[i].device->host->hostt->port){ ++ printk("is removable disk \n"); ++ *IXP425_GPIO_GPOUTR &= 0xfffb; ++ //port2_attached |= 1<<(i-1); ++ remove_proc_entry("flash_sda",NULL); ++ create_proc_read_entry("flash_sda", ++ 0, ++ NULL, ++ NULL, ++ NULL ++ ); ++ }else{ ++ strcat(flash,nbuff); ++ printk("is removable disk \n"); ++ *IXP425_GPIO_GPOUTR &= 0xfff7; ++ port2_attached |= 1<<(i-1); ++ remove_proc_entry(flash,NULL); ++ create_proc_read_entry(flash, ++ 0, ++ NULL, ++ NULL, ++ NULL ++ ); ++ } ++ }else { ++ printk("%x port connect!!!!!\n",rscsi_disks[i].device->host->hostt->port); ++ if(0x32 == rscsi_disks[i].device->host->hostt->port){ ++ *IXP425_GPIO_GPOUTR &= 0xfffb; ++ create_proc_read_entry("hdd_sda", ++ 0, ++ NULL, ++ NULL, ++ NULL ++ ); ++ }else{ ++ *IXP425_GPIO_GPOUTR &= 0xfff7; ++ port2_attached |= 1<<(i-1); ++ strcat(hdd,nbuff); ++ create_proc_read_entry(hdd, ++ 0, ++ NULL, ++ NULL, ++ NULL ++ ); ++ } ++ } ++ //end + + + /* +@@ -1124,6 +1194,140 @@ + return i; + } + ++//pete ++static int sd_send_cmnd_one(int i) ++{ ++ unsigned char cmd[10]; ++ char nbuff[6]; ++ unsigned char *buffer; ++ unsigned int the_result; ++ Scsi_Request *SRpnt; ++ ++ char media[24]; ++ /* ++ * Get the name of the disk, in case we need to log it somewhere. ++ */ ++ sd_devname(i, nbuff); ++ ++ /* ++ * If the device is offline, don't try and read capacity or any ++ * of the other niceties. ++ */ ++ if (rscsi_disks[i].device->online == FALSE) ++ return i; ++ ++ /* ++ * We need to retry the READ_CAPACITY because a UNIT_ATTENTION is ++ * considered a fatal error, and many devices report such an error ++ * just after a scsi bus reset. ++ */ ++ ++ SRpnt = scsi_allocate_request(rscsi_disks[i].device); ++ if (!SRpnt) { ++ printk(KERN_WARNING "(sd_init_onedisk:) Request allocation failure.\n"); ++ return i; ++ } ++ ++ buffer = (unsigned char *) scsi_malloc(512); ++ if (!buffer) { ++ printk(KERN_WARNING "(sd_init_onedisk:) Memory allocation failure.\n"); ++ scsi_release_request(SRpnt); ++ return i; ++ } ++ ++ cmd[0] = TEST_UNIT_READY; /* use this command to test media change */ ++ cmd[1] = (rscsi_disks[i].device->scsi_level <= SCSI_2) ? ++ ((rscsi_disks[i].device->lun << 5) & 0xe0) : 0; ++ memset((void *) &cmd[2], 0, 8); ++ SRpnt->sr_cmd_len = 0; ++ SRpnt->sr_sense_buffer[0] = 0; ++ SRpnt->sr_sense_buffer[2] = 0; ++ SRpnt->sr_data_direction = SCSI_DATA_NONE; ++ ++ scsi_wait_req (SRpnt, (void *) cmd, (void *) buffer, ++ 0/*512*/, SD_TIMEOUT, MAX_RETRIES); ++ ++ the_result = SRpnt->sr_result; ++ ++ sprintf(media, "sd%c_media_not_present", 'a' + i); ++ ++ /* -- code: 0x70, key: 0x2, ASC: 0x3a, ASCQ: 0x0 ++ this indicates Unit not ready: media not present */ ++ if( the_result != 0 ++ && ((driver_byte(the_result) & DRIVER_SENSE) != 0) ++ && SRpnt->sr_sense_buffer[0] == 0x70 ++ && (SRpnt->sr_sense_buffer[2]& 0xf) == NOT_READY ++ && SRpnt->sr_sense_buffer[12] == 0x3A ++ && SRpnt->sr_sense_buffer[13] == 0x0 ) { ++ //printk("sd%c media not present!\n", 'a' + i); ++ remove_proc_entry(media, NULL); ++ create_proc_read_entry(media, ++ 0, ++ NULL, ++ NULL, ++ NULL ++ ); ++ }else if(the_result == 0){ /* need more conditions? */ ++ remove_proc_entry(media, NULL); ++ } ++ ++ scsi_release_request(SRpnt); ++ SRpnt = NULL; ++ ++ scsi_free(buffer, 512); ++ return i; ++} ++ ++static int sd_send_cmnd_thread(void) ++{ ++ int i; ++ ++ siginitsetinv(¤t->blocked, 0); ++ ++ //lock_kernel(); ++ ++ /* ++ * This thread doesn't need any user-level access, ++ * so get rid of all our resources.. ++ */ ++ exit_files(current); ++ current->files = init_task.files; ++ atomic_inc(¤t->files->count); ++ daemonize(); ++ reparent_to_init(); ++ ++ /* avoid getting signals */ ++ spin_lock_irq(¤t->sigmask_lock); ++ flush_signals(current); ++ sigfillset(¤t->blocked); ++ recalc_sigpending(current); ++ spin_unlock_irq(¤t->sigmask_lock); ++ ++ /* set our name for identification purposes */ ++ sprintf(current->comm, "sd-mc-thread"); ++ ++ //unlock_kernel(); ++ ++ do{ ++ /* If all scsi disks are removed, there will be no scsi host, so we should exit this thread. */ ++ if(next_scsi_host == 0) ++ break; ++ ++ for (i = 0; i < sd_template.dev_max; ++i) ++ if ( rscsi_disks[i].device) { ++ sd_send_cmnd_one(i); ++ } ++ ++ /* Now sleep for 5 seconds */ ++ current->state = TASK_INTERRUPTIBLE; ++ schedule_timeout(SCSI_SEND_CMND_INTERVAL); ++ }while(!signal_pending(current)); ++ ++ complete_and_exit(&sd_mc_thread_exited, 0); ++ return 0; ++} ++// ++ + /* + * The sd_init() function looks at all SCSI drives present, determines + * their size, and reads partition table entries for them. +@@ -1298,6 +1502,15 @@ + : 4; /* 4 sector read-ahead */ + } + ++ //pete ++ //printk("-------------------in sd_finish------------------\n"); ++ if(next_scsi_host == 1){ ++ /* We just need *ONE* thread */ ++ sd_mc_thread_pid = kernel_thread(sd_send_cmnd_thread, NULL, CLONE_VM); ++ if(sd_mc_thread_pid < 0) ++ printk("Unable to start sd send command thread\n"); ++ } ++ // + return; + } + +@@ -1323,9 +1536,26 @@ + SDp->attached--; + return 1; + } +- for (dpnt = rscsi_disks, i = 0; i < sd_template.dev_max; i++, dpnt++) +- if ( SDp == dpnt->device || !dpnt->device) /* grant */ +- break; ++ ++ //Pete ++ if(SDp->host->host_no == 0){ ++ dpnt = rscsi_disks; ++ if(dpnt->device){ ++ SDp->attached--; ++ return 1; ++ } ++ i = 0; ++ } ++ else{ ++ //start from rscsi_disk[1]. ++ dpnt = rscsi_disks; ++ dpnt++; ++ i = 1; ++ for (; i < sd_template.dev_max; i++, dpnt++) ++ if (SDp == dpnt->device||!dpnt->device){ ++ break; ++ } ++ } + + if (i >= sd_template.dev_max) { + printk(KERN_WARNING "scsi_devices corrupt (sd)," +@@ -1334,18 +1564,7 @@ + SDp->attached--; + return 1; + } +- /* check different disks by grant */ +- // i = SDp->removable;//super modify +- printk("the host no is %d\n",SDp->host->host_no); +- i = 1 - SDp->host->host_no; +- if ( rscsi_disks[i].device )//&& +- // !GUID_EQUAL( (struct us_data *)rscsi_disks[i].device->host->hostt->proc_dir->guid, +- // (struct us_data *)SDp->host->hostt->proc_dir->guid) ) +- { +- sd_detach( rscsi_disks[i].device ); +- printk("* sd_detach\n"); +- } +- printk("* sd_attach:%d\n",i); ++ + rscsi_disks[i].device = SDp; + rscsi_disks[i].has_part_table = 0; + sd_template.nr_dev++; +@@ -1355,6 +1574,9 @@ + if (SDp->removable) + SD_GENDISK(i).flags[devnum] |= GENHD_FL_REMOVABLE; + sd_devname(i, nbuff); ++ //pete ++ strcpy(SDp->node, nbuff); ++ // + printk("Attached scsi %sdisk %s at scsi%d, channel %d, id %d, lun %d\n", + SDp->removable ? "removable " : "", + nbuff, SDp->host->host_no, SDp->channel, SDp->id, SDp->lun); +@@ -1434,29 +1656,65 @@ + int i, j; + int max_p; + int start; ++ //pete ++ char flash[12]; ++ char hdd[10]; ++ char media[26]; ++ // + + if (rscsi_disks == NULL) + return; + ++ + for (dpnt = rscsi_disks, i = 0; i < sd_template.dev_max; i++, dpnt++) + if (dpnt->device == SDp) { ++ ++ #if 1 ++ //pete ++ sprintf(media, "sd%c_media_not_present", 'a' + i); ++ ++ switch(SDp->host->hostt->port){ ++ case 0x31: ++ port2_attached ^= 1<<(i-1); ++ if(port2_attached < 0) ++ port2_attached = 0; ++ if(port2_attached == 0) ++ *IXP425_GPIO_GPOUTR |= 0x8; ++ if(SDp->removable == 1){ ++ sprintf(flash, "flash_sd%c", 'a' + i); ++ remove_proc_entry(flash, NULL); ++ remove_proc_entry(media, NULL); ++ }else{ ++ sprintf(hdd, "hdd_sd%c", 'a' + i); ++ remove_proc_entry(hdd,NULL); ++ remove_proc_entry(media, NULL); ++ } ++ break; ++ case 0x32: ++ *IXP425_GPIO_GPOUTR |= 0x4; ++ if(SDp->removable == 1){ ++ remove_proc_entry("flash_sda",NULL); ++ } ++ else ++ remove_proc_entry("hdd_sda",NULL); ++ break; ++ default: ++ break; ++ } ++ #endif ++ // + + /* If we are disconnecting a disk driver, sync and invalidate + * everything */ + sdgd = &SD_GENDISK(i); + max_p = sd_gendisk.max_p; + start = i << sd_gendisk.minor_shift; +-printk("max_p is %d ;start is %d\n",max_p,start); +- + for (j = max_p - 1; j >= 0; j--) { + int index = start + j; +- // printk("invalidate_device index = %d\n",index); +- invalidate_device(MKDEV_SD_PARTITION(index), 1); ++ invalidate_device(MKDEV_SD_PARTITION(index), 0); + sdgd->part[SD_MINOR_NUMBER(index)].start_sect = 0; + sdgd->part[SD_MINOR_NUMBER(index)].nr_sects = 0; + sd_sizes[index] = 0; +- // printk("MKDEV_SD_PARTITION ok\n"); +- + } + devfs_register_partitions (sdgd, + SD_MINOR_NUMBER (start), 1); +--- R29/drivers/usb/host/ehci-q.c 2004-07-07 08:31:43.000000000 +0100 ++++ R63/drivers/usb/host/ehci-q.c 2005-02-03 04:59:48.000000000 +0000 +@@ -39,6 +39,22 @@ + */ + + /*-------------------------------------------------------------------------*/ ++ ++//pete ++void ehci_urb_dma_sync(struct usb_hcd *hcd, struct urb *urb) ++{ ++ if (urb->setup_dma) ++ pci_dma_sync_single(hcd->pdev, urb->setup_dma, ++ sizeof(struct usb_ctrlrequest), ++ PCI_DMA_TODEVICE); ++ if (urb->transfer_buffer_length != 0) ++ pci_dma_sync_single(hcd->pdev, urb->transfer_dma, ++ urb->transfer_buffer_length, ++ usb_pipein(urb->pipe) ++ ? PCI_DMA_FROMDEVICE ++ : PCI_DMA_TODEVICE); ++} ++// + + /* fill a qtd, returning how much of the buffer we were able to queue up */ + +@@ -205,7 +221,16 @@ + qh_put (ehci, qh); + } + ++ ++ + spin_lock (&urb->lock); ++ ++//pete: This fix the 2.0hub + 1.1 udisks bug ++ /* only control transfer makes trouble */ ++ if (usb_pipecontrol (urb->pipe)){ ++ ehci_urb_dma_sync(&ehci->hcd, urb); ++ } ++ + urb->hcpriv = 0; + switch (urb->status) { + case -EINPROGRESS: /* success */ +@@ -799,6 +824,10 @@ + { + struct ehci_qh *qh = 0; + ++ //pete ++ //printk("in qh_append_tds\n"); ++ //show_bytes((unsigned char *)&urb->dev->descriptor, 18); ++ + qh = (struct ehci_qh *) *ptr; + if (unlikely (qh == 0)) { + /* can't sleep here, we have ehci->lock... */ +@@ -903,6 +932,9 @@ + dummy->hw_token = token; + + urb->hcpriv = qh_get (qh); ++ //pete ++ //show_bytes((unsigned char *)&urb->dev->descriptor, 18); ++ //show_bytes((unsigned char *)&dma, 18); + } + } + return qh; +--- R29/drivers/usb/host/usb-uhci.c 2004-03-24 20:42:22.000000000 +0000 ++++ R63/drivers/usb/host/usb-uhci.c 2004-11-11 09:38:55.000000000 +0000 +@@ -16,7 +16,7 @@ + * (C) Copyright 1999 Randy Dunlap + * (C) Copyright 1999 Gregory P. Smith + * +- * $Id: usb-uhci.c,v 1.1 2004/03/24 20:42:22 sure Exp $ ++ * $Id: usb-uhci.c,v 1.3 2004/10/19 03:36:08 pete Exp $ + */ + + #include +@@ -53,7 +53,7 @@ + /* This enables an extra UHCI slab for memory debugging */ + #define DEBUG_SLAB + +-#define VERSTR "$Revision: 1.1 $ time " __TIME__ " " __DATE__ ++#define VERSTR "$Revision: 1.3 $ time " __TIME__ " " __DATE__ + + #include + #include "usb-uhci.h" +@@ -2330,6 +2330,10 @@ + status stage is completed + */ + ++ //Pete ++ //uhci_urb_dma_sync(s, urb, urb->hcpriv); ++ // ++ + if (urb_priv->flags && + ((qh->hw.qh.element == cpu_to_le32(UHCI_PTR_TERM)) || !is_td_active(desc))) + goto transfer_finished; +@@ -2364,6 +2368,10 @@ + else if ((le32_to_cpu(desc->hw.td.info) & 0xff) != USB_PID_SETUP) + urb->actual_length += actual_length; + ++ //Pete ++ uhci_urb_dma_sync(s, urb, urb->hcpriv); ++ // ++ + // got less data than requested + if ( (actual_length < maxlength)) { + if (urb->transfer_flags & USB_DISABLE_SPD) { +--- R29/drivers/usb/hub.c 2004-03-24 19:55:48.000000000 +0000 ++++ R63/drivers/usb/hub.c 2005-06-02 07:31:32.000000000 +0100 +@@ -726,7 +726,6 @@ + break; + } + +- hub->children[port] = dev; + + /* Reset the device */ + if (usb_hub_port_reset(hub, port, dev, delay)) { +@@ -776,8 +775,11 @@ + } + + /* Run it through the hoops (find a driver, etc) */ +- if (!usb_new_device(dev)) ++ if (!usb_new_device(dev)){ ++ //pete ++ hub->children[port] = dev; + goto done; ++ } + + /* Free the configuration if there was an error */ + usb_free_dev(dev); +@@ -896,9 +898,9 @@ + usb_clear_port_feature(dev, i + 1, USB_PORT_FEAT_C_RESET); + } + // if (portchange&&(!list_empty(&hub_event_list.next))){ +- if (portchange){ +- break;//super +- } ++// if (portchange){ ++// break;//super ++// } + } /* end for i */ + + /* deal with hub status changes */ +--- linux-2.4.22-r29/drivers/usb/storage/transport.c 2005-11-27 21:09:04.000000000 +0100 ++++ linux-2.4.22/drivers/usb/storage/transport.c 2005-11-28 15:56:40.000000000 +0100 +@@ -1,6 +1,6 @@ + /* Driver for USB Mass Storage compliant devices + * +- * $Id: transport.c,v 1.1 2004/03/24 20:43:17 sure Exp $ ++ * $Id: transport.c,v 1.2 2004/09/29 03:56:50 super Exp $ + * + * Current development and maintenance by: + * (c) 1999-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net) +@@ -1244,6 +1244,8 @@ + goto out; + } + ++ udelay(100); /* For GL811E Chip */ ++ + /* if the command transfered well, then we go to the data stage */ + if (result == 0) { + +--- linux-2.4.22-r29/drivers/usb/storage/usb.c 2005-11-27 21:09:04.000000000 +0100 ++++ linux-2.4.22/drivers/usb/storage/usb.c 2005-11-28 16:10:25.000000000 +0100 +@@ -1,6 +1,6 @@ + /* Driver for USB Mass Storage compliant devices + * +- * $Id: usb.c,v 1.2 2004/08/30 06:54:48 sure Exp $ ++ * $Id: usb.c,v 1.2 2004/10/08 03:41:34 pete Exp $ + * + * Current development and maintenance by: + * (c) 1999-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net) +@@ -561,7 +561,7 @@ + GUID(guid); /* Global Unique Identifier */ + unsigned int flags; + struct us_unusual_dev *unusual_dev; +- struct us_data *ss = NULL, *pre_ss, *tmp /* grant */; ++ struct us_data *ss = NULL; /* grant */; + #ifdef CONFIG_USB_STORAGE_SDDR09 + int result; + #endif +@@ -705,23 +705,11 @@ + */ + ss = us_list; + /* modified to free unusable node by grant */ +- pre_ss = us_list; ++ + while ((ss != NULL) && + ((ss->pusb_dev) || !GUID_EQUAL(guid, ss->guid))) +- { +- pre_ss = ss; + ss = ss->next; +- } +- /* end mod */ +-//super add +-#if 0 +- if (ss != NULL){ +- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); +- free_us_data( pre_ss, ss ); +- usb_dec_dev_use(dev); +- } +-#endif +-// ++ + if (ss != NULL) { + /* Existing device -- re-connect */ + US_DEBUGP("Found existing GUID " GUID_FORMAT "\n", +@@ -747,95 +735,6 @@ + USB_ENDPOINT_NUMBER_MASK; + ss->ep_int = ep_int; + +- /* grant 01/30 */ +-#if 0 +- if ( 0x32 != dev->bus->bus_name[6] ) +- { +- dev->devpath[0] = dev->bus->bus_name[6] + 1; +- } +- /* restrict device on certain port */ +- if ( ss->htmplt.removable ^ (USB_DEVPATH_2 == dev->devpath[0]) ) +- { +- printk("* (old)%s disk not allowed on port:%s\n", ss->htmplt.removable ? "flash" : "hard", dev->devpath); +- usb_dec_dev_use(dev); +- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); +- free_us_data( pre_ss, ss ); +- return NULL; +- } +- if (ss->htmplt.removable){ +- // add by super +- remove_proc_entry("usb_conn",NULL); +- *IXP425_GPIO_GPOUTR &= 0xfffb; +- create_proc_read_entry("usb_conn", +- 0, +- NULL, +- NULL, +- NULL +- ); +- }else{ +- remove_proc_entry("hd_conn",NULL); +- *IXP425_GPIO_GPOUTR &= 0xfff7; +- create_proc_read_entry("hd_conn", +- 0, +- NULL, +- NULL, +- NULL +- ); +- } +- printk("rscsi_disk capacity is %d@@@@@@@@@@@@@@@@\n",ss->host->host_queue->sector_size); +- if(ss->host->host_queue->sector_size<40000000){ +- ss->htmplt.removable = 1; +- } +-#endif +-#if 0 +- /* restrict device on certain port */ +- if ( ss->htmplt.removable && (USB_DEVPATH_1 == dev->devpath[0])) +- if ( ss->htmplt.removable ^ (USB_DEVPATH_2 == dev->devpath[0]) ) +- { +- create_proc_read_entry("usb_err", +- 0, +- NULL, +- NULL, +- NULL +- ); +- printk("* (old)%s disk not allowed on port:%s\n", ss->htmplt.removable ? "flash" : "hard", dev->devpath); +- usb_dec_dev_use(dev); +- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); +- free_us_data( pre_ss, ss ); +- return NULL; +- } +-#endif +- if (ss->htmplt.removable && (USB_DEVPATH_2 == dev->devpath[0])){ +- printk("is removable disk \n"); +- *IXP425_GPIO_GPOUTR &= 0xfffb; +- create_proc_read_entry("usb_conn", +- 0, +- NULL, +- NULL, +- NULL +- ); +- }else { +- printk("%x port connect\n",dev->devpath[0]); +- if(0x31 == dev->devpath[0]){ +- *IXP425_GPIO_GPOUTR &= 0xfff7; +- create_proc_read_entry("hd_conn", +- 0, +- NULL, +- NULL, +- NULL +- ); +- }else{ +- *IXP425_GPIO_GPOUTR &= 0xfffb; +- create_proc_read_entry("hd2_conn", +- 0, +- NULL, +- NULL, +- NULL +- ); +- } +- } +- //end +- + /* allocate an IRQ callback if one is needed */ + if ((ss->protocol == US_PR_CBI) && usb_stor_allocate_irq(ss)) { + usb_dec_dev_use(dev); +@@ -857,6 +756,23 @@ + up(&(ss->dev_semaphore)); + + } else { ++#if 0 ++ //grant,pete ++ if ( ss->htmplt.removable ^ (USB_DEVPATH_2 == dev->devpath[0]) ) ++ { ++ create_proc_read_entry("usb_err", ++ 0, ++ NULL, ++ NULL, ++ NULL ++ ); ++ printk("* (old)%s disk not allowed on port:%s\n", ss->htmplt.removable ? "flash" : "hard", dev->devpath); ++ usb_dec_dev_use(dev); ++ scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); ++ return NULL; ++ } ++ // ++#endif + /* New device -- allocate memory and initialize */ + US_DEBUGP("New GUID " GUID_FORMAT "\n", GUID_ARGS(guid)); + +@@ -1103,11 +1019,7 @@ + sizeof(usb_stor_host_template)); + + /* Grab the next host number */ +- //ss->host_number = my_host_number++; +- +- /* fix device name & host number by grant */ +-// ss->host_number = dev->devpath[0] - USB_DEVPATH_1 ; +- ss->host_number = USB_DEVPATH_2 - dev->devpath[0]; ++ ss->host_number = my_host_number++; + + /* We abuse this pointer so we can pass the ss pointer to + * the host controller thread in us_detect. But how else are +@@ -1128,7 +1040,6 @@ + * the device if it needs initialization */ + if (unusual_dev && unusual_dev->initFunction) + unusual_dev->initFunction(ss); +- printk("before kernel thread \n"); + /* start up our control thread */ + ss->pid = kernel_thread(usb_stor_control_thread, ss, + CLONE_VM); +@@ -1146,60 +1057,11 @@ + + /* now register - our detect function will be called */ + ss->htmplt.module = THIS_MODULE; +- /*debug by grant*/ +-// printk("!! 1\n"); + +- /* grant 01/30 */ +- // printk ("* bus = %c\n", dev->bus->bus_name[6]); +- #if 0 +- if ( 0x32 != dev->bus->bus_name[6] ) +- { +- dev->devpath[0] = dev->bus->bus_name[6] + 1; +- // dev->devpath[0] = 0x32; +- } +-// printk("devpath = %c\n",dev->devpath[0]); +-#endif + ss->htmplt.port = dev->devpath[0]; + +- tmp = us_list; +- pre_ss = tmp; +- while ( NULL != tmp ) +- { +- /* free old device node by grant */ +- if( (tmp->htmplt.port == ss->htmplt.port) && (!GUID_EQUAL(tmp->guid, ss->guid)) ) +- { +- scsi_unregister_module(MODULE_SCSI_HA, &(tmp->htmplt)); +-// printk("* (2)scsi_unregister_module\n"); +- free_us_data( pre_ss, tmp ); +- break; +- } +- pre_ss = tmp; +- tmp = tmp->next; +- } +- + scsi_register_module(MODULE_SCSI_HA, &(ss->htmplt)); + +- /* check device port grant */ +- if ( 1 == ss->host->porttype ) +- { +-// printk("* (usb)scsi_unregister_module\n"); +- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); +- kfree(ss->current_urb); +- kfree(ss); +- usb_dec_dev_use(dev); +- return NULL; +- } +- +- /* debug grant */ +- i = 0; +- tmp = us_list; +- while ( NULL != tmp ) +- { +- i ++; +- tmp = tmp->next; +- } +-// printk("* (usb)scsi_register_module okay! us_data:%d\n", i ); +- + /* lock access to the data structures */ + down(&us_list_semaphore); + +@@ -1248,34 +1110,18 @@ + } + + +- + /* Handle a disconnect event from the USB core */ + static void storage_disconnect(struct usb_device *dev, void *ptr) + { + struct us_data *ss = ptr; +-// struct us_data *pre_ss; ++ struct us_data *tmp,*pre_ss; + int result; +-//super add +- char serial[USB_STOR_STRING_LEN]; /* serial number */ +-// GUID(guid); /* Global Unique Identifier */ +-//super modify +- switch(dev->devpath[0]){ +- case 0x31: +- *IXP425_GPIO_GPOUTR |= 0x8; +- remove_proc_entry("hd_conn",NULL); +- break; +- case 0x32: +- *IXP425_GPIO_GPOUTR |= 0x4; +- remove_proc_entry("usb_conn",NULL); +- remove_proc_entry("hd2_conn",NULL); +- break; +- default: +- break; +- } +-//end ++ //Pete ++ int i; ++ // ++ + US_DEBUGP("storage_disconnect() called\n"); + +- memset(serial,0,USB_STOR_STRING_LEN); + /* this is the odd case -- we disconnected but weren't using it */ + if (!ss) { + US_DEBUGP("-- device was not in use\n"); +@@ -1285,6 +1131,35 @@ + /* lock access to the device data structure */ + down(&(ss->dev_semaphore)); + ++ tmp = us_list; ++ pre_ss = tmp; ++ i = 0; ++ ++ while ( tmp != NULL ) ++ { ++ if( (tmp->htmplt.port == ss->htmplt.port) && (GUID_EQUAL(tmp->guid, ss->guid)) ) ++ { ++ scsi_unregister_module(MODULE_SCSI_HA, &(tmp->htmplt)); ++ if( ss == us_list ) ++ { ++ us_list = ss->next; ++ } ++ else if( ss->next == NULL ) ++ { ++ pre_ss->next = NULL; ++ } ++ else ++ { ++ pre_ss->next = ss->next; ++ } ++ ++ break; ++ } ++ i++; ++ pre_ss = tmp; ++ tmp = tmp->next; ++ } ++ + if(ss->extra && ss->extra_destructor){ + ss->extra_destructor(ss->extra); + } +--- R29/drivers/usb/usb.c 2004-07-07 08:31:44.000000000 +0100 ++++ R63/drivers/usb/usb.c 2005-06-29 06:26:23.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include + #ifdef CONFIG_USB_DEBUG +@@ -1014,12 +1015,11 @@ + if (atomic_dec_and_test(&dev->refcnt)) { + dev->bus->op->deallocate(dev); + usb_destroy_configuration(dev); +- + usb_bus_put(dev->bus); +- +- ++ + if(dev) + kfree(dev); ++ dev = NULL; + } + } + +@@ -1749,6 +1749,7 @@ + /* + * Something got disconnected. Get rid of it, and all of its children. + */ ++static int dev_num=0; + void usb_disconnect(struct usb_device **pdev) + { + struct usb_device * dev = *pdev; +@@ -1758,35 +1759,9 @@ + return; + + *pdev = NULL; +- ++ + info("USB disconnect on device %s-%s address %d", + dev->bus->bus_name, dev->devpath, dev->devnum); +-#if 0 +- // add by super +- switch(dev->devpath[0]){ +- case 0x31: +- *IXP425_GPIO_GPOUTR |= 0x8; +- remove_proc_entry("hd_conn",NULL); +- break; +- case 0x32: +- *IXP425_GPIO_GPOUTR |= 0x4; +- remove_proc_entry("usb_conn",NULL); +- remove_proc_entry("hd2_conn",NULL); +- break; +- default: +- break; +- } +- if (*dev->devpath==0x31){ +- *IXP425_GPIO_GPOUTR |= 0x8; +- remove_proc_entry("hd_conn",NULL); +- }else{ +- *IXP425_GPIO_GPOUTR |= 0x4; +- remove_proc_entry("usb_conn",NULL); +- } +-#endif +- if (*dev->devpath==0x31) +- remove_proc_entry("usb_err",NULL); +- //end + if (dev->actconfig) { + for (i = 0; i < dev->actconfig->bNumInterfaces; i++) { + struct usb_interface *interface = &dev->actconfig->interface[i]; +@@ -1808,7 +1783,7 @@ + if (*child) + usb_disconnect(child); + } +- ++ + /* Let policy agent unload modules etc */ + call_policy ("remove", dev); + +@@ -1817,7 +1792,7 @@ + clear_bit(dev->devnum, &dev->bus->devmap.devicemap); + usbdevfs_remove_device(dev); + } +- ++ + /* Free up the device itself */ + usb_free_dev(dev); + } +@@ -2292,7 +2267,7 @@ + + wait_ms(10); /* Let the SET_ADDRESS settle */ + +-//super modify ++ //Pete + err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, &dev->descriptor, 8); + if (err < 8) { + if (err < 0) +@@ -2303,10 +2278,13 @@ + dev->devnum = -1; + return 1; + } +-// ++ ++ //pete, reserve this printk here! ++ printk("Device descriptor:%d bytes received.\n",err); ++ + dev->epmaxpacketin [0] = dev->descriptor.bMaxPacketSize0; + dev->epmaxpacketout[0] = dev->descriptor.bMaxPacketSize0; +- ++ + err = usb_get_device_descriptor(dev); + if (err < (signed)sizeof(dev->descriptor)) { + if (err < 0) +@@ -2314,12 +2292,14 @@ + else + err("USB device descriptor short read (expected %Zi, got %i)", + sizeof(dev->descriptor), err); +- + clear_bit(dev->devnum, &dev->bus->devmap.devicemap); + dev->devnum = -1; + return 1; + } + ++ //pete, reserve this printk here! ++ printk("Device descriptor:%d bytes received.\n",err); ++ + err = usb_get_configuration(dev); + if (err < 0) { + err("unable to get device %d configuration (error=%d)", +--- R29/fs/fat/dir.c 2004-03-24 19:56:01.000000000 +0000 ++++ R63/fs/fat/dir.c 2005-03-31 04:30:53.000000000 +0100 +@@ -198,11 +198,11 @@ + int uni_xlate = MSDOS_SB(sb)->options.unicode_xlate; + int utf8 = MSDOS_SB(sb)->options.utf8; + unsigned short opt_shortname = MSDOS_SB(sb)->options.shortname; +- int ino, chl, i, j, last_u, res = 0; +- loff_t cpos = 0; ++ int chl, i, j, last_u, res = 0; ++ loff_t i_pos, cpos = 0; + + while(1) { +- if (fat_get_entry(inode,&cpos,&bh,&de,&ino) == -1) ++ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos) == -1) + goto EODir; + parse_record: + long_slots = 0; +@@ -253,7 +253,7 @@ + if (ds->id & 0x40) { + unicode[offset + 13] = 0; + } +- if (fat_get_entry(inode,&cpos,&bh,&de,&ino)<0) ++ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos)<0) + goto EODir; + if (slot == 0) + break; +@@ -368,8 +368,9 @@ + int utf8 = MSDOS_SB(sb)->options.utf8; + int nocase = MSDOS_SB(sb)->options.nocase; + unsigned short opt_shortname = MSDOS_SB(sb)->options.shortname; +- int ino, inum, chi, chl, i, i2, j, last, last_u, dotoffset = 0; +- loff_t cpos; ++ unsigned long inum; ++ int chi, chl, i, i2, j, last, last_u, dotoffset = 0; ++ loff_t i_pos, cpos; + + cpos = filp->f_pos; + /* Fake . and .. for the root directory. */ +@@ -392,7 +393,7 @@ + bh = NULL; + GetNew: + long_slots = 0; +- if (fat_get_entry(inode,&cpos,&bh,&de,&ino) == -1) ++ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos) == -1) + goto EODir; + /* Check for long filename entry */ + if (isvfat) { +@@ -449,7 +450,7 @@ + if (ds->id & 0x40) { + unicode[offset + 13] = 0; + } +- if (fat_get_entry(inode,&cpos,&bh,&de,&ino) == -1) ++ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos) == -1) + goto EODir; + if (slot == 0) + break; +@@ -541,7 +542,7 @@ + /* inum = fat_parent_ino(inode,0); */ + inum = filp->f_dentry->d_parent->d_inode->i_ino; + } else { +- struct inode *tmp = fat_iget(sb, ino); ++ struct inode *tmp = fat_iget(sb, i_pos); + if (tmp) { + inum = tmp->i_ino; + iput(tmp); +@@ -690,14 +691,14 @@ + /***** See if directory is empty */ + int fat_dir_empty(struct inode *dir) + { +- loff_t pos; ++ loff_t pos, i_pos; + struct buffer_head *bh; + struct msdos_dir_entry *de; +- int ino,result = 0; ++ int result = 0; + + pos = 0; + bh = NULL; +- while (fat_get_entry(dir,&pos,&bh,&de,&ino) > -1) { ++ while (fat_get_entry(dir,&pos,&bh,&de,&i_pos) > -1) { + /* Ignore vfat longname entries */ + if (de->attr == ATTR_EXT) + continue; +@@ -717,7 +718,7 @@ + /* This assumes that size of cluster is above the 32*slots */ + + int fat_add_entries(struct inode *dir,int slots, struct buffer_head **bh, +- struct msdos_dir_entry **de, int *ino) ++ struct msdos_dir_entry **de, loff_t *i_pos) + { + struct super_block *sb = dir->i_sb; + loff_t offset, curr; +@@ -727,7 +728,7 @@ + offset = curr = 0; + *bh = NULL; + row = 0; +- while (fat_get_entry(dir,&curr,bh,de,ino) > -1) { ++ while (fat_get_entry(dir,&curr,bh,de,i_pos) > -1) { + if (IS_FREE((*de)->name)) { + if (++row == slots) + return offset; +@@ -742,7 +743,7 @@ + if (!new_bh) + return -ENOSPC; + fat_brelse(sb, new_bh); +- do fat_get_entry(dir,&curr,bh,de,ino); while (++row> FAT_HASH_BITS) + (tmp >> FAT_HASH_BITS * 2); + return tmp & FAT_HASH_MASK; + } + +-void fat_attach(struct inode *inode, int i_pos) ++void fat_attach(struct inode *inode, loff_t i_pos) + { + spin_lock(&fat_inode_lock); +- MSDOS_I(inode)->i_location = i_pos; ++ MSDOS_I(inode)->i_pos = i_pos; + list_add(&MSDOS_I(inode)->i_fat_hash, + fat_inode_hashtable + fat_hash(inode->i_sb, i_pos)); + spin_unlock(&fat_inode_lock); +@@ -102,13 +102,13 @@ + void fat_detach(struct inode *inode) + { + spin_lock(&fat_inode_lock); +- MSDOS_I(inode)->i_location = 0; ++ MSDOS_I(inode)->i_pos = 0; + list_del(&MSDOS_I(inode)->i_fat_hash); + INIT_LIST_HEAD(&MSDOS_I(inode)->i_fat_hash); + spin_unlock(&fat_inode_lock); + } + +-struct inode *fat_iget(struct super_block *sb, int i_pos) ++struct inode *fat_iget(struct super_block *sb, loff_t i_pos) + { + struct list_head *p = fat_inode_hashtable + fat_hash(sb, i_pos); + struct list_head *walk; +@@ -120,7 +120,7 @@ + i = list_entry(walk, struct msdos_inode_info, i_fat_hash); + if (i->i_fat_inode->i_sb != sb) + continue; +- if (i->i_location != i_pos) ++ if (i->i_pos != i_pos) + continue; + inode = igrab(i->i_fat_inode); + if (inode) +@@ -133,11 +133,11 @@ + static void fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de); + + struct inode *fat_build_inode(struct super_block *sb, +- struct msdos_dir_entry *de, int ino, int *res) ++ struct msdos_dir_entry *de, loff_t i_pos, int *res) + { + struct inode *inode; + *res = 0; +- inode = fat_iget(sb, ino); ++ inode = fat_iget(sb, i_pos); + if (inode) + goto out; + inode = new_inode(sb); +@@ -147,7 +147,7 @@ + *res = 0; + inode->i_ino = iunique(sb, MSDOS_ROOT_INO); + fat_fill_inode(inode, de); +- fat_attach(inode, ino); ++ fat_attach(inode, i_pos); + insert_inode_hash(inode); + out: + return inode; +@@ -379,7 +379,7 @@ + int nr; + + INIT_LIST_HEAD(&MSDOS_I(inode)->i_fat_hash); +- MSDOS_I(inode)->i_location = 0; ++ MSDOS_I(inode)->i_pos = 0; + MSDOS_I(inode)->i_fat_inode = inode; + inode->i_uid = sbi->options.fs_uid; + inode->i_gid = sbi->options.fs_gid; +@@ -406,7 +406,7 @@ + } + inode->i_blksize = 1 << sbi->cluster_bits; + inode->i_blocks = ((inode->i_size + inode->i_blksize - 1) +- & ~(inode->i_blksize - 1)) >> 9; ++ & ~((loff_t)inode->i_blksize - 1)) >> 9; + MSDOS_I(inode)->i_logstart = 0; + MSDOS_I(inode)->mmu_private = inode->i_size; + +@@ -443,19 +443,25 @@ + return ERR_PTR(-ESTALE); + + inode = iget(sb, fh[0]); +- if (!inode || is_bad_inode(inode) || +- inode->i_generation != fh[1]) { +- if (inode) iput(inode); ++ if (!inode || is_bad_inode(inode) || inode->i_generation != fh[1]) { ++ if (inode) ++ iput(inode); + inode = NULL; + } + if (!inode) { +- /* try 2 - see if i_location is in F-d-c ++ loff_t i_pos; ++ int i_logstart = fh[3] & 0x0fffffff; ++ ++ i_pos = (loff_t)fh[2] << 8; ++ i_pos |= ((fh[3] >> 24) & 0xf0) | (fh[4] >> 28); ++ ++ /* try 2 - see if i_pos is in F-d-c + * require i_logstart to be the same + * Will fail if you truncate and then re-write + */ + +- inode = fat_iget(sb, fh[2]); +- if (inode && MSDOS_I(inode)->i_logstart != fh[3]) { ++ inode = fat_iget(sb, i_pos); ++ if (inode && MSDOS_I(inode)->i_logstart != i_logstart) { + iput(inode); + inode = NULL; + } +@@ -505,23 +511,26 @@ + result->d_op = sb->s_root->d_op; + result->d_flags |= DCACHE_NFSD_DISCONNECTED; + return result; +- +- + } + + int fat_dentry_to_fh(struct dentry *de, __u32 *fh, int *lenp, int needparent) + { + int len = *lenp; + struct inode *inode = de->d_inode; ++ u32 ipos_h, ipos_m, ipos_l; + + if (len < 5) + return 255; /* no room */ ++ ++ ipos_h = MSDOS_I(inode)->i_pos >> 8; ++ ipos_m = (MSDOS_I(inode)->i_pos & 0xf0) << 24; ++ ipos_l = (MSDOS_I(inode)->i_pos & 0x0f) << 28; + *lenp = 5; + fh[0] = inode->i_ino; + fh[1] = inode->i_generation; +- fh[2] = MSDOS_I(inode)->i_location; +- fh[3] = MSDOS_I(inode)->i_logstart; +- fh[4] = MSDOS_I(de->d_parent->d_inode)->i_logstart; ++ fh[2] = ipos_h; ++ fh[3] = ipos_m | MSDOS_I(inode)->i_logstart; ++ fh[4] = ipos_l | MSDOS_I(de->d_parent->d_inode)->i_logstart; + return 3; + } + +@@ -636,7 +645,7 @@ + + sbi->cluster_bits = ffs(logical_sector_size * sbi->cluster_size) - 1; + sbi->fats = b->fats; +- sbi->fat_start = CF_LE_W(b->reserved); ++ sbi->fat_start = CF_LE_W(b->reserved); + sbi->prev_free = 0; + if (!b->fat_length && b->fat32_length) { + struct fat_boot_fsinfo *fsinfo; +@@ -647,7 +656,8 @@ + fat32 = 1; + sbi->fat_length = CF_LE_L(b->fat32_length); + sbi->root_cluster = CF_LE_L(b->root_cluster); +- ++ sb->s_maxbytes = 0xffffffff; ++ + sbi->fsinfo_sector = CF_LE_W(b->info_sector); + /* MC - if info_sector is 0, don't multiply by 0 */ + if (sbi->fsinfo_sector == 0) +@@ -891,7 +901,7 @@ + int nr; + + INIT_LIST_HEAD(&MSDOS_I(inode)->i_fat_hash); +- MSDOS_I(inode)->i_location = 0; ++ MSDOS_I(inode)->i_pos = 0; + MSDOS_I(inode)->i_fat_inode = inode; + inode->i_uid = sbi->options.fs_uid; + inode->i_gid = sbi->options.fs_gid; +@@ -906,10 +916,9 @@ + inode->i_fop = &fat_dir_operations; + + MSDOS_I(inode)->i_start = CF_LE_W(de->start); +- if (sbi->fat_bits == 32) { +- MSDOS_I(inode)->i_start |= +- (CF_LE_W(de->starthi) << 16); +- } ++ if (sbi->fat_bits == 32) ++ MSDOS_I(inode)->i_start |= (CF_LE_W(de->starthi) << 16); ++ + MSDOS_I(inode)->i_logstart = MSDOS_I(inode)->i_start; + inode->i_nlink = fat_subdirs(inode); + /* includes .., compensating for "self" */ +@@ -956,7 +965,7 @@ + /* this is as close to the truth as we can get ... */ + inode->i_blksize = 1 << sbi->cluster_bits; + inode->i_blocks = ((inode->i_size + inode->i_blksize - 1) +- & ~(inode->i_blksize - 1)) >> 9; ++ & ~((loff_t)inode->i_blksize - 1)) >> 9; + inode->i_mtime = inode->i_atime = + date_dos2unix(CF_LE_W(de->time),CF_LE_W(de->date)); + inode->i_ctime = +@@ -971,22 +980,22 @@ + struct super_block *sb = inode->i_sb; + struct buffer_head *bh; + struct msdos_dir_entry *raw_entry; +- unsigned int i_pos; ++ loff_t i_pos; + + retry: +- i_pos = MSDOS_I(inode)->i_location; ++ i_pos = MSDOS_I(inode)->i_pos; + if (inode->i_ino == MSDOS_ROOT_INO || !i_pos) { + return; + } + lock_kernel(); + if (!(bh = fat_bread(sb, i_pos >> MSDOS_SB(sb)->dir_per_block_bits))) { +- printk("dev = %s, ino = %d\n", kdevname(inode->i_dev), i_pos); ++ printk("dev = %s, i_pos = %llu\n", kdevname(inode->i_dev), i_pos); + fat_fs_panic(sb, "msdos_write_inode: unable to read i-node block"); + unlock_kernel(); + return; + } + spin_lock(&fat_inode_lock); +- if (i_pos != MSDOS_I(inode)->i_location) { ++ if (i_pos != MSDOS_I(inode)->i_pos) { + spin_unlock(&fat_inode_lock); + fat_brelse(sb, bh); + unlock_kernel(); +--- R29/fs/fat/misc.c 2004-03-24 19:56:01.000000000 +0000 ++++ R63/fs/fat/misc.c 2005-03-31 04:20:35.000000000 +0100 +@@ -316,11 +316,12 @@ + */ + + int fat__get_entry(struct inode *dir, loff_t *pos,struct buffer_head **bh, +- struct msdos_dir_entry **de, int *ino) ++ struct msdos_dir_entry **de, loff_t *i_pos) + { + struct super_block *sb = dir->i_sb; + struct msdos_sb_info *sbi = MSDOS_SB(sb); +- int sector, offset; ++ int sector; ++ loff_t offset; + + while (1) { + offset = *pos; +@@ -343,7 +344,7 @@ + + offset &= sb->s_blocksize - 1; + *de = (struct msdos_dir_entry *) ((*bh)->b_data + offset); +- *ino = (sector << sbi->dir_per_block_bits) + (offset >> MSDOS_DIR_BITS); ++ *i_pos = ((loff_t)sector << sbi->dir_per_block_bits) + (offset >> MSDOS_DIR_BITS); + + return 0; + } +@@ -383,7 +384,7 @@ + done = !IS_FREE(data[entry].name) \ + && ( \ + ( \ +- (MSDOS_SB(sb)->fat_bits != 32) ? 0 : (CF_LE_W(data[entry].starthi) << 16) \ ++ (sbi->fat_bits != 32) ? 0 : (CF_LE_W(data[entry].starthi) << 16) \ + ) \ + | CF_LE_W(data[entry].start) \ + ) == *number; +@@ -400,35 +401,38 @@ + (*number)++; \ + } + +-static int raw_scan_sector(struct super_block *sb,int sector,const char *name, +- int *number,int *ino,struct buffer_head **res_bh, +- struct msdos_dir_entry **res_de) ++static int raw_scan_sector(struct super_block *sb, int sector, ++ const char *name, int *number, loff_t *i_pos, ++ struct buffer_head **res_bh, ++ struct msdos_dir_entry **res_de) + { ++ struct msdos_sb_info *sbi = MSDOS_SB(sb); + struct buffer_head *bh; + struct msdos_dir_entry *data; + int entry,start,done; + +- if (!(bh = fat_bread(sb,sector))) ++ if (!(bh = fat_bread(sb, sector))) + return -EIO; + data = (struct msdos_dir_entry *) bh->b_data; +- for (entry = 0; entry < MSDOS_SB(sb)->dir_per_block; entry++) { ++ for (entry = 0; entry < sbi->dir_per_block; entry++) { + /* RSS_COUNT: if (data[entry].name == name) done=true else done=false. */ + if (name) { + RSS_NAME + } else { +- if (!ino) RSS_COUNT ++ if (!i_pos) RSS_COUNT + else { + if (number) RSS_START + else RSS_FREE + } + } + if (done) { +- if (ino) +- *ino = sector * MSDOS_SB(sb)->dir_per_block + entry; ++ if (i_pos) { ++ *i_pos = ((loff_t)sector << sbi->dir_per_block_bits) + entry; ++ } + start = CF_LE_W(data[entry].start); +- if (MSDOS_SB(sb)->fat_bits == 32) { ++ if (sbi->fat_bits == 32) + start |= (CF_LE_W(data[entry].starthi) << 16); +- } ++ + if (!res_bh) + fat_brelse(sb, bh); + else { +@@ -448,16 +452,19 @@ + * requested entry is found or the end of the directory is reached. + */ + +-static int raw_scan_root(struct super_block *sb,const char *name,int *number,int *ino, +- struct buffer_head **res_bh,struct msdos_dir_entry **res_de) ++static int raw_scan_root(struct super_block *sb, const char *name, ++ int *number, loff_t *i_pos, ++ struct buffer_head **res_bh, ++ struct msdos_dir_entry **res_de) + { + int count,cluster; + + for (count = 0; + count < MSDOS_SB(sb)->dir_entries / MSDOS_SB(sb)->dir_per_block; + count++) { +- if ((cluster = raw_scan_sector(sb,MSDOS_SB(sb)->dir_start+count, +- name,number,ino,res_bh,res_de)) >= 0) ++ cluster = raw_scan_sector(sb, MSDOS_SB(sb)->dir_start + count, ++ name, number, i_pos, res_bh, res_de); ++ if (cluster >= 0) + return cluster; + } + return -ENOENT; +@@ -469,20 +476,24 @@ + * requested entry is found or the end of the directory is reached. + */ + +-static int raw_scan_nonroot(struct super_block *sb,int start,const char *name, +- int *number,int *ino,struct buffer_head **res_bh,struct msdos_dir_entry +- **res_de) ++static int raw_scan_nonroot(struct super_block *sb, int start, const char *name, ++ int *number, loff_t *i_pos, ++ struct buffer_head **res_bh, ++ struct msdos_dir_entry **res_de) + { +- int count,cluster; ++ struct msdos_sb_info *sbi = MSDOS_SB(sb); ++ int count, cluster, sector; + + #ifdef DEBUG + printk("raw_scan_nonroot: start=%d\n",start); + #endif + do { +- for (count = 0; count < MSDOS_SB(sb)->cluster_size; count++) { +- if ((cluster = raw_scan_sector(sb,(start-2)* +- MSDOS_SB(sb)->cluster_size+MSDOS_SB(sb)->data_start+ +- count,name,number,ino,res_bh,res_de)) >= 0) ++ for (count = 0; count < sbi->cluster_size; count++) { ++ sector = (start - 2) * sbi->cluster_size ++ + count + sbi->data_start; ++ cluster = raw_scan_sector(sb, sector, name, number, ++ i_pos, res_bh, res_de); ++ if (cluster >= 0) + return cluster; + } + if (!(start = fat_access(sb,start,-1))) { +@@ -506,13 +517,13 @@ + */ + + static int raw_scan(struct super_block *sb, int start, const char *name, +- int *number, int *ino, struct buffer_head **res_bh, +- struct msdos_dir_entry **res_de) ++ loff_t *i_pos, struct buffer_head **res_bh, ++ struct msdos_dir_entry **res_de) + { + if (start) +- return raw_scan_nonroot(sb,start,name,number,ino,res_bh,res_de); ++ return raw_scan_nonroot(sb,start,name,NULL,i_pos,res_bh,res_de); + else +- return raw_scan_root(sb,name,number,ino,res_bh,res_de); ++ return raw_scan_root(sb,name,NULL,i_pos,res_bh,res_de); + } + + /* +@@ -521,19 +532,21 @@ + */ + int fat_subdirs(struct inode *dir) + { +- int count; ++ struct msdos_sb_info *sbi = MSDOS_SB(dir->i_sb); ++ int number; + +- count = 0; +- if ((dir->i_ino == MSDOS_ROOT_INO) && +- (MSDOS_SB(dir->i_sb)->fat_bits != 32)) { +- (void) raw_scan_root(dir->i_sb,NULL,&count,NULL,NULL,NULL); +- } else { +- if ((dir->i_ino != MSDOS_ROOT_INO) && +- !MSDOS_I(dir)->i_start) return 0; /* in mkdir */ +- else (void) raw_scan_nonroot(dir->i_sb,MSDOS_I(dir)->i_start, +- NULL,&count,NULL,NULL,NULL); ++ number = 0; ++ if ((dir->i_ino == MSDOS_ROOT_INO) && (sbi->fat_bits != 32)) ++ raw_scan_root(dir->i_sb, NULL, &number, NULL, NULL, NULL); ++ else { ++ if ((dir->i_ino != MSDOS_ROOT_INO) && !MSDOS_I(dir)->i_start) ++ return 0; /* in mkdir */ ++ else { ++ raw_scan_nonroot(dir->i_sb, MSDOS_I(dir)->i_start, ++ NULL, &number, NULL, NULL, NULL); ++ } + } +- return count; ++ return number; + } + + +@@ -542,12 +555,12 @@ + * for an empty directory slot (name is NULL). Returns an error code or zero. + */ + +-int fat_scan(struct inode *dir,const char *name,struct buffer_head **res_bh, +- struct msdos_dir_entry **res_de,int *ino) ++int fat_scan(struct inode *dir, const char *name, struct buffer_head **res_bh, ++ struct msdos_dir_entry **res_de, loff_t *i_pos) + { + int res; + +- res = raw_scan(dir->i_sb,MSDOS_I(dir)->i_start, +- name, NULL, ino, res_bh, res_de); +- return res<0 ? res : 0; ++ res = raw_scan(dir->i_sb, MSDOS_I(dir)->i_start, name, i_pos, ++ res_bh, res_de); ++ return (res < 0) ? res : 0; + } +--- R29/fs/nls/nls_cp932.c 2004-03-24 19:56:02.000000000 +0000 ++++ R63/fs/nls/nls_cp932.c 2005-08-09 03:30:27.000000000 +0100 +@@ -7859,7 +7859,7 @@ + if (boundlen <= 0) + return -ENAMETOOLONG; + +- if (rawstring[0] <= 0x7F) { ++ if (rawstring[0] <= 0x7F || !(rawstring[1]>=0x40 && rawstring[1]<=0xFC && rawstring[1]!=0x7F)) { + *uni = rawstring[0]; + return 1; + } +--- R29/fs/nls/nls_cp936.c 2004-03-24 19:56:02.000000000 +0000 ++++ R63/fs/nls/nls_cp936.c 2005-08-09 04:01:39.000000000 +0100 +@@ -3,8 +3,10 @@ + * + * Charset cp936 translation tables. + * This translation table was generated automatically, the +- * original table can be download from the Microsoft website. +- * (http://www.microsoft.com/typography/unicode/unicodecp.htm) ++ * original table can be found at the Microsoft website. ++ * (http://www.microsoft.com/globaldev/reference/dbcs/936.htm) ++ * download GBK.TXT from MIT Edu website ++ * (http://web.mit.edu/afs/dev.mit.edu/source/src-current/third/libiconv/tests/GBK.TXT) + */ + + #include +@@ -29,7 +31,7 @@ + 0x4E63,0x4E64,0x4E65,0x4E67,0x4E68,0x4E6A,0x4E6B,0x4E6C,/* 0x60-0x67 */ + 0x4E6D,0x4E6E,0x4E6F,0x4E72,0x4E74,0x4E75,0x4E76,0x4E77,/* 0x68-0x6F */ + 0x4E78,0x4E79,0x4E7A,0x4E7B,0x4E7C,0x4E7D,0x4E7F,0x4E80,/* 0x70-0x77 */ +- 0x4E81,0xF91B,0x4E83,0x4E84,0x4E85,0x4E87,0x4E8A,0x0000,/* 0x78-0x7F */ ++ 0x4E81,0x4E82,0x4E83,0x4E84,0x4E85,0x4E87,0x4E8A,0x0000,/* 0x78-0x7F */ + + 0x4E90,0x4E96,0x4E97,0x4E99,0x4E9C,0x4E9D,0x4E9E,0x4EA3,/* 0x80-0x87 */ + 0x4EAA,0x4EAF,0x4EB0,0x4EB1,0x4EB4,0x4EB6,0x4EB7,0x4EB8,/* 0x88-0x8F */ +@@ -44,7 +46,7 @@ + 0x4F47,0x4F48,0x4F49,0x4F4A,0x4F4B,0x4F4C,0x4F52,0x4F54,/* 0xD0-0xD7 */ + 0x4F56,0x4F61,0x4F62,0x4F66,0x4F68,0x4F6A,0x4F6B,0x4F6D,/* 0xD8-0xDF */ + 0x4F6E,0x4F71,0x4F72,0x4F75,0x4F77,0x4F78,0x4F79,0x4F7A,/* 0xE0-0xE7 */ +- 0x4F7D,0x4F80,0x4F81,0x4F82,0x4F85,0xF92D,0x4F87,0x4F8A,/* 0xE8-0xEF */ ++ 0x4F7D,0x4F80,0x4F81,0x4F82,0x4F85,0x4F86,0x4F87,0x4F8A,/* 0xE8-0xEF */ + 0x4F8C,0x4F8E,0x4F90,0x4F92,0x4F93,0x4F95,0x4F96,0x4F98,/* 0xF0-0xF7 */ + 0x4F99,0x4F9A,0x4F9C,0x4F9E,0x4F9F,0x4FA1,0x4FA2,0x0000,/* 0xF8-0xFF */ + }; +@@ -69,7 +71,7 @@ + + 0x500B,0x500E,0x5010,0x5011,0x5013,0x5015,0x5016,0x5017,/* 0x80-0x87 */ + 0x501B,0x501D,0x501E,0x5020,0x5022,0x5023,0x5024,0x5027,/* 0x88-0x8F */ +- 0xF9D4,0x502F,0x5030,0x5031,0x5032,0x5033,0x5034,0x5035,/* 0x90-0x97 */ ++ 0x502B,0x502F,0x5030,0x5031,0x5032,0x5033,0x5034,0x5035,/* 0x90-0x97 */ + 0x5036,0x5037,0x5038,0x5039,0x503B,0x503D,0x503F,0x5040,/* 0x98-0x9F */ + 0x5041,0x5042,0x5044,0x5045,0x5046,0x5049,0x504A,0x504B,/* 0xA0-0xA7 */ + 0x504D,0x5050,0x5051,0x5052,0x5053,0x5054,0x5056,0x5057,/* 0xA8-0xAF */ +@@ -112,7 +114,7 @@ + 0x513C,0x513D,0x513E,0x5142,0x5147,0x514A,0x514C,0x514E,/* 0xB0-0xB7 */ + 0x514F,0x5150,0x5152,0x5153,0x5157,0x5158,0x5159,0x515B,/* 0xB8-0xBF */ + 0x515D,0x515E,0x515F,0x5160,0x5161,0x5163,0x5164,0x5166,/* 0xC0-0xC7 */ +- 0x5167,0xF978,0x516A,0x516F,0x5172,0x517A,0x517E,0x517F,/* 0xC8-0xCF */ ++ 0x5167,0x5169,0x516A,0x516F,0x5172,0x517A,0x517E,0x517F,/* 0xC8-0xCF */ + 0x5183,0x5184,0x5186,0x5187,0x518A,0x518B,0x518E,0x518F,/* 0xD0-0xD7 */ + 0x5190,0x5191,0x5193,0x5194,0x5198,0x519A,0x519D,0x519E,/* 0xD8-0xDF */ + 0x519F,0x51A1,0x51A3,0x51A6,0x51A7,0x51A8,0x51A9,0x51AA,/* 0xE0-0xE7 */ +@@ -130,7 +132,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x51D8,0x51D9,0x51DA,0xF954,0xFA15,0x51DF,0x51E2,0x51E3,/* 0x40-0x47 */ ++ 0x51D8,0x51D9,0x51DA,0x51DC,0x51DE,0x51DF,0x51E2,0x51E3,/* 0x40-0x47 */ + 0x51E5,0x51E6,0x51E7,0x51E8,0x51E9,0x51EA,0x51EC,0x51EE,/* 0x48-0x4F */ + 0x51F1,0x51F2,0x51F4,0x51F7,0x51FE,0x5204,0x5205,0x5209,/* 0x50-0x57 */ + 0x520B,0x520C,0x520F,0x5210,0x5213,0x5214,0x5215,0x521C,/* 0x58-0x5F */ +@@ -143,16 +145,16 @@ + 0x5264,0x5266,0x5268,0x526B,0x526C,0x526D,0x526E,0x5270,/* 0x88-0x8F */ + 0x5271,0x5273,0x5274,0x5275,0x5276,0x5277,0x5278,0x5279,/* 0x90-0x97 */ + 0x527A,0x527B,0x527C,0x527E,0x5280,0x5283,0x5284,0x5285,/* 0x98-0x9F */ +- 0x5286,0x5287,0xF9C7,0x528A,0x528B,0x528C,0x528D,0x528E,/* 0xA0-0xA7 */ ++ 0x5286,0x5287,0x5289,0x528A,0x528B,0x528C,0x528D,0x528E,/* 0xA0-0xA7 */ + 0x528F,0x5291,0x5292,0x5294,0x5295,0x5296,0x5297,0x5298,/* 0xA8-0xAF */ + 0x5299,0x529A,0x529C,0x52A4,0x52A5,0x52A6,0x52A7,0x52AE,/* 0xB0-0xB7 */ + 0x52AF,0x52B0,0x52B4,0x52B5,0x52B6,0x52B7,0x52B8,0x52B9,/* 0xB8-0xBF */ + 0x52BA,0x52BB,0x52BC,0x52BD,0x52C0,0x52C1,0x52C2,0x52C4,/* 0xC0-0xC7 */ + 0x52C5,0x52C6,0x52C8,0x52CA,0x52CC,0x52CD,0x52CE,0x52CF,/* 0xC8-0xCF */ + 0x52D1,0x52D3,0x52D4,0x52D5,0x52D7,0x52D9,0x52DA,0x52DB,/* 0xD0-0xD7 */ +- 0x52DC,0x52DD,0xF92F,0x52E0,0x52E1,0x52E2,0x52E3,0x52E5,/* 0xD8-0xDF */ ++ 0x52DC,0x52DD,0x52DE,0x52E0,0x52E1,0x52E2,0x52E3,0x52E5,/* 0xD8-0xDF */ + 0x52E6,0x52E7,0x52E8,0x52E9,0x52EA,0x52EB,0x52EC,0x52ED,/* 0xE0-0xE7 */ +- 0x52EE,0x52EF,0x52F1,0x52F2,0x52F3,0x52F4,0xF97F,0x52F6,/* 0xE8-0xEF */ ++ 0x52EE,0x52EF,0x52F1,0x52F2,0x52F3,0x52F4,0x52F5,0x52F6,/* 0xE8-0xEF */ + 0x52F7,0x52F8,0x52FB,0x52FC,0x52FD,0x5301,0x5302,0x5303,/* 0xF0-0xF7 */ + 0x5304,0x5307,0x5309,0x530A,0x530B,0x530C,0x530E,0x0000,/* 0xF8-0xFF */ + }; +@@ -179,12 +181,12 @@ + 0x539B,0x539C,0x539E,0x53A0,0x53A1,0x53A4,0x53A7,0x53AA,/* 0x88-0x8F */ + 0x53AB,0x53AC,0x53AD,0x53AF,0x53B0,0x53B1,0x53B2,0x53B3,/* 0x90-0x97 */ + 0x53B4,0x53B5,0x53B7,0x53B8,0x53B9,0x53BA,0x53BC,0x53BD,/* 0x98-0x9F */ +- 0x53BE,0x53C0,0xF96B,0x53C4,0x53C5,0x53C6,0x53C7,0x53CE,/* 0xA0-0xA7 */ ++ 0x53BE,0x53C0,0x53C3,0x53C4,0x53C5,0x53C6,0x53C7,0x53CE,/* 0xA0-0xA7 */ + 0x53CF,0x53D0,0x53D2,0x53D3,0x53D5,0x53DA,0x53DC,0x53DD,/* 0xA8-0xAF */ + 0x53DE,0x53E1,0x53E2,0x53E7,0x53F4,0x53FA,0x53FE,0x53FF,/* 0xB0-0xB7 */ + 0x5400,0x5402,0x5405,0x5407,0x540B,0x5414,0x5418,0x5419,/* 0xB8-0xBF */ + 0x541A,0x541C,0x5422,0x5424,0x5425,0x542A,0x5430,0x5433,/* 0xC0-0xC7 */ +- 0x5436,0x5437,0x543A,0x543D,0x543F,0x5441,0xF980,0x5444,/* 0xC8-0xCF */ ++ 0x5436,0x5437,0x543A,0x543D,0x543F,0x5441,0x5442,0x5444,/* 0xC8-0xCF */ + 0x5445,0x5447,0x5449,0x544C,0x544D,0x544E,0x544F,0x5451,/* 0xD0-0xD7 */ + 0x545A,0x545D,0x545E,0x545F,0x5460,0x5461,0x5463,0x5465,/* 0xD8-0xDF */ + 0x5467,0x5469,0x546A,0x546B,0x546C,0x546D,0x546E,0x546F,/* 0xE0-0xE7 */ +@@ -312,7 +314,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x583E,0x583F,0x5840,0x5841,0x5842,0x5843,0x5845,0x5846,/* 0x40-0x47 */ + 0x5847,0x5848,0x5849,0x584A,0x584B,0x584E,0x584F,0x5850,/* 0x48-0x4F */ +- 0x5852,0x5853,0x5855,0x5856,0x5857,0x5859,0xFA10,0x585B,/* 0x50-0x57 */ ++ 0x5852,0x5853,0x5855,0x5856,0x5857,0x5859,0x585A,0x585B,/* 0x50-0x57 */ + 0x585C,0x585D,0x585F,0x5860,0x5861,0x5862,0x5863,0x5864,/* 0x58-0x5F */ + 0x5866,0x5867,0x5868,0x5869,0x586A,0x586D,0x586E,0x586F,/* 0x60-0x67 */ + 0x5870,0x5871,0x5872,0x5873,0x5874,0x5875,0x5876,0x5877,/* 0x68-0x6F */ +@@ -326,8 +328,8 @@ + 0x58B5,0x58B6,0x58B7,0x58B8,0x58B9,0x58BA,0x58BB,0x58BD,/* 0xA0-0xA7 */ + 0x58BE,0x58BF,0x58C0,0x58C2,0x58C3,0x58C4,0x58C6,0x58C7,/* 0xA8-0xAF */ + 0x58C8,0x58C9,0x58CA,0x58CB,0x58CC,0x58CD,0x58CE,0x58CF,/* 0xB0-0xB7 */ +- 0x58D0,0x58D2,0x58D3,0x58D4,0x58D6,0x58D7,0xF94A,0x58D9,/* 0xB8-0xBF */ +- 0x58DA,0x58DB,0x58DC,0x58DD,0x58DE,0xF942,0x58E0,0x58E1,/* 0xC0-0xC7 */ ++ 0x58D0,0x58D2,0x58D3,0x58D4,0x58D6,0x58D7,0x58D8,0x58D9,/* 0xB8-0xBF */ ++ 0x58DA,0x58DB,0x58DC,0x58DD,0x58DE,0x58DF,0x58E0,0x58E1,/* 0xC0-0xC7 */ + 0x58E2,0x58E3,0x58E5,0x58E6,0x58E7,0x58E8,0x58E9,0x58EA,/* 0xC8-0xCF */ + 0x58ED,0x58EF,0x58F1,0x58F2,0x58F4,0x58F5,0x58F7,0x58F8,/* 0xD0-0xD7 */ + 0x58FA,0x58FB,0x58FC,0x58FD,0x58FE,0x58FF,0x5900,0x5901,/* 0xD8-0xDF */ +@@ -428,7 +430,7 @@ + 0x5BC8,0x5BC9,0x5BCA,0x5BCB,0x5BCD,0x5BCE,0x5BCF,0x0000,/* 0x78-0x7F */ + + 0x5BD1,0x5BD4,0x5BD5,0x5BD6,0x5BD7,0x5BD8,0x5BD9,0x5BDA,/* 0x80-0x87 */ +- 0x5BDB,0x5BDC,0x5BE0,0x5BE2,0x5BE3,0x5BE6,0xF9AA,0x5BE9,/* 0x88-0x8F */ ++ 0x5BDB,0x5BDC,0x5BE0,0x5BE2,0x5BE3,0x5BE6,0x5BE7,0x5BE9,/* 0x88-0x8F */ + 0x5BEA,0x5BEB,0x5BEC,0x5BED,0x5BEF,0x5BF1,0x5BF2,0x5BF3,/* 0x90-0x97 */ + 0x5BF4,0x5BF5,0x5BF6,0x5BF7,0x5BFD,0x5BFE,0x5C00,0x5C02,/* 0x98-0x9F */ + 0x5C03,0x5C05,0x5C07,0x5C08,0x5C0B,0x5C0C,0x5C0D,0x5C0E,/* 0xA0-0xA7 */ +@@ -437,7 +439,7 @@ + 0x5C2D,0x5C2E,0x5C2F,0x5C30,0x5C32,0x5C33,0x5C35,0x5C36,/* 0xB8-0xBF */ + 0x5C37,0x5C43,0x5C44,0x5C46,0x5C47,0x5C4C,0x5C4D,0x5C52,/* 0xC0-0xC7 */ + 0x5C53,0x5C54,0x5C56,0x5C57,0x5C58,0x5C5A,0x5C5B,0x5C5C,/* 0xC8-0xCF */ +- 0x5C5D,0x5C5F,0xF94B,0x5C64,0x5C67,0x5C68,0x5C69,0x5C6A,/* 0xD0-0xD7 */ ++ 0x5C5D,0x5C5F,0x5C62,0x5C64,0x5C67,0x5C68,0x5C69,0x5C6A,/* 0xD0-0xD7 */ + 0x5C6B,0x5C6C,0x5C6D,0x5C70,0x5C72,0x5C73,0x5C74,0x5C75,/* 0xD8-0xDF */ + 0x5C76,0x5C77,0x5C78,0x5C7B,0x5C7C,0x5C7D,0x5C7E,0x5C80,/* 0xE0-0xE7 */ + 0x5C83,0x5C84,0x5C85,0x5C86,0x5C87,0x5C89,0x5C8A,0x5C8B,/* 0xE8-0xEF */ +@@ -465,12 +467,12 @@ + + 0x5D01,0x5D04,0x5D05,0x5D08,0x5D09,0x5D0A,0x5D0B,0x5D0C,/* 0x80-0x87 */ + 0x5D0D,0x5D0F,0x5D10,0x5D11,0x5D12,0x5D13,0x5D15,0x5D17,/* 0x88-0x8F */ +- 0x5D18,0xF9D5,0x5D1A,0x5D1C,0x5D1D,0x5D1F,0x5D20,0x5D21,/* 0x90-0x97 */ ++ 0x5D18,0x5D19,0x5D1A,0x5D1C,0x5D1D,0x5D1F,0x5D20,0x5D21,/* 0x90-0x97 */ + 0x5D22,0x5D23,0x5D25,0x5D28,0x5D2A,0x5D2B,0x5D2C,0x5D2F,/* 0x98-0x9F */ + 0x5D30,0x5D31,0x5D32,0x5D33,0x5D35,0x5D36,0x5D37,0x5D38,/* 0xA0-0xA7 */ + 0x5D39,0x5D3A,0x5D3B,0x5D3C,0x5D3F,0x5D40,0x5D41,0x5D42,/* 0xA8-0xAF */ + 0x5D43,0x5D44,0x5D45,0x5D46,0x5D48,0x5D49,0x5D4D,0x5D4E,/* 0xB0-0xB7 */ +- 0x5D4F,0xF921,0x5D51,0x5D52,0x5D53,0x5D54,0x5D55,0x5D56,/* 0xB8-0xBF */ ++ 0x5D4F,0x5D50,0x5D51,0x5D52,0x5D53,0x5D54,0x5D55,0x5D56,/* 0xB8-0xBF */ + 0x5D57,0x5D59,0x5D5A,0x5D5C,0x5D5E,0x5D5F,0x5D60,0x5D61,/* 0xC0-0xC7 */ + 0x5D62,0x5D63,0x5D64,0x5D65,0x5D66,0x5D67,0x5D68,0x5D6A,/* 0xC8-0xCF */ + 0x5D6D,0x5D6E,0x5D70,0x5D71,0x5D72,0x5D73,0x5D75,0x5D76,/* 0xD0-0xD7 */ +@@ -493,7 +495,7 @@ + 0x5DA1,0x5DA2,0x5DA3,0x5DA4,0x5DA5,0x5DA6,0x5DA7,0x5DA8,/* 0x40-0x47 */ + 0x5DA9,0x5DAA,0x5DAB,0x5DAC,0x5DAD,0x5DAE,0x5DAF,0x5DB0,/* 0x48-0x4F */ + 0x5DB1,0x5DB2,0x5DB3,0x5DB4,0x5DB5,0x5DB6,0x5DB8,0x5DB9,/* 0x50-0x57 */ +- 0xF9AB,0x5DBB,0x5DBC,0x5DBD,0x5DBE,0x5DBF,0x5DC0,0x5DC1,/* 0x58-0x5F */ ++ 0x5DBA,0x5DBB,0x5DBC,0x5DBD,0x5DBE,0x5DBF,0x5DC0,0x5DC1,/* 0x58-0x5F */ + 0x5DC2,0x5DC3,0x5DC4,0x5DC6,0x5DC7,0x5DC8,0x5DC9,0x5DCA,/* 0x60-0x67 */ + 0x5DCB,0x5DCC,0x5DCE,0x5DCF,0x5DD0,0x5DD1,0x5DD2,0x5DD3,/* 0x68-0x6F */ + 0x5DD4,0x5DD5,0x5DD6,0x5DD7,0x5DD8,0x5DD9,0x5DDA,0x5DDC,/* 0x70-0x77 */ +@@ -529,7 +531,7 @@ + 0x5EC6,0x5EC7,0x5EC8,0x5ECB,0x5ECC,0x5ECD,0x5ECE,0x5ECF,/* 0x40-0x47 */ + 0x5ED0,0x5ED4,0x5ED5,0x5ED7,0x5ED8,0x5ED9,0x5EDA,0x5EDC,/* 0x48-0x4F */ + 0x5EDD,0x5EDE,0x5EDF,0x5EE0,0x5EE1,0x5EE2,0x5EE3,0x5EE4,/* 0x50-0x57 */ +- 0x5EE5,0x5EE6,0x5EE7,0x5EE9,0x5EEB,0xF982,0x5EED,0x5EEE,/* 0x58-0x5F */ ++ 0x5EE5,0x5EE6,0x5EE7,0x5EE9,0x5EEB,0x5EEC,0x5EED,0x5EEE,/* 0x58-0x5F */ + 0x5EEF,0x5EF0,0x5EF1,0x5EF2,0x5EF3,0x5EF5,0x5EF8,0x5EF9,/* 0x60-0x67 */ + 0x5EFB,0x5EFC,0x5EFD,0x5F05,0x5F06,0x5F07,0x5F09,0x5F0C,/* 0x68-0x6F */ + 0x5F0D,0x5F0E,0x5F10,0x5F12,0x5F14,0x5F16,0x5F19,0x5F1A,/* 0x70-0x77 */ +@@ -544,7 +546,7 @@ + 0x5F74,0x5F75,0x5F76,0x5F78,0x5F7A,0x5F7D,0x5F7E,0x5F7F,/* 0xB0-0xB7 */ + 0x5F83,0x5F86,0x5F8D,0x5F8E,0x5F8F,0x5F91,0x5F93,0x5F94,/* 0xB8-0xBF */ + 0x5F96,0x5F9A,0x5F9B,0x5F9D,0x5F9E,0x5F9F,0x5FA0,0x5FA2,/* 0xC0-0xC7 */ +- 0x5FA3,0x5FA4,0x5FA5,0x5FA6,0x5FA7,0xF966,0x5FAB,0x5FAC,/* 0xC8-0xCF */ ++ 0x5FA3,0x5FA4,0x5FA5,0x5FA6,0x5FA7,0x5FA9,0x5FAB,0x5FAC,/* 0xC8-0xCF */ + 0x5FAF,0x5FB0,0x5FB1,0x5FB2,0x5FB3,0x5FB4,0x5FB6,0x5FB8,/* 0xD0-0xD7 */ + 0x5FB9,0x5FBA,0x5FBB,0x5FBE,0x5FBF,0x5FC0,0x5FC1,0x5FC2,/* 0xD8-0xDF */ + 0x5FC7,0x5FC8,0x5FCA,0x5FCB,0x5FCE,0x5FD3,0x5FD4,0x5FD5,/* 0xE0-0xE7 */ +@@ -578,7 +580,7 @@ + 0x60B9,0x60BA,0x60BD,0x60BE,0x60BF,0x60C0,0x60C1,0x60C2,/* 0xA0-0xA7 */ + 0x60C3,0x60C4,0x60C7,0x60C8,0x60C9,0x60CC,0x60CD,0x60CE,/* 0xA8-0xAF */ + 0x60CF,0x60D0,0x60D2,0x60D3,0x60D4,0x60D6,0x60D7,0x60D9,/* 0xB0-0xB7 */ +- 0x60DB,0x60DE,0xF9B9,0x60E2,0x60E3,0x60E4,0x60E5,0x60EA,/* 0xB8-0xBF */ ++ 0x60DB,0x60DE,0x60E1,0x60E2,0x60E3,0x60E4,0x60E5,0x60EA,/* 0xB8-0xBF */ + 0x60F1,0x60F2,0x60F5,0x60F7,0x60F8,0x60FB,0x60FC,0x60FD,/* 0xC0-0xC7 */ + 0x60FE,0x60FF,0x6102,0x6103,0x6104,0x6105,0x6107,0x610A,/* 0xC8-0xCF */ + 0x610B,0x610C,0x6110,0x6111,0x6112,0x6113,0x6114,0x6116,/* 0xD0-0xD7 */ +@@ -586,7 +588,7 @@ + 0x6122,0x6125,0x6128,0x6129,0x612A,0x612C,0x612D,0x612E,/* 0xE0-0xE7 */ + 0x612F,0x6130,0x6131,0x6132,0x6133,0x6134,0x6135,0x6136,/* 0xE8-0xEF */ + 0x6137,0x6138,0x6139,0x613A,0x613B,0x613C,0x613D,0x613E,/* 0xF0-0xF7 */ +- 0x6140,0x6141,0x6142,0x6143,0xF9D9,0x6145,0x6146,0x0000,/* 0xF8-0xFF */ ++ 0x6140,0x6141,0x6142,0x6143,0x6144,0x6145,0x6146,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_91[256] = { +@@ -605,7 +607,7 @@ + 0x6172,0x6173,0x6174,0x6176,0x6178,0x6179,0x617A,0x617B,/* 0x60-0x67 */ + 0x617C,0x617D,0x617E,0x617F,0x6180,0x6181,0x6182,0x6183,/* 0x68-0x6F */ + 0x6184,0x6185,0x6186,0x6187,0x6188,0x6189,0x618A,0x618C,/* 0x70-0x77 */ +- 0x618D,0x618F,0xF98F,0x6191,0x6192,0x6193,0x6195,0x0000,/* 0x78-0x7F */ ++ 0x618D,0x618F,0x6190,0x6191,0x6192,0x6193,0x6195,0x0000,/* 0x78-0x7F */ + + 0x6196,0x6197,0x6198,0x6199,0x619A,0x619B,0x619C,0x619E,/* 0x80-0x87 */ + 0x619F,0x61A0,0x61A1,0x61A2,0x61A3,0x61A4,0x61A5,0x61A6,/* 0x88-0x8F */ +@@ -617,8 +619,8 @@ + 0x61DC,0x61DD,0x61DE,0x61DF,0x61E0,0x61E1,0x61E2,0x61E3,/* 0xB8-0xBF */ + 0x61E4,0x61E5,0x61E7,0x61E8,0x61E9,0x61EA,0x61EB,0x61EC,/* 0xC0-0xC7 */ + 0x61ED,0x61EE,0x61EF,0x61F0,0x61F1,0x61F2,0x61F3,0x61F4,/* 0xC8-0xCF */ +- 0xF90D,0x61F7,0x61F8,0x61F9,0x61FA,0x61FB,0x61FC,0x61FD,/* 0xD0-0xD7 */ +- 0x61FE,0xF990,0x6201,0x6202,0x6203,0x6204,0x6205,0x6207,/* 0xD8-0xDF */ ++ 0x61F6,0x61F7,0x61F8,0x61F9,0x61FA,0x61FB,0x61FC,0x61FD,/* 0xD0-0xD7 */ ++ 0x61FE,0x6200,0x6201,0x6202,0x6203,0x6204,0x6205,0x6207,/* 0xD8-0xDF */ + 0x6209,0x6213,0x6214,0x6219,0x621C,0x621D,0x621E,0x6220,/* 0xE0-0xE7 */ + 0x6223,0x6226,0x6227,0x6228,0x6229,0x622B,0x622D,0x622F,/* 0xE8-0xEF */ + 0x6230,0x6231,0x6232,0x6235,0x6236,0x6238,0x6239,0x623A,/* 0xF0-0xF7 */ +@@ -643,7 +645,7 @@ + 0x62AA,0x62AD,0x62AE,0x62AF,0x62B0,0x62B2,0x62B3,0x62B4,/* 0x70-0x77 */ + 0x62B6,0x62B7,0x62B8,0x62BA,0x62BE,0x62C0,0x62C1,0x0000,/* 0x78-0x7F */ + +- 0x62C3,0x62CB,0xF95B,0x62D1,0x62D5,0x62DD,0x62DE,0x62E0,/* 0x80-0x87 */ ++ 0x62C3,0x62CB,0x62CF,0x62D1,0x62D5,0x62DD,0x62DE,0x62E0,/* 0x80-0x87 */ + 0x62E1,0x62E4,0x62EA,0x62EB,0x62F0,0x62F2,0x62F5,0x62F8,/* 0x88-0x8F */ + 0x62F9,0x62FA,0x62FB,0x6300,0x6303,0x6304,0x6305,0x6306,/* 0x90-0x97 */ + 0x630A,0x630B,0x630C,0x630D,0x630F,0x6310,0x6312,0x6313,/* 0x98-0x9F */ +@@ -689,10 +691,10 @@ + 0x6473,0x6474,0x6475,0x6476,0x6477,0x647B,0x647C,0x647D,/* 0xB8-0xBF */ + 0x647E,0x647F,0x6480,0x6481,0x6483,0x6486,0x6488,0x6489,/* 0xC0-0xC7 */ + 0x648A,0x648B,0x648C,0x648D,0x648E,0x648F,0x6490,0x6493,/* 0xC8-0xCF */ +- 0x6494,0x6497,0x6498,0xF991,0x649B,0x649C,0x649D,0x649F,/* 0xD0-0xD7 */ ++ 0x6494,0x6497,0x6498,0x649A,0x649B,0x649C,0x649D,0x649F,/* 0xD0-0xD7 */ + 0x64A0,0x64A1,0x64A2,0x64A3,0x64A5,0x64A6,0x64A7,0x64A8,/* 0xD8-0xDF */ + 0x64AA,0x64AB,0x64AF,0x64B1,0x64B2,0x64B3,0x64B4,0x64B6,/* 0xE0-0xE7 */ +- 0x64B9,0x64BB,0x64BD,0x64BE,0x64BF,0x64C1,0x64C3,0xF930,/* 0xE8-0xEF */ ++ 0x64B9,0x64BB,0x64BD,0x64BE,0x64BF,0x64C1,0x64C3,0x64C4,/* 0xE8-0xEF */ + 0x64C6,0x64C7,0x64C8,0x64C9,0x64CA,0x64CB,0x64CC,0x64CF,/* 0xF0-0xF7 */ + 0x64D1,0x64D3,0x64D4,0x64D5,0x64D6,0x64D9,0x64DA,0x0000,/* 0xF8-0xFF */ + }; +@@ -721,7 +723,7 @@ + 0x6547,0x654A,0x654B,0x654D,0x654E,0x6550,0x6552,0x6553,/* 0x98-0x9F */ + 0x6554,0x6557,0x6558,0x655A,0x655C,0x655F,0x6560,0x6561,/* 0xA0-0xA7 */ + 0x6564,0x6565,0x6567,0x6568,0x6569,0x656A,0x656D,0x656E,/* 0xA8-0xAF */ +- 0x656F,0x6571,0x6573,0x6575,0x6576,0xF969,0x6579,0x657A,/* 0xB0-0xB7 */ ++ 0x656F,0x6571,0x6573,0x6575,0x6576,0x6578,0x6579,0x657A,/* 0xB0-0xB7 */ + 0x657B,0x657C,0x657D,0x657E,0x657F,0x6580,0x6581,0x6582,/* 0xB8-0xBF */ + 0x6583,0x6584,0x6585,0x6586,0x6588,0x6589,0x658A,0x658D,/* 0xC0-0xC7 */ + 0x658E,0x658F,0x6592,0x6594,0x6595,0x6596,0x6598,0x659A,/* 0xC8-0xCF */ +@@ -754,14 +756,14 @@ + 0x6659,0x665B,0x665C,0x665D,0x665E,0x6660,0x6662,0x6663,/* 0x80-0x87 */ + 0x6665,0x6667,0x6669,0x666A,0x666B,0x666C,0x666D,0x6671,/* 0x88-0x8F */ + 0x6672,0x6673,0x6675,0x6678,0x6679,0x667B,0x667C,0x667D,/* 0x90-0x97 */ +- 0x667F,0x6680,0x6681,0x6683,0x6685,0x6686,0xF9C5,0x6689,/* 0x98-0x9F */ ++ 0x667F,0x6680,0x6681,0x6683,0x6685,0x6686,0x6688,0x6689,/* 0x98-0x9F */ + 0x668A,0x668B,0x668D,0x668E,0x668F,0x6690,0x6692,0x6693,/* 0xA0-0xA7 */ + 0x6694,0x6695,0x6698,0x6699,0x669A,0x669B,0x669C,0x669E,/* 0xA8-0xAF */ + 0x669F,0x66A0,0x66A1,0x66A2,0x66A3,0x66A4,0x66A5,0x66A6,/* 0xB0-0xB7 */ + 0x66A9,0x66AA,0x66AB,0x66AC,0x66AD,0x66AF,0x66B0,0x66B1,/* 0xB8-0xBF */ + 0x66B2,0x66B3,0x66B5,0x66B6,0x66B7,0x66B8,0x66BA,0x66BB,/* 0xC0-0xC7 */ + 0x66BC,0x66BD,0x66BF,0x66C0,0x66C1,0x66C2,0x66C3,0x66C4,/* 0xC8-0xCF */ +- 0x66C5,0xF98B,0x66C7,0x66C8,0x66C9,0x66CA,0x66CB,0x66CC,/* 0xD0-0xD7 */ ++ 0x66C5,0x66C6,0x66C7,0x66C8,0x66C9,0x66CA,0x66CB,0x66CC,/* 0xD0-0xD7 */ + 0x66CD,0x66CE,0x66CF,0x66D0,0x66D1,0x66D2,0x66D3,0x66D4,/* 0xD8-0xDF */ + 0x66D5,0x66D6,0x66D7,0x66D8,0x66DA,0x66DE,0x66DF,0x66E0,/* 0xE0-0xE7 */ + 0x66E1,0x66E2,0x66E3,0x66E4,0x66E5,0x66E7,0x66E8,0x66EA,/* 0xE8-0xEF */ +@@ -787,7 +789,7 @@ + 0x6759,0x675A,0x675B,0x675D,0x6762,0x6763,0x6764,0x6766,/* 0x70-0x77 */ + 0x6767,0x676B,0x676C,0x676E,0x6771,0x6774,0x6776,0x0000,/* 0x78-0x7F */ + +- 0x6778,0x6779,0x677A,0xF9C8,0x677D,0x6780,0x6782,0x6783,/* 0x80-0x87 */ ++ 0x6778,0x6779,0x677A,0x677B,0x677D,0x6780,0x6782,0x6783,/* 0x80-0x87 */ + 0x6785,0x6786,0x6788,0x678A,0x678C,0x678D,0x678E,0x678F,/* 0x88-0x8F */ + 0x6791,0x6792,0x6793,0x6794,0x6796,0x6799,0x679B,0x679F,/* 0x90-0x97 */ + 0x67A0,0x67A1,0x67A4,0x67A6,0x67A9,0x67AC,0x67AE,0x67B1,/* 0x98-0x9F */ +@@ -865,9 +867,9 @@ + 0x69DD,0x69DE,0x69E1,0x69E2,0x69E3,0x69E4,0x69E5,0x69E6,/* 0x98-0x9F */ + 0x69E7,0x69E8,0x69E9,0x69EA,0x69EB,0x69EC,0x69EE,0x69EF,/* 0xA0-0xA7 */ + 0x69F0,0x69F1,0x69F3,0x69F4,0x69F5,0x69F6,0x69F7,0x69F8,/* 0xA8-0xAF */ +- 0x69F9,0x69FA,0x69FB,0x69FC,0x69FE,0x6A00,0x6A01,0xF9BF,/* 0xB0-0xB7 */ ++ 0x69F9,0x69FA,0x69FB,0x69FC,0x69FE,0x6A00,0x6A01,0x6A02,/* 0xB0-0xB7 */ + 0x6A03,0x6A04,0x6A05,0x6A06,0x6A07,0x6A08,0x6A09,0x6A0B,/* 0xB8-0xBF */ +- 0x6A0C,0x6A0D,0x6A0E,0x6A0F,0x6A10,0x6A11,0x6A12,0xF94C,/* 0xC0-0xC7 */ ++ 0x6A0C,0x6A0D,0x6A0E,0x6A0F,0x6A10,0x6A11,0x6A12,0x6A13,/* 0xC0-0xC7 */ + 0x6A14,0x6A15,0x6A16,0x6A19,0x6A1A,0x6A1B,0x6A1C,0x6A1D,/* 0xC8-0xCF */ + 0x6A1E,0x6A20,0x6A22,0x6A23,0x6A24,0x6A25,0x6A26,0x6A27,/* 0xD0-0xD7 */ + 0x6A29,0x6A2B,0x6A2C,0x6A2D,0x6A2E,0x6A30,0x6A32,0x6A33,/* 0xD8-0xDF */ +@@ -900,13 +902,13 @@ + 0x6ABA,0x6ABB,0x6ABC,0x6ABD,0x6ABE,0x6ABF,0x6AC0,0x6AC1,/* 0x90-0x97 */ + 0x6AC2,0x6AC3,0x6AC4,0x6AC5,0x6AC6,0x6AC7,0x6AC8,0x6AC9,/* 0x98-0x9F */ + 0x6ACA,0x6ACB,0x6ACC,0x6ACD,0x6ACE,0x6ACF,0x6AD0,0x6AD1,/* 0xA0-0xA7 */ +- 0x6AD2,0xF931,0x6AD4,0x6AD5,0x6AD6,0x6AD7,0x6AD8,0x6AD9,/* 0xA8-0xAF */ ++ 0x6AD2,0x6AD3,0x6AD4,0x6AD5,0x6AD6,0x6AD7,0x6AD8,0x6AD9,/* 0xA8-0xAF */ + 0x6ADA,0x6ADB,0x6ADC,0x6ADD,0x6ADE,0x6ADF,0x6AE0,0x6AE1,/* 0xB0-0xB7 */ + 0x6AE2,0x6AE3,0x6AE4,0x6AE5,0x6AE6,0x6AE7,0x6AE8,0x6AE9,/* 0xB8-0xBF */ + 0x6AEA,0x6AEB,0x6AEC,0x6AED,0x6AEE,0x6AEF,0x6AF0,0x6AF1,/* 0xC0-0xC7 */ + 0x6AF2,0x6AF3,0x6AF4,0x6AF5,0x6AF6,0x6AF7,0x6AF8,0x6AF9,/* 0xC8-0xCF */ + 0x6AFA,0x6AFB,0x6AFC,0x6AFD,0x6AFE,0x6AFF,0x6B00,0x6B01,/* 0xD0-0xD7 */ +- 0x6B02,0x6B03,0xF91D,0x6B05,0x6B06,0x6B07,0x6B08,0x6B09,/* 0xD8-0xDF */ ++ 0x6B02,0x6B03,0x6B04,0x6B05,0x6B06,0x6B07,0x6B08,0x6B09,/* 0xD8-0xDF */ + 0x6B0A,0x6B0B,0x6B0C,0x6B0D,0x6B0E,0x6B0F,0x6B10,0x6B11,/* 0xE0-0xE7 */ + 0x6B12,0x6B13,0x6B14,0x6B15,0x6B16,0x6B17,0x6B18,0x6B19,/* 0xE8-0xEF */ + 0x6B1A,0x6B1B,0x6B1C,0x6B1D,0x6B1E,0x6B1F,0x6B25,0x6B26,/* 0xF0-0xF7 */ +@@ -928,14 +930,14 @@ + 0x6B51,0x6B52,0x6B53,0x6B54,0x6B55,0x6B56,0x6B57,0x6B58,/* 0x58-0x5F */ + 0x6B5A,0x6B5B,0x6B5C,0x6B5D,0x6B5E,0x6B5F,0x6B60,0x6B61,/* 0x60-0x67 */ + 0x6B68,0x6B69,0x6B6B,0x6B6C,0x6B6D,0x6B6E,0x6B6F,0x6B70,/* 0x68-0x6F */ +- 0x6B71,0x6B72,0x6B73,0x6B74,0x6B75,0x6B76,0xF98C,0x6B78,/* 0x70-0x77 */ ++ 0x6B71,0x6B72,0x6B73,0x6B74,0x6B75,0x6B76,0x6B77,0x6B78,/* 0x70-0x77 */ + 0x6B7A,0x6B7D,0x6B7E,0x6B7F,0x6B80,0x6B85,0x6B88,0x0000,/* 0x78-0x7F */ + + 0x6B8C,0x6B8E,0x6B8F,0x6B90,0x6B91,0x6B94,0x6B95,0x6B97,/* 0x80-0x87 */ + 0x6B98,0x6B99,0x6B9C,0x6B9D,0x6B9E,0x6B9F,0x6BA0,0x6BA2,/* 0x88-0x8F */ + 0x6BA3,0x6BA4,0x6BA5,0x6BA6,0x6BA7,0x6BA8,0x6BA9,0x6BAB,/* 0x90-0x97 */ +- 0x6BAC,0x6BAD,0xF9A5,0x6BAF,0x6BB0,0x6BB1,0x6BB2,0x6BB6,/* 0x98-0x9F */ +- 0x6BB8,0x6BB9,0xF970,0x6BBB,0x6BBC,0x6BBD,0x6BBE,0x6BC0,/* 0xA0-0xA7 */ ++ 0x6BAC,0x6BAD,0x6BAE,0x6BAF,0x6BB0,0x6BB1,0x6BB2,0x6BB6,/* 0x98-0x9F */ ++ 0x6BB8,0x6BB9,0x6BBA,0x6BBB,0x6BBC,0x6BBD,0x6BBE,0x6BC0,/* 0xA0-0xA7 */ + 0x6BC3,0x6BC4,0x6BC6,0x6BC7,0x6BC8,0x6BC9,0x6BCA,0x6BCC,/* 0xA8-0xAF */ + 0x6BCE,0x6BD0,0x6BD1,0x6BD8,0x6BDA,0x6BDC,0x6BDD,0x6BDE,/* 0xB0-0xB7 */ + 0x6BDF,0x6BE0,0x6BE2,0x6BE3,0x6BE4,0x6BE5,0x6BE6,0x6BE7,/* 0xB8-0xBF */ +@@ -995,8 +997,8 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x6DCD,0x6DCE,0x6DCF,0x6DD0,0x6DD2,0x6DD3,0x6DD4,0x6DD5,/* 0x40-0x47 */ +- 0x6DD7,0xF94D,0x6DDB,0x6DDC,0x6DDF,0x6DE2,0x6DE3,0x6DE5,/* 0x48-0x4F */ +- 0x6DE7,0x6DE8,0x6DE9,0xF9D6,0x6DED,0x6DEF,0x6DF0,0x6DF2,/* 0x50-0x57 */ ++ 0x6DD7,0x6DDA,0x6DDB,0x6DDC,0x6DDF,0x6DE2,0x6DE3,0x6DE5,/* 0x48-0x4F */ ++ 0x6DE7,0x6DE8,0x6DE9,0x6DEA,0x6DED,0x6DEF,0x6DF0,0x6DF2,/* 0x50-0x57 */ + 0x6DF4,0x6DF5,0x6DF6,0x6DF8,0x6DFA,0x6DFD,0x6DFE,0x6DFF,/* 0x58-0x5F */ + 0x6E00,0x6E01,0x6E02,0x6E03,0x6E04,0x6E06,0x6E07,0x6E08,/* 0x60-0x67 */ + 0x6E09,0x6E0B,0x6E0F,0x6E12,0x6E13,0x6E15,0x6E18,0x6E19,/* 0x68-0x6F */ +@@ -1035,7 +1037,7 @@ + 0x6F03,0x6F04,0x6F05,0x6F07,0x6F08,0x6F0A,0x6F0B,0x6F0C,/* 0x50-0x57 */ + 0x6F0D,0x6F0E,0x6F10,0x6F11,0x6F12,0x6F16,0x6F17,0x6F18,/* 0x58-0x5F */ + 0x6F19,0x6F1A,0x6F1B,0x6F1C,0x6F1D,0x6F1E,0x6F1F,0x6F21,/* 0x60-0x67 */ +- 0x6F22,0xF992,0x6F25,0x6F26,0x6F27,0x6F28,0x6F2C,0x6F2E,/* 0x68-0x6F */ ++ 0x6F22,0x6F23,0x6F25,0x6F26,0x6F27,0x6F28,0x6F2C,0x6F2E,/* 0x68-0x6F */ + 0x6F30,0x6F32,0x6F34,0x6F35,0x6F37,0x6F38,0x6F39,0x6F3A,/* 0x70-0x77 */ + 0x6F3B,0x6F3C,0x6F3D,0x6F3F,0x6F40,0x6F41,0x6F42,0x0000,/* 0x78-0x7F */ + +@@ -1066,9 +1068,9 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x6FE6,0x6FE7,0x6FE8,0x6FE9,0x6FEA,0xF922,0x6FEC,0x6FED,/* 0x40-0x47 */ ++ 0x6FE6,0x6FE7,0x6FE8,0x6FE9,0x6FEA,0x6FEB,0x6FEC,0x6FED,/* 0x40-0x47 */ + 0x6FF0,0x6FF1,0x6FF2,0x6FF3,0x6FF4,0x6FF5,0x6FF6,0x6FF7,/* 0x48-0x4F */ +- 0x6FF8,0x6FF9,0x6FFA,0x6FFB,0x6FFC,0x6FFD,0xF984,0x6FFF,/* 0x50-0x57 */ ++ 0x6FF8,0x6FF9,0x6FFA,0x6FFB,0x6FFC,0x6FFD,0x6FFE,0x6FFF,/* 0x50-0x57 */ + 0x7000,0x7001,0x7002,0x7003,0x7004,0x7005,0x7006,0x7007,/* 0x58-0x5F */ + 0x7008,0x7009,0x700A,0x700B,0x700C,0x700D,0x700E,0x700F,/* 0x60-0x67 */ + 0x7010,0x7012,0x7013,0x7014,0x7015,0x7016,0x7017,0x7018,/* 0x68-0x6F */ +@@ -1113,7 +1115,7 @@ + + 0x7135,0x7137,0x7138,0x7139,0x713A,0x713B,0x713C,0x713D,/* 0x80-0x87 */ + 0x713E,0x713F,0x7140,0x7141,0x7142,0x7143,0x7144,0x7146,/* 0x88-0x8F */ +- 0x7147,0x7148,0xF993,0x714B,0x714D,0x714F,0x7150,0x7151,/* 0x90-0x97 */ ++ 0x7147,0x7148,0x7149,0x714B,0x714D,0x714F,0x7150,0x7151,/* 0x90-0x97 */ + 0x7152,0x7153,0x7154,0x7155,0x7156,0x7157,0x7158,0x7159,/* 0x98-0x9F */ + 0x715A,0x715B,0x715D,0x715F,0x7160,0x7161,0x7162,0x7163,/* 0xA0-0xA7 */ + 0x7165,0x7169,0x716A,0x716B,0x716C,0x716D,0x716F,0x7170,/* 0xA8-0xAF */ +@@ -1126,7 +1128,7 @@ + 0x71B0,0x71B1,0x71B2,0x71B4,0x71B6,0x71B7,0x71B8,0x71BA,/* 0xE0-0xE7 */ + 0x71BB,0x71BC,0x71BD,0x71BE,0x71BF,0x71C0,0x71C1,0x71C2,/* 0xE8-0xEF */ + 0x71C4,0x71C5,0x71C6,0x71C7,0x71C8,0x71C9,0x71CA,0x71CB,/* 0xF0-0xF7 */ +- 0x71CC,0x71CD,0x71CF,0xF9EE,0x71D1,0x71D2,0x71D3,0x0000,/* 0xF8-0xFF */ ++ 0x71CC,0x71CD,0x71CF,0x71D0,0x71D1,0x71D2,0x71D3,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_A0[256] = { +@@ -1144,10 +1146,10 @@ + 0x71F2,0x71F3,0x71F4,0x71F5,0x71F6,0x71F7,0x71F8,0x71FA,/* 0x58-0x5F */ + 0x71FB,0x71FC,0x71FD,0x71FE,0x71FF,0x7200,0x7201,0x7202,/* 0x60-0x67 */ + 0x7203,0x7204,0x7205,0x7207,0x7208,0x7209,0x720A,0x720B,/* 0x68-0x6F */ +- 0x720C,0x720D,0x720E,0x720F,0xF932,0x7211,0x7212,0x7213,/* 0x70-0x77 */ ++ 0x720C,0x720D,0x720E,0x720F,0x7210,0x7211,0x7212,0x7213,/* 0x70-0x77 */ + 0x7214,0x7215,0x7216,0x7217,0x7218,0x7219,0x721A,0x0000,/* 0x78-0x7F */ + +- 0xF91E,0x721C,0x721E,0x721F,0x7220,0x7221,0x7222,0x7223,/* 0x80-0x87 */ ++ 0x721B,0x721C,0x721E,0x721F,0x7220,0x7221,0x7222,0x7223,/* 0x80-0x87 */ + 0x7224,0x7225,0x7226,0x7227,0x7229,0x722B,0x722D,0x722E,/* 0x88-0x8F */ + 0x722F,0x7232,0x7233,0x7234,0x723A,0x723C,0x723E,0x7240,/* 0x90-0x97 */ + 0x7241,0x7242,0x7243,0x7244,0x7245,0x7246,0x7249,0x724A,/* 0x98-0x9F */ +@@ -1160,7 +1162,7 @@ + 0x7298,0x7299,0x729A,0x729B,0x729C,0x729D,0x729E,0x72A0,/* 0xD0-0xD7 */ + 0x72A1,0x72A2,0x72A3,0x72A4,0x72A5,0x72A6,0x72A7,0x72A8,/* 0xD8-0xDF */ + 0x72A9,0x72AA,0x72AB,0x72AE,0x72B1,0x72B2,0x72B3,0x72B5,/* 0xE0-0xE7 */ +- 0x72BA,0x72BB,0x72BC,0x72BD,0x72BE,0x72BF,0xF9FA,0x72C5,/* 0xE8-0xEF */ ++ 0x72BA,0x72BB,0x72BC,0x72BD,0x72BE,0x72BF,0x72C0,0x72C5,/* 0xE8-0xEF */ + 0x72C6,0x72C7,0x72C9,0x72CA,0x72CB,0x72CC,0x72CF,0x72D1,/* 0xF0-0xF7 */ + 0x72D3,0x72D4,0x72D5,0x72D6,0x72D8,0x72DA,0x72DB,0x0000,/* 0xF8-0xFF */ + }; +@@ -1195,7 +1197,7 @@ + 0x222A,0x2229,0x2208,0x2237,0x221A,0x22A5,0x2225,0x2220,/* 0xC8-0xCF */ + 0x2312,0x2299,0x222B,0x222E,0x2261,0x224C,0x2248,0x223D,/* 0xD0-0xD7 */ + 0x221D,0x2260,0x226E,0x226F,0x2264,0x2265,0x221E,0x2235,/* 0xD8-0xDF */ +- 0x2234,0x2642,0x2640,0x2218,0x2032,0x2033,0x2103,0xFF04,/* 0xE0-0xE7 */ ++ 0x2234,0x2642,0x2640,0x00B0,0x2032,0x2033,0x2103,0xFF04,/* 0xE0-0xE7 */ + 0x00A4,0xFFE0,0xFFE1,0x2030,0x00A7,0x2116,0x2606,0x2605,/* 0xE8-0xEF */ + 0x25CB,0x25CF,0x25CE,0x25C7,0x25C6,0x25A1,0x25A0,0x25B3,/* 0xF0-0xF7 */ + 0x25B2,0x203B,0x2192,0x2190,0x2191,0x2193,0x3013,0x0000,/* 0xF8-0xFF */ +@@ -1515,7 +1517,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x7372,0x7373,0x7374,0xF9A7,0x7376,0x7377,0x7378,0x7379,/* 0x40-0x47 */ ++ 0x7372,0x7373,0x7374,0x7375,0x7376,0x7377,0x7378,0x7379,/* 0x40-0x47 */ + 0x737A,0x737B,0x737C,0x737D,0x737F,0x7380,0x7381,0x7382,/* 0x48-0x4F */ + 0x7383,0x7385,0x7386,0x7388,0x738A,0x738C,0x738D,0x738F,/* 0x50-0x57 */ + 0x7390,0x7392,0x7393,0x7394,0x7395,0x7397,0x7398,0x7399,/* 0x58-0x5F */ +@@ -1551,7 +1553,7 @@ + + 0x744E,0x744F,0x7450,0x7451,0x7452,0x7453,0x7454,0x7456,/* 0x80-0x87 */ + 0x7458,0x745D,0x7460,0x7461,0x7462,0x7463,0x7464,0x7465,/* 0x88-0x8F */ +- 0x7466,0x7467,0x7468,0xF9AE,0x746A,0x746B,0x746C,0x746E,/* 0x90-0x97 */ ++ 0x7466,0x7467,0x7468,0x7469,0x746A,0x746B,0x746C,0x746E,/* 0x90-0x97 */ + 0x746F,0x7471,0x7472,0x7473,0x7474,0x7475,0x7478,0x7479,/* 0x98-0x9F */ + 0x747A,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ + }; +@@ -1566,8 +1568,8 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x747B,0x747C,0x747D,0x747F,0x7482,0x7484,0x7485,0x7486,/* 0x40-0x47 */ +- 0x7488,0xF994,0x748A,0x748C,0x748D,0x748F,0x7491,0x7492,/* 0x48-0x4F */ +- 0x7493,0x7494,0x7495,0x7496,0x7497,0xF9EF,0x7499,0x749A,/* 0x50-0x57 */ ++ 0x7488,0x7489,0x748A,0x748C,0x748D,0x748F,0x7491,0x7492,/* 0x48-0x4F */ ++ 0x7493,0x7494,0x7495,0x7496,0x7497,0x7498,0x7499,0x749A,/* 0x50-0x57 */ + 0x749B,0x749D,0x749F,0x74A0,0x74A1,0x74A2,0x74A3,0x74A4,/* 0x58-0x5F */ + 0x74A5,0x74A6,0x74AA,0x74AB,0x74AC,0x74AD,0x74AE,0x74AF,/* 0x60-0x67 */ + 0x74B0,0x74B1,0x74B2,0x74B3,0x74B4,0x74B5,0x74B6,0x74B7,/* 0x68-0x6F */ +@@ -1601,7 +1603,7 @@ + + 0x755D,0x755E,0x755F,0x7560,0x7561,0x7562,0x7563,0x7564,/* 0x80-0x87 */ + 0x7567,0x7568,0x7569,0x756B,0x756C,0x756D,0x756E,0x756F,/* 0x88-0x8F */ +- 0xF962,0x7571,0x7573,0x7575,0x7576,0x7577,0x757A,0x757B,/* 0x90-0x97 */ ++ 0x7570,0x7571,0x7573,0x7575,0x7576,0x7577,0x757A,0x757B,/* 0x90-0x97 */ + 0x757C,0x757D,0x757E,0x7580,0x7581,0x7582,0x7584,0x7585,/* 0x98-0x9F */ + 0x7587,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ + }; +@@ -1627,7 +1629,7 @@ + 0x7608,0x7609,0x760B,0x760D,0x760E,0x760F,0x7611,0x7612,/* 0x80-0x87 */ + 0x7613,0x7614,0x7616,0x761A,0x761C,0x761D,0x761E,0x7621,/* 0x88-0x8F */ + 0x7623,0x7627,0x7628,0x762C,0x762E,0x762F,0x7631,0x7632,/* 0x90-0x97 */ +- 0x7636,0x7637,0x7639,0x763A,0x763B,0x763D,0x7641,0xF9C1,/* 0x98-0x9F */ ++ 0x7636,0x7637,0x7639,0x763A,0x763B,0x763D,0x7641,0x7642,/* 0x98-0x9F */ + 0x7644,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ + }; + +@@ -1643,7 +1645,7 @@ + 0x7645,0x7646,0x7647,0x7648,0x7649,0x764A,0x764B,0x764E,/* 0x40-0x47 */ + 0x764F,0x7650,0x7651,0x7652,0x7653,0x7655,0x7657,0x7658,/* 0x48-0x4F */ + 0x7659,0x765A,0x765B,0x765D,0x765F,0x7660,0x7661,0x7662,/* 0x50-0x57 */ +- 0x7664,0x7665,0x7666,0x7667,0x7668,0xF90E,0x766A,0x766C,/* 0x58-0x5F */ ++ 0x7664,0x7665,0x7666,0x7667,0x7668,0x7669,0x766A,0x766C,/* 0x58-0x5F */ + 0x766D,0x766E,0x7670,0x7671,0x7672,0x7673,0x7674,0x7675,/* 0x60-0x67 */ + 0x7676,0x7677,0x7679,0x767A,0x767C,0x767F,0x7680,0x7681,/* 0x68-0x6F */ + 0x7683,0x7685,0x7689,0x768A,0x768C,0x768D,0x768F,0x7690,/* 0x70-0x77 */ +@@ -1678,7 +1680,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x76C4,0x76C7,0x76C9,0x76CB,0x76CC,0x76D3,0x76D5,0x76D9,/* 0x40-0x47 */ + 0x76DA,0x76DC,0x76DD,0x76DE,0x76E0,0x76E1,0x76E2,0x76E3,/* 0x48-0x4F */ +- 0x76E4,0x76E6,0xF933,0x76E8,0x76E9,0x76EA,0x76EB,0x76EC,/* 0x50-0x57 */ ++ 0x76E4,0x76E6,0x76E7,0x76E8,0x76E9,0x76EA,0x76EB,0x76EC,/* 0x50-0x57 */ + 0x76ED,0x76F0,0x76F3,0x76F5,0x76F6,0x76F7,0x76FA,0x76FB,/* 0x58-0x5F */ + 0x76FD,0x76FF,0x7700,0x7702,0x7703,0x7705,0x7706,0x770A,/* 0x60-0x67 */ + 0x770C,0x770E,0x770F,0x7710,0x7711,0x7712,0x7713,0x7714,/* 0x68-0x6F */ +@@ -1690,14 +1692,14 @@ + 0x7748,0x7749,0x774A,0x774B,0x774C,0x774D,0x774E,0x774F,/* 0x90-0x97 */ + 0x7752,0x7753,0x7754,0x7755,0x7756,0x7757,0x7758,0x7759,/* 0x98-0x9F */ + 0x775C,0x8584,0x96F9,0x4FDD,0x5821,0x9971,0x5B9D,0x62B1,/* 0xA0-0xA7 */ +- 0x62A5,0xFA06,0x8C79,0x9C8D,0x7206,0x676F,0x7891,0x60B2,/* 0xA8-0xAF */ +- 0x5351,0xF963,0x8F88,0x80CC,0x8D1D,0x94A1,0x500D,0x72C8,/* 0xB0-0xB7 */ ++ 0x62A5,0x66B4,0x8C79,0x9C8D,0x7206,0x676F,0x7891,0x60B2,/* 0xA8-0xAF */ ++ 0x5351,0x5317,0x8F88,0x80CC,0x8D1D,0x94A1,0x500D,0x72C8,/* 0xB0-0xB7 */ + 0x5907,0x60EB,0x7119,0x88AB,0x5954,0x82EF,0x672C,0x7B28,/* 0xB8-0xBF */ + 0x5D29,0x7EF7,0x752D,0x6CF5,0x8E66,0x8FF8,0x903C,0x9F3B,/* 0xC0-0xC7 */ + 0x6BD4,0x9119,0x7B14,0x5F7C,0x78A7,0x84D6,0x853D,0x6BD5,/* 0xC8-0xCF */ + 0x6BD9,0x6BD6,0x5E01,0x5E87,0x75F9,0x95ED,0x655D,0x5F0A,/* 0xD0-0xD7 */ + 0x5FC5,0x8F9F,0x58C1,0x81C2,0x907F,0x965B,0x97AD,0x8FB9,/* 0xD8-0xDF */ +- 0x7F16,0x8D2C,0x6241,0xF965,0x53D8,0x535E,0x8FA8,0x8FA9,/* 0xE0-0xE7 */ ++ 0x7F16,0x8D2C,0x6241,0x4FBF,0x53D8,0x535E,0x8FA8,0x8FA9,/* 0xE0-0xE7 */ + 0x8FAB,0x904D,0x6807,0x5F6A,0x8198,0x8868,0x9CD6,0x618B,/* 0xE8-0xEF */ + 0x522B,0x762A,0x5F6C,0x658C,0x6FD2,0x6EE8,0x5BBE,0x6448,/* 0xF0-0xF7 */ + 0x5175,0x51B0,0x67C4,0x4E19,0x79C9,0x997C,0x70B3,0x0000,/* 0xF8-0xFF */ +@@ -1728,13 +1730,13 @@ + 0x77E4,0x75C5,0x5E76,0x73BB,0x83E0,0x64AD,0x62E8,0x94B5,/* 0xA0-0xA7 */ + 0x6CE2,0x535A,0x52C3,0x640F,0x94C2,0x7B94,0x4F2F,0x5E1B,/* 0xA8-0xAF */ + 0x8236,0x8116,0x818A,0x6E24,0x6CCA,0x9A73,0x6355,0x535C,/* 0xB0-0xB7 */ +- 0x54FA,0x8865,0x57E0,0xF967,0x5E03,0x6B65,0x7C3F,0x90E8,/* 0xB8-0xBF */ ++ 0x54FA,0x8865,0x57E0,0x4E0D,0x5E03,0x6B65,0x7C3F,0x90E8,/* 0xB8-0xBF */ + 0x6016,0x64E6,0x731C,0x88C1,0x6750,0x624D,0x8D22,0x776C,/* 0xC0-0xC7 */ + 0x8E29,0x91C7,0x5F69,0x83DC,0x8521,0x9910,0x53C2,0x8695,/* 0xC8-0xCF */ + 0x6B8B,0x60ED,0x60E8,0x707F,0x82CD,0x8231,0x4ED3,0x6CA7,/* 0xD0-0xD7 */ + 0x85CF,0x64CD,0x7CD9,0x69FD,0x66F9,0x8349,0x5395,0x7B56,/* 0xD8-0xDF */ + 0x4FA7,0x518C,0x6D4B,0x5C42,0x8E6D,0x63D2,0x53C9,0x832C,/* 0xE0-0xE7 */ +- 0xF9FE,0x67E5,0x78B4,0x643D,0x5BDF,0x5C94,0x5DEE,0x8BE7,/* 0xE8-0xEF */ ++ 0x8336,0x67E5,0x78B4,0x643D,0x5BDF,0x5C94,0x5DEE,0x8BE7,/* 0xE8-0xEF */ + 0x62C6,0x67F4,0x8C7A,0x6400,0x63BA,0x8749,0x998B,0x8C17,/* 0xF0-0xF7 */ + 0x7F20,0x94F2,0x4EA7,0x9610,0x98A4,0x660C,0x7316,0x0000,/* 0xF8-0xFF */ + }; +@@ -1764,7 +1766,7 @@ + 0x7883,0x573A,0x5C1D,0x5E38,0x957F,0x507F,0x80A0,0x5382,/* 0xA0-0xA7 */ + 0x655E,0x7545,0x5531,0x5021,0x8D85,0x6284,0x949E,0x671D,/* 0xA8-0xAF */ + 0x5632,0x6F6E,0x5DE2,0x5435,0x7092,0x8F66,0x626F,0x64A4,/* 0xB0-0xB7 */ +- 0x63A3,0x5F7B,0x6F88,0x90F4,0x81E3,0xF971,0x5C18,0x6668,/* 0xB8-0xBF */ ++ 0x63A3,0x5F7B,0x6F88,0x90F4,0x81E3,0x8FB0,0x5C18,0x6668,/* 0xB8-0xBF */ + 0x5FF1,0x6C89,0x9648,0x8D81,0x886C,0x6491,0x79F0,0x57CE,/* 0xC0-0xC7 */ + 0x6A59,0x6210,0x5448,0x4E58,0x7A0B,0x60E9,0x6F84,0x8BDA,/* 0xC8-0xCF */ + 0x627F,0x901E,0x9A8B,0x79E4,0x5403,0x75F4,0x6301,0x5319,/* 0xD0-0xD7 */ +@@ -1795,14 +1797,14 @@ + + 0x78E4,0x78E5,0x78E6,0x78E7,0x78E9,0x78EA,0x78EB,0x78ED,/* 0x80-0x87 */ + 0x78EE,0x78EF,0x78F0,0x78F1,0x78F3,0x78F5,0x78F6,0x78F8,/* 0x88-0x8F */ +- 0x78F9,0xF964,0x78FC,0x78FD,0x78FE,0x78FF,0x7900,0x7902,/* 0x90-0x97 */ ++ 0x78F9,0x78FB,0x78FC,0x78FD,0x78FE,0x78FF,0x7900,0x7902,/* 0x90-0x97 */ + 0x7903,0x7904,0x7906,0x7907,0x7908,0x7909,0x790A,0x790B,/* 0x98-0x9F */ + 0x790C,0x7840,0x50A8,0x77D7,0x6410,0x89E6,0x5904,0x63E3,/* 0xA0-0xA7 */ +- 0x5DDD,0x7A7F,0x693D,0x4F20,0x8239,0x5598,0xF905,0x75AE,/* 0xA8-0xAF */ ++ 0x5DDD,0x7A7F,0x693D,0x4F20,0x8239,0x5598,0x4E32,0x75AE,/* 0xA8-0xAF */ + 0x7A97,0x5E62,0x5E8A,0x95EF,0x521B,0x5439,0x708A,0x6376,/* 0xB0-0xB7 */ + 0x9524,0x5782,0x6625,0x693F,0x9187,0x5507,0x6DF3,0x7EAF,/* 0xB8-0xBF */ + 0x8822,0x6233,0x7EF0,0x75B5,0x8328,0x78C1,0x96CC,0x8F9E,/* 0xC0-0xC7 */ +- 0x6148,0x74F7,0x8BCD,0x6B64,0xF9FF,0x8D50,0x6B21,0x806A,/* 0xC8-0xCF */ ++ 0x6148,0x74F7,0x8BCD,0x6B64,0x523A,0x8D50,0x6B21,0x806A,/* 0xC8-0xCF */ + 0x8471,0x56F1,0x5306,0x4ECE,0x4E1B,0x51D1,0x7C97,0x918B,/* 0xD0-0xD7 */ + 0x7C07,0x4FC3,0x8E7F,0x7BE1,0x7A9C,0x6467,0x5D14,0x50AC,/* 0xD8-0xDF */ + 0x8106,0x7601,0x7CB9,0x6DEC,0x7FE0,0x6751,0x5B58,0x5BF8,/* 0xE0-0xE7 */ +@@ -1823,7 +1825,7 @@ + 0x790D,0x790E,0x790F,0x7910,0x7911,0x7912,0x7914,0x7915,/* 0x40-0x47 */ + 0x7916,0x7917,0x7918,0x7919,0x791A,0x791B,0x791C,0x791D,/* 0x48-0x4F */ + 0x791F,0x7920,0x7921,0x7922,0x7923,0x7925,0x7926,0x7927,/* 0x50-0x57 */ +- 0x7928,0x7929,0xF985,0x792B,0x792C,0x792D,0x792E,0x792F,/* 0x58-0x5F */ ++ 0x7928,0x7929,0x792A,0x792B,0x792C,0x792D,0x792E,0x792F,/* 0x58-0x5F */ + 0x7930,0x7931,0x7932,0x7933,0x7935,0x7936,0x7937,0x7938,/* 0x60-0x67 */ + 0x7939,0x793D,0x793F,0x7942,0x7943,0x7944,0x7945,0x7947,/* 0x68-0x6F */ + 0x794A,0x794B,0x794C,0x794D,0x794E,0x794F,0x7950,0x7951,/* 0x70-0x77 */ +@@ -1831,9 +1833,9 @@ + + 0x7964,0x7966,0x7969,0x796A,0x796B,0x796C,0x796E,0x7970,/* 0x80-0x87 */ + 0x7971,0x7972,0x7973,0x7974,0x7975,0x7976,0x7979,0x797B,/* 0x88-0x8F */ +- 0x797C,0x797D,0x797E,0xF93C,0x7982,0x7983,0x7986,0x7987,/* 0x90-0x97 */ ++ 0x797C,0x797D,0x797E,0x797F,0x7982,0x7983,0x7986,0x7987,/* 0x90-0x97 */ + 0x7988,0x7989,0x798B,0x798C,0x798D,0x798E,0x7990,0x7991,/* 0x98-0x9F */ +- 0x7992,0x6020,0x803D,0x62C5,0xF95E,0x5355,0x90F8,0x63B8,/* 0xA0-0xA7 */ ++ 0x7992,0x6020,0x803D,0x62C5,0x4E39,0x5355,0x90F8,0x63B8,/* 0xA0-0xA7 */ + 0x80C6,0x65E6,0x6C2E,0x4F46,0x60EE,0x6DE1,0x8BDE,0x5F39,/* 0xA8-0xAF */ + 0x86CB,0x5F53,0x6321,0x515A,0x8361,0x6863,0x5200,0x6363,/* 0xB0-0xB7 */ + 0x8E48,0x5012,0x5C9B,0x7977,0x5BFC,0x5230,0x7A3B,0x60BC,/* 0xB8-0xBF */ +@@ -1859,7 +1861,7 @@ + 0x7993,0x7994,0x7995,0x7996,0x7997,0x7998,0x7999,0x799B,/* 0x40-0x47 */ + 0x799C,0x799D,0x799E,0x799F,0x79A0,0x79A1,0x79A2,0x79A3,/* 0x48-0x4F */ + 0x79A4,0x79A5,0x79A6,0x79A8,0x79A9,0x79AA,0x79AB,0x79AC,/* 0x50-0x57 */ +- 0x79AD,0xF9B6,0x79AF,0x79B0,0x79B1,0x79B2,0x79B4,0x79B5,/* 0x58-0x5F */ ++ 0x79AD,0x79AE,0x79AF,0x79B0,0x79B1,0x79B2,0x79B4,0x79B5,/* 0x58-0x5F */ + 0x79B6,0x79B7,0x79B8,0x79BC,0x79BF,0x79C2,0x79C4,0x79C5,/* 0x60-0x67 */ + 0x79C7,0x79C8,0x79CA,0x79CC,0x79CE,0x79CF,0x79D0,0x79D3,/* 0x68-0x6F */ + 0x79D4,0x79D6,0x79D7,0x79D9,0x79DA,0x79DB,0x79DC,0x79DD,/* 0x70-0x77 */ +@@ -1869,12 +1871,12 @@ + 0x79F7,0x79F9,0x79FA,0x79FC,0x79FE,0x79FF,0x7A01,0x7A04,/* 0x88-0x8F */ + 0x7A05,0x7A07,0x7A08,0x7A09,0x7A0A,0x7A0C,0x7A0F,0x7A10,/* 0x90-0x97 */ + 0x7A11,0x7A12,0x7A13,0x7A15,0x7A16,0x7A18,0x7A19,0x7A1B,/* 0x98-0x9F */ +- 0xF956,0x4E01,0x76EF,0x53EE,0x9489,0x9876,0x9F0E,0x952D,/* 0xA0-0xA7 */ ++ 0x7A1C,0x4E01,0x76EF,0x53EE,0x9489,0x9876,0x9F0E,0x952D,/* 0xA0-0xA7 */ + 0x5B9A,0x8BA2,0x4E22,0x4E1C,0x51AC,0x8463,0x61C2,0x52A8,/* 0xA8-0xAF */ +- 0x680B,0x4F97,0x606B,0x51BB,0xFA05,0x515C,0x6296,0x6597,/* 0xB0-0xB7 */ +- 0x9661,0x8C46,0x9017,0x75D8,0xFA26,0x7763,0x6BD2,0x728A,/* 0xB8-0xBF */ ++ 0x680B,0x4F97,0x606B,0x51BB,0x6D1E,0x515C,0x6296,0x6597,/* 0xB0-0xB7 */ ++ 0x9661,0x8C46,0x9017,0x75D8,0x90FD,0x7763,0x6BD2,0x728A,/* 0xB8-0xBF */ + 0x72EC,0x8BFB,0x5835,0x7779,0x8D4C,0x675C,0x9540,0x809A,/* 0xC0-0xC7 */ +- 0xFA01,0x6E21,0x5992,0x7AEF,0x77ED,0x953B,0x6BB5,0x65AD,/* 0xC8-0xCF */ ++ 0x5EA6,0x6E21,0x5992,0x7AEF,0x77ED,0x953B,0x6BB5,0x65AD,/* 0xC8-0xCF */ + 0x7F0E,0x5806,0x5151,0x961F,0x5BF9,0x58A9,0x5428,0x8E72,/* 0xD0-0xD7 */ + 0x6566,0x987F,0x56E4,0x949D,0x76FE,0x9041,0x6387,0x54C6,/* 0xD8-0xDF */ + 0x591A,0x593A,0x579B,0x8EB2,0x6735,0x8DFA,0x8235,0x5241,/* 0xE0-0xE7 */ +@@ -1941,7 +1943,7 @@ + 0x7B00,0x7B01,0x7B02,0x7B05,0x7B07,0x7B09,0x7B0C,0x7B0D,/* 0x88-0x8F */ + 0x7B0E,0x7B10,0x7B12,0x7B13,0x7B16,0x7B17,0x7B18,0x7B1A,/* 0x90-0x97 */ + 0x7B1C,0x7B1D,0x7B1F,0x7B21,0x7B22,0x7B23,0x7B27,0x7B29,/* 0x98-0x9F */ +- 0x7B2D,0x6D6E,0x6DAA,0xFA1B,0x88B1,0x5F17,0x752B,0x629A,/* 0xA0-0xA7 */ ++ 0x7B2D,0x6D6E,0x6DAA,0x798F,0x88B1,0x5F17,0x752B,0x629A,/* 0xA0-0xA7 */ + 0x8F85,0x4FEF,0x91DC,0x65A7,0x812F,0x8151,0x5E9C,0x8150,/* 0xA8-0xAF */ + 0x8D74,0x526F,0x8986,0x8D4B,0x590D,0x5085,0x4ED8,0x961C,/* 0xB0-0xB7 */ + 0x7236,0x8179,0x8D1F,0x5BCC,0x8BA3,0x9644,0x5987,0x7F1A,/* 0xB8-0xBF */ +@@ -1952,7 +1954,7 @@ + 0x818F,0x7F94,0x7CD5,0x641E,0x9550,0x7A3F,0x544A,0x54E5,/* 0xE0-0xE7 */ + 0x6B4C,0x6401,0x6208,0x9E3D,0x80F3,0x7599,0x5272,0x9769,/* 0xE8-0xEF */ + 0x845B,0x683C,0x86E4,0x9601,0x9694,0x94EC,0x4E2A,0x5404,/* 0xF0-0xF7 */ +- 0x7ED9,0x6839,0x8DDF,0x8015,0xF901,0x5E9A,0x7FB9,0x0000,/* 0xF8-0xFF */ ++ 0x7ED9,0x6839,0x8DDF,0x8015,0x66F4,0x5E9A,0x7FB9,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_B9[256] = { +@@ -2012,7 +2014,7 @@ + 0x7C1A,0x7C1B,0x7C1C,0x7C1D,0x7C1E,0x7C20,0x7C21,0x7C22,/* 0x80-0x87 */ + 0x7C23,0x7C24,0x7C25,0x7C28,0x7C29,0x7C2B,0x7C2C,0x7C2D,/* 0x88-0x8F */ + 0x7C2E,0x7C2F,0x7C30,0x7C31,0x7C32,0x7C33,0x7C34,0x7C35,/* 0x90-0x97 */ +- 0x7C36,0x7C37,0x7C39,0x7C3A,0x7C3B,0x7C3C,0x7C3D,0xF9A6,/* 0x98-0x9F */ ++ 0x7C36,0x7C37,0x7C39,0x7C3A,0x7C3B,0x7C3C,0x7C3D,0x7C3E,/* 0x98-0x9F */ + 0x7C42,0x9AB8,0x5B69,0x6D77,0x6C26,0x4EA5,0x5BB3,0x9A87,/* 0xA0-0xA7 */ + 0x9163,0x61A8,0x90AF,0x97E9,0x542B,0x6DB5,0x5BD2,0x51FD,/* 0xA8-0xAF */ + 0x558A,0x7F55,0x7FF0,0x64BC,0x634D,0x65F1,0x61BE,0x608D,/* 0xB0-0xB7 */ +@@ -2039,7 +2041,7 @@ + 0x7C43,0x7C44,0x7C45,0x7C46,0x7C47,0x7C48,0x7C49,0x7C4A,/* 0x40-0x47 */ + 0x7C4B,0x7C4C,0x7C4E,0x7C4F,0x7C50,0x7C51,0x7C52,0x7C53,/* 0x48-0x4F */ + 0x7C54,0x7C55,0x7C56,0x7C57,0x7C58,0x7C59,0x7C5A,0x7C5B,/* 0x50-0x57 */ +- 0x7C5C,0x7C5D,0x7C5E,0x7C5F,0xF944,0x7C61,0x7C62,0x7C63,/* 0x58-0x5F */ ++ 0x7C5C,0x7C5D,0x7C5E,0x7C5F,0x7C60,0x7C61,0x7C62,0x7C63,/* 0x58-0x5F */ + 0x7C64,0x7C65,0x7C66,0x7C67,0x7C68,0x7C69,0x7C6A,0x7C6B,/* 0x60-0x67 */ + 0x7C6C,0x7C6D,0x7C6E,0x7C6F,0x7C70,0x7C71,0x7C72,0x7C75,/* 0x68-0x6F */ + 0x7C76,0x7C77,0x7C78,0x7C79,0x7C7A,0x7C7E,0x7C7F,0x7C80,/* 0x70-0x77 */ +@@ -2050,7 +2052,7 @@ + 0x7CA3,0x7CA6,0x7CA7,0x7CA8,0x7CA9,0x7CAB,0x7CAC,0x7CAD,/* 0x90-0x97 */ + 0x7CAF,0x7CB0,0x7CB4,0x7CB5,0x7CB6,0x7CB7,0x7CB8,0x7CBA,/* 0x98-0x9F */ + 0x7CBB,0x5F27,0x864E,0x552C,0x62A4,0x4E92,0x6CAA,0x6237,/* 0xA0-0xA7 */ +- 0x82B1,0x54D7,0x534E,0x733E,0xF904,0x753B,0x5212,0x5316,/* 0xA8-0xAF */ ++ 0x82B1,0x54D7,0x534E,0x733E,0x6ED1,0x753B,0x5212,0x5316,/* 0xA8-0xAF */ + 0x8BDD,0x69D0,0x5F8A,0x6000,0x6DEE,0x574F,0x6B22,0x73AF,/* 0xB0-0xB7 */ + 0x6853,0x8FD8,0x7F13,0x6362,0x60A3,0x5524,0x75EA,0x8C62,/* 0xB8-0xBF */ + 0x7115,0x6DA3,0x5BA6,0x5E7B,0x8352,0x614C,0x9EC4,0x78FA,/* 0xC0-0xC7 */ +@@ -2075,11 +2077,11 @@ + 0x7CBF,0x7CC0,0x7CC2,0x7CC3,0x7CC4,0x7CC6,0x7CC9,0x7CCB,/* 0x40-0x47 */ + 0x7CCE,0x7CCF,0x7CD0,0x7CD1,0x7CD2,0x7CD3,0x7CD4,0x7CD8,/* 0x48-0x4F */ + 0x7CDA,0x7CDB,0x7CDD,0x7CDE,0x7CE1,0x7CE2,0x7CE3,0x7CE4,/* 0x50-0x57 */ +- 0x7CE5,0x7CE6,0xF97B,0x7CE9,0x7CEA,0x7CEB,0x7CEC,0x7CED,/* 0x58-0x5F */ ++ 0x7CE5,0x7CE6,0x7CE7,0x7CE9,0x7CEA,0x7CEB,0x7CEC,0x7CED,/* 0x58-0x5F */ + 0x7CEE,0x7CF0,0x7CF1,0x7CF2,0x7CF3,0x7CF4,0x7CF5,0x7CF6,/* 0x60-0x67 */ + 0x7CF7,0x7CF9,0x7CFA,0x7CFC,0x7CFD,0x7CFE,0x7CFF,0x7D00,/* 0x68-0x6F */ + 0x7D01,0x7D02,0x7D03,0x7D04,0x7D05,0x7D06,0x7D07,0x7D08,/* 0x70-0x77 */ +- 0x7D09,0x7D0B,0x7D0C,0x7D0D,0x7D0E,0x7D0F,0xF9CF,0x0000,/* 0x78-0x7F */ ++ 0x7D09,0x7D0B,0x7D0C,0x7D0D,0x7D0E,0x7D0F,0x7D10,0x0000,/* 0x78-0x7F */ + + 0x7D11,0x7D12,0x7D13,0x7D14,0x7D15,0x7D16,0x7D17,0x7D18,/* 0x80-0x87 */ + 0x7D19,0x7D1A,0x7D1B,0x7D1C,0x7D1D,0x7D1E,0x7D1F,0x7D21,/* 0x88-0x8F */ +@@ -2123,7 +2125,7 @@ + 0x7D90,0x7D91,0x7D92,0x7D93,0x7D94,0x7D95,0x7D96,0x7D97,/* 0x98-0x9F */ + 0x7D98,0x5065,0x8230,0x5251,0x996F,0x6E10,0x6E85,0x6DA7,/* 0xA0-0xA7 */ + 0x5EFA,0x50F5,0x59DC,0x5C06,0x6D46,0x6C5F,0x7586,0x848B,/* 0xA8-0xAF */ +- 0x6868,0x5956,0x8BB2,0x5320,0x9171,0xFA09,0x8549,0x6912,/* 0xB0-0xB7 */ ++ 0x6868,0x5956,0x8BB2,0x5320,0x9171,0x964D,0x8549,0x6912,/* 0xB0-0xB7 */ + 0x7901,0x7126,0x80F6,0x4EA4,0x90CA,0x6D47,0x9A84,0x5A07,/* 0xB8-0xBF */ + 0x56BC,0x6405,0x94F0,0x77EB,0x4FA5,0x811A,0x72E1,0x89D2,/* 0xC0-0xC7 */ + 0x997A,0x7F34,0x7EDE,0x527F,0x6559,0x9175,0x8F7F,0x8F83,/* 0xC8-0xCF */ +@@ -2131,7 +2133,7 @@ + 0x622A,0x52AB,0x8282,0x6854,0x6770,0x6377,0x776B,0x7AED,/* 0xD8-0xDF */ + 0x6D01,0x7ED3,0x89E3,0x59D0,0x6212,0x85C9,0x82A5,0x754C,/* 0xE0-0xE7 */ + 0x501F,0x4ECB,0x75A5,0x8BEB,0x5C4A,0x5DFE,0x7B4B,0x65A4,/* 0xE8-0xEF */ +- 0xF90A,0x4ECA,0x6D25,0x895F,0x7D27,0x9526,0x4EC5,0x8C28,/* 0xF0-0xF7 */ ++ 0x91D1,0x4ECA,0x6D25,0x895F,0x7D27,0x9526,0x4EC5,0x8C28,/* 0xF0-0xF7 */ + 0x8FDB,0x9773,0x664B,0x7981,0x8FD1,0x70EC,0x6D78,0x0000,/* 0xF8-0xFF */ + }; + +@@ -2144,11 +2146,11 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x7D99,0x7D9A,0x7D9B,0x7D9C,0x7D9D,0x7D9E,0x7D9F,0xF93D,/* 0x40-0x47 */ ++ 0x7D99,0x7D9A,0x7D9B,0x7D9C,0x7D9D,0x7D9E,0x7D9F,0x7DA0,/* 0x40-0x47 */ + 0x7DA1,0x7DA2,0x7DA3,0x7DA4,0x7DA5,0x7DA7,0x7DA8,0x7DA9,/* 0x48-0x4F */ + 0x7DAA,0x7DAB,0x7DAC,0x7DAD,0x7DAF,0x7DB0,0x7DB1,0x7DB2,/* 0x50-0x57 */ + 0x7DB3,0x7DB4,0x7DB5,0x7DB6,0x7DB7,0x7DB8,0x7DB9,0x7DBA,/* 0x58-0x5F */ +- 0x7DBB,0x7DBC,0x7DBD,0xF957,0x7DBF,0x7DC0,0x7DC1,0x7DC2,/* 0x60-0x67 */ ++ 0x7DBB,0x7DBC,0x7DBD,0x7DBE,0x7DBF,0x7DC0,0x7DC1,0x7DC2,/* 0x60-0x67 */ + 0x7DC3,0x7DC4,0x7DC5,0x7DC6,0x7DC7,0x7DC8,0x7DC9,0x7DCA,/* 0x68-0x6F */ + 0x7DCB,0x7DCC,0x7DCD,0x7DCE,0x7DCF,0x7DD0,0x7DD1,0x7DD2,/* 0x70-0x77 */ + 0x7DD3,0x7DD4,0x7DD5,0x7DD6,0x7DD7,0x7DD8,0x7DD9,0x0000,/* 0x78-0x7F */ +@@ -2156,16 +2158,16 @@ + 0x7DDA,0x7DDB,0x7DDC,0x7DDD,0x7DDE,0x7DDF,0x7DE0,0x7DE1,/* 0x80-0x87 */ + 0x7DE2,0x7DE3,0x7DE4,0x7DE5,0x7DE6,0x7DE7,0x7DE8,0x7DE9,/* 0x88-0x8F */ + 0x7DEA,0x7DEB,0x7DEC,0x7DED,0x7DEE,0x7DEF,0x7DF0,0x7DF1,/* 0x90-0x97 */ +- 0x7DF2,0x7DF3,0xF996,0x7DF5,0x7DF6,0x7DF7,0x7DF8,0x7DF9,/* 0x98-0x9F */ ++ 0x7DF2,0x7DF3,0x7DF4,0x7DF5,0x7DF6,0x7DF7,0x7DF8,0x7DF9,/* 0x98-0x9F */ + 0x7DFA,0x5C3D,0x52B2,0x8346,0x5162,0x830E,0x775B,0x6676,/* 0xA0-0xA7 */ +- 0x9CB8,0x4EAC,0x60CA,0xFA1D,0x7CB3,0x7ECF,0x4E95,0x8B66,/* 0xA8-0xAF */ ++ 0x9CB8,0x4EAC,0x60CA,0x7CBE,0x7CB3,0x7ECF,0x4E95,0x8B66,/* 0xA8-0xAF */ + 0x666F,0x9888,0x9759,0x5883,0x656C,0x955C,0x5F84,0x75C9,/* 0xB0-0xB7 */ +- 0xFA1C,0x7ADF,0x7ADE,0x51C0,0x70AF,0x7A98,0x63EA,0x7A76,/* 0xB8-0xBF */ ++ 0x9756,0x7ADF,0x7ADE,0x51C0,0x70AF,0x7A98,0x63EA,0x7A76,/* 0xB8-0xBF */ + 0x7EA0,0x7396,0x97ED,0x4E45,0x7078,0x4E5D,0x9152,0x53A9,/* 0xC0-0xC7 */ + 0x6551,0x65E7,0x81FC,0x8205,0x548E,0x5C31,0x759A,0x97A0,/* 0xC8-0xCF */ + 0x62D8,0x72D9,0x75BD,0x5C45,0x9A79,0x83CA,0x5C40,0x5480,/* 0xD0-0xD7 */ + 0x77E9,0x4E3E,0x6CAE,0x805A,0x62D2,0x636E,0x5DE8,0x5177,/* 0xD8-0xDF */ +- 0x8DDD,0x8E1E,0x952F,0x4FF1,0xF906,0x60E7,0x70AC,0x5267,/* 0xE0-0xE7 */ ++ 0x8DDD,0x8E1E,0x952F,0x4FF1,0x53E5,0x60E7,0x70AC,0x5267,/* 0xE0-0xE7 */ + 0x6350,0x9E43,0x5A1F,0x5026,0x7737,0x5377,0x7EE2,0x6485,/* 0xE8-0xEF */ + 0x652B,0x6289,0x6398,0x5014,0x7235,0x89C9,0x51B3,0x8BC0,/* 0xF0-0xF7 */ + 0x7EDD,0x5747,0x83CC,0x94A7,0x519B,0x541B,0x5CFB,0x0000,/* 0xF8-0xFF */ +@@ -2187,7 +2189,7 @@ + 0x7E1B,0x7E1C,0x7E1D,0x7E1E,0x7E1F,0x7E20,0x7E21,0x7E22,/* 0x60-0x67 */ + 0x7E23,0x7E24,0x7E25,0x7E26,0x7E27,0x7E28,0x7E29,0x7E2A,/* 0x68-0x6F */ + 0x7E2B,0x7E2C,0x7E2D,0x7E2E,0x7E2F,0x7E30,0x7E31,0x7E32,/* 0x70-0x77 */ +- 0x7E33,0x7E34,0x7E35,0x7E36,0xF950,0x7E38,0x7E39,0x0000,/* 0x78-0x7F */ ++ 0x7E33,0x7E34,0x7E35,0x7E36,0x7E37,0x7E38,0x7E39,0x0000,/* 0x78-0x7F */ + + 0x7E3A,0x7E3C,0x7E3D,0x7E3E,0x7E3F,0x7E40,0x7E42,0x7E43,/* 0x80-0x87 */ + 0x7E44,0x7E45,0x7E46,0x7E48,0x7E49,0x7E4A,0x7E4B,0x7E4C,/* 0x88-0x8F */ +@@ -2230,17 +2232,17 @@ + 0x7F3E,0x7F3F,0x7F40,0x7F41,0x7F43,0x7F46,0x7F47,0x7F48,/* 0x90-0x97 */ + 0x7F49,0x7F4A,0x7F4B,0x7F4C,0x7F4D,0x7F4E,0x7F4F,0x7F52,/* 0x98-0x9F */ + 0x7F53,0x9988,0x6127,0x6E83,0x5764,0x6606,0x6346,0x56F0,/* 0xA0-0xA7 */ +- 0x62EC,0x6269,0xFA0B,0x9614,0x5783,0xF925,0xF90B,0x8721,/* 0xA8-0xAF */ ++ 0x62EC,0x6269,0x5ED3,0x9614,0x5783,0x62C9,0x5587,0x8721,/* 0xA8-0xAF */ + 0x814A,0x8FA3,0x5566,0x83B1,0x6765,0x8D56,0x84DD,0x5A6A,/* 0xB0-0xB7 */ + 0x680F,0x62E6,0x7BEE,0x9611,0x5170,0x6F9C,0x8C30,0x63FD,/* 0xB8-0xBF */ +- 0x89C8,0x61D2,0x7F06,0x70C2,0x6EE5,0x7405,0x6994,0xF92B,/* 0xC0-0xC7 */ +- 0xF928,0x90CE,0xF929,0xF92A,0x635E,0x52B3,0xF946,0xF934,/* 0xC8-0xCF */ +- 0x4F6C,0x59E5,0xF919,0xF916,0x6D9D,0xF952,0x4E50,0xF949,/* 0xD0-0xD7 */ +- 0x956D,0x857E,0xF947,0xF94F,0x5121,0x5792,0x64C2,0xF953,/* 0xD8-0xDF */ +- 0x7C7B,0x6CEA,0x68F1,0x695E,0xF92E,0x5398,0xF9E2,0x7281,/* 0xE0-0xE7 */ +- 0xF989,0x7BF1,0x72F8,0x79BB,0x6F13,0xF9E4,0xF9E1,0xF9E9,/* 0xE8-0xEF */ +- 0x9CA4,0x793C,0x8389,0x8354,0xF9DE,0xF9DA,0x4E3D,0x5389,/* 0xF0-0xF7 */ +- 0x52B1,0x783E,0x5386,0xF9DD,0x5088,0xF9B5,0x4FD0,0x0000,/* 0xF8-0xFF */ ++ 0x89C8,0x61D2,0x7F06,0x70C2,0x6EE5,0x7405,0x6994,0x72FC,/* 0xC0-0xC7 */ ++ 0x5ECA,0x90CE,0x6717,0x6D6A,0x635E,0x52B3,0x7262,0x8001,/* 0xC8-0xCF */ ++ 0x4F6C,0x59E5,0x916A,0x70D9,0x6D9D,0x52D2,0x4E50,0x96F7,/* 0xD0-0xD7 */ ++ 0x956D,0x857E,0x78CA,0x7D2F,0x5121,0x5792,0x64C2,0x808B,/* 0xD8-0xDF */ ++ 0x7C7B,0x6CEA,0x68F1,0x695E,0x51B7,0x5398,0x68A8,0x7281,/* 0xE0-0xE7 */ ++ 0x9ECE,0x7BF1,0x72F8,0x79BB,0x6F13,0x7406,0x674E,0x91CC,/* 0xE8-0xEF */ ++ 0x9CA4,0x793C,0x8389,0x8354,0x540F,0x6817,0x4E3D,0x5389,/* 0xF0-0xF7 */ ++ 0x52B1,0x783E,0x5386,0x5229,0x5088,0x4F8B,0x4FD0,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_C1[256] = { +@@ -2255,7 +2257,7 @@ + 0x7F56,0x7F59,0x7F5B,0x7F5C,0x7F5D,0x7F5E,0x7F60,0x7F63,/* 0x40-0x47 */ + 0x7F64,0x7F65,0x7F66,0x7F67,0x7F6B,0x7F6C,0x7F6D,0x7F6F,/* 0x48-0x4F */ + 0x7F70,0x7F73,0x7F75,0x7F76,0x7F77,0x7F78,0x7F7A,0x7F7B,/* 0x50-0x57 */ +- 0x7F7C,0x7F7D,0x7F7F,0x7F80,0x7F82,0x7F83,0x7F84,0xF90F,/* 0x58-0x5F */ ++ 0x7F7C,0x7F7D,0x7F7F,0x7F80,0x7F82,0x7F83,0x7F84,0x7F85,/* 0x58-0x5F */ + 0x7F86,0x7F87,0x7F88,0x7F89,0x7F8B,0x7F8D,0x7F8F,0x7F90,/* 0x60-0x67 */ + 0x7F91,0x7F92,0x7F93,0x7F95,0x7F96,0x7F97,0x7F98,0x7F99,/* 0x68-0x6F */ + 0x7F9B,0x7F9C,0x7FA0,0x7FA2,0x7FA3,0x7FA5,0x7FA6,0x7FA8,/* 0x70-0x77 */ +@@ -2265,18 +2267,18 @@ + 0x7FC0,0x7FC2,0x7FC3,0x7FC4,0x7FC6,0x7FC7,0x7FC8,0x7FC9,/* 0x88-0x8F */ + 0x7FCB,0x7FCD,0x7FCF,0x7FD0,0x7FD1,0x7FD2,0x7FD3,0x7FD6,/* 0x90-0x97 */ + 0x7FD7,0x7FD9,0x7FDA,0x7FDB,0x7FDC,0x7FDD,0x7FDE,0x7FE2,/* 0x98-0x9F */ +- 0x7FE3,0xF9E5,0xF9F7,0xF9F9,0x6CA5,0x96B6,0xF98A,0x7483,/* 0xA0-0xA7 */ +- 0x54E9,0x4FE9,0x8054,0x83B2,0x8FDE,0x9570,0xF9A2,0xF9AC,/* 0xA8-0xAF */ ++ 0x7FE3,0x75E2,0x7ACB,0x7C92,0x6CA5,0x96B6,0x529B,0x7483,/* 0xA0-0xA7 */ ++ 0x54E9,0x4FE9,0x8054,0x83B2,0x8FDE,0x9570,0x5EC9,0x601C,/* 0xA8-0xAF */ + 0x6D9F,0x5E18,0x655B,0x8138,0x94FE,0x604B,0x70BC,0x7EC3,/* 0xB0-0xB7 */ +- 0x7CAE,0x51C9,0xF97A,0x7CB1,0xF97C,0x4E24,0x8F86,0xF97E,/* 0xB8-0xBF */ +- 0x667E,0xF977,0x8C05,0x64A9,0x804A,0xF9BB,0x7597,0xF9C0,/* 0xC0-0xC7 */ +- 0x5BE5,0x8FBD,0x6F66,0xF9BA,0x6482,0x9563,0x5ED6,0xF9BE,/* 0xC8-0xCF */ +- 0xF99C,0xF9A0,0xF99F,0xF99D,0x730E,0x7433,0xF9F4,0x78F7,/* 0xD0-0xD7 */ +- 0x9716,0x4E34,0x90BB,0x9CDE,0xF9F5,0x51DB,0x8D41,0xF9ED,/* 0xD8-0xDF */ +- 0x62CE,0xF9AD,0xF958,0xF9B2,0x9F84,0x94C3,0x4F36,0xF9AF,/* 0xE0-0xE7 */ +- 0xF955,0x7075,0xF959,0x5CAD,0x9886,0x53E6,0xF9A8,0xF9CB,/* 0xE8-0xEF */ +- 0xF9CC,0x69B4,0xF9CE,0x998F,0xF9CD,0x5218,0x7624,0xF9CA,/* 0xF0-0xF7 */ +- 0xF9C9,0xF9D1,0x9F99,0x804B,0x5499,0x7B3C,0x7ABF,0x0000,/* 0xF8-0xFF */ ++ 0x7CAE,0x51C9,0x6881,0x7CB1,0x826F,0x4E24,0x8F86,0x91CF,/* 0xB8-0xBF */ ++ 0x667E,0x4EAE,0x8C05,0x64A9,0x804A,0x50DA,0x7597,0x71CE,/* 0xC0-0xC7 */ ++ 0x5BE5,0x8FBD,0x6F66,0x4E86,0x6482,0x9563,0x5ED6,0x6599,/* 0xC8-0xCF */ ++ 0x5217,0x88C2,0x70C8,0x52A3,0x730E,0x7433,0x6797,0x78F7,/* 0xD0-0xD7 */ ++ 0x9716,0x4E34,0x90BB,0x9CDE,0x6DCB,0x51DB,0x8D41,0x541D,/* 0xD8-0xDF */ ++ 0x62CE,0x73B2,0x83F1,0x96F6,0x9F84,0x94C3,0x4F36,0x7F9A,/* 0xE0-0xE7 */ ++ 0x51CC,0x7075,0x9675,0x5CAD,0x9886,0x53E6,0x4EE4,0x6E9C,/* 0xE8-0xEF */ ++ 0x7409,0x69B4,0x786B,0x998F,0x7559,0x5218,0x7624,0x6D41,/* 0xF0-0xF7 */ ++ 0x67F3,0x516D,0x9F99,0x804B,0x5499,0x7B3C,0x7ABF,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_C2[256] = { +@@ -2299,17 +2301,17 @@ + + 0x8059,0x805B,0x805C,0x805D,0x805E,0x805F,0x8060,0x8061,/* 0x80-0x87 */ + 0x8062,0x8063,0x8064,0x8065,0x8066,0x8067,0x8068,0x806B,/* 0x88-0x8F */ +- 0x806C,0x806D,0x806E,0xF997,0x8070,0x8072,0x8073,0x8074,/* 0x90-0x97 */ ++ 0x806C,0x806D,0x806E,0x806F,0x8070,0x8072,0x8073,0x8074,/* 0x90-0x97 */ + 0x8075,0x8076,0x8077,0x8078,0x8079,0x807A,0x807B,0x807C,/* 0x98-0x9F */ +- 0x807D,0xF9DC,0x5784,0x62E2,0x9647,0x697C,0x5A04,0x6402,/* 0xA0-0xA7 */ +- 0x7BD3,0xF94E,0xF951,0x82A6,0x5362,0x9885,0x5E90,0x7089,/* 0xA8-0xAF */ +- 0x63B3,0x5364,0x864F,0x9C81,0x9E93,0xF93B,0xF938,0xF937,/* 0xB0-0xB7 */ +- 0x8D42,0xF940,0x6F5E,0x7984,0x5F55,0x9646,0xF9D2,0x9A74,/* 0xB8-0xBF */ +- 0x5415,0x94DD,0x4FA3,0xF983,0xF9DF,0x5C61,0x7F15,0x8651,/* 0xC0-0xC7 */ +- 0x6C2F,0xF9D8,0xF9DB,0x6EE4,0x7EFF,0x5CE6,0x631B,0x5B6A,/* 0xC8-0xCF */ +- 0x6EE6,0xF91C,0x4E71,0xF975,0xF976,0x62A1,0x8F6E,0x4F26,/* 0xD0-0xD7 */ +- 0x4ED1,0x6CA6,0x7EB6,0x8BBA,0x841D,0xF911,0x7F57,0x903B,/* 0xD8-0xDF */ +- 0x9523,0x7BA9,0x9AA1,0xF912,0xF918,0xF915,0x9A86,0x7EDC,/* 0xE0-0xE7 */ ++ 0x807D,0x9686,0x5784,0x62E2,0x9647,0x697C,0x5A04,0x6402,/* 0xA0-0xA7 */ ++ 0x7BD3,0x6F0F,0x964B,0x82A6,0x5362,0x9885,0x5E90,0x7089,/* 0xA8-0xAF */ ++ 0x63B3,0x5364,0x864F,0x9C81,0x9E93,0x788C,0x9732,0x8DEF,/* 0xB0-0xB7 */ ++ 0x8D42,0x9E7F,0x6F5E,0x7984,0x5F55,0x9646,0x622E,0x9A74,/* 0xB8-0xBF */ ++ 0x5415,0x94DD,0x4FA3,0x65C5,0x5C65,0x5C61,0x7F15,0x8651,/* 0xC0-0xC7 */ ++ 0x6C2F,0x5F8B,0x7387,0x6EE4,0x7EFF,0x5CE6,0x631B,0x5B6A,/* 0xC8-0xCF */ ++ 0x6EE6,0x5375,0x4E71,0x63A0,0x7565,0x62A1,0x8F6E,0x4F26,/* 0xD0-0xD7 */ ++ 0x4ED1,0x6CA6,0x7EB6,0x8BBA,0x841D,0x87BA,0x7F57,0x903B,/* 0xD8-0xDF */ ++ 0x9523,0x7BA9,0x9AA1,0x88F8,0x843D,0x6D1B,0x9A86,0x7EDC,/* 0xE0-0xE7 */ + 0x5988,0x9EBB,0x739B,0x7801,0x8682,0x9A6C,0x9A82,0x561B,/* 0xE8-0xEF */ + 0x5417,0x57CB,0x4E70,0x9EA6,0x5356,0x8FC8,0x8109,0x7792,/* 0xF0-0xF7 */ + 0x9992,0x86EE,0x6EE1,0x8513,0x66FC,0x6162,0x6F2B,0x0000,/* 0xF8-0xFF */ +@@ -2324,7 +2326,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0xF945,0x8081,0x8082,0x8085,0x8088,0x808A,0x808D,0x808E,/* 0x40-0x47 */ ++ 0x807E,0x8081,0x8082,0x8085,0x8088,0x808A,0x808D,0x808E,/* 0x40-0x47 */ + 0x808F,0x8090,0x8091,0x8092,0x8094,0x8095,0x8097,0x8099,/* 0x48-0x4F */ + 0x809E,0x80A3,0x80A6,0x80A7,0x80A8,0x80AC,0x80B0,0x80B3,/* 0x50-0x57 */ + 0x80B5,0x80B6,0x80B8,0x80B9,0x80BB,0x80C5,0x80C7,0x80C8,/* 0x58-0x5F */ +@@ -2344,7 +2346,7 @@ + 0x7F8E,0x6627,0x5BD0,0x59B9,0x5A9A,0x95E8,0x95F7,0x4EEC,/* 0xC0-0xC7 */ + 0x840C,0x8499,0x6AAC,0x76DF,0x9530,0x731B,0x68A6,0x5B5F,/* 0xC8-0xCF */ + 0x772F,0x919A,0x9761,0x7CDC,0x8FF7,0x8C1C,0x5F25,0x7C73,/* 0xD0-0xD7 */ +- 0x79D8,0x89C5,0xF968,0x871C,0x5BC6,0x5E42,0x68C9,0x7720,/* 0xD8-0xDF */ ++ 0x79D8,0x89C5,0x6CCC,0x871C,0x5BC6,0x5E42,0x68C9,0x7720,/* 0xD8-0xDF */ + 0x7EF5,0x5195,0x514D,0x52C9,0x5A29,0x7F05,0x9762,0x82D7,/* 0xE0-0xE7 */ + 0x63CF,0x7784,0x85D0,0x79D2,0x6E3A,0x5E99,0x5999,0x8511,/* 0xE8-0xEF */ + 0x706D,0x6C11,0x62BF,0x76BF,0x654F,0x60AF,0x95FD,0x660E,/* 0xF0-0xF7 */ +@@ -2378,12 +2380,12 @@ + 0x964C,0x8C0B,0x725F,0x67D0,0x62C7,0x7261,0x4EA9,0x59C6,/* 0xB0-0xB7 */ + 0x6BCD,0x5893,0x66AE,0x5E55,0x52DF,0x6155,0x6728,0x76EE,/* 0xB8-0xBF */ + 0x7766,0x7267,0x7A46,0x62FF,0x54EA,0x5450,0x94A0,0x90A3,/* 0xC0-0xC7 */ +- 0x5A1C,0x7EB3,0x6C16,0x4E43,0x5976,0x8010,0xF90C,0x5357,/* 0xC8-0xCF */ ++ 0x5A1C,0x7EB3,0x6C16,0x4E43,0x5976,0x8010,0x5948,0x5357,/* 0xC8-0xCF */ + 0x7537,0x96BE,0x56CA,0x6320,0x8111,0x607C,0x95F9,0x6DD6,/* 0xD0-0xD7 */ + 0x5462,0x9981,0x5185,0x5AE9,0x80FD,0x59AE,0x9713,0x502A,/* 0xD8-0xDF */ +- 0xF9E3,0x5C3C,0x62DF,0x4F60,0xF9EB,0x817B,0x9006,0xF9EC,/* 0xE0-0xE7 */ +- 0x852B,0x62C8,0xF98E,0x78BE,0x64B5,0xF9A4,0xF9A3,0x5A18,/* 0xE8-0xEF */ +- 0x917F,0x9E1F,0xF9BD,0x634F,0x8042,0x5B7D,0x556E,0x954A,/* 0xF0-0xF7 */ ++ 0x6CE5,0x5C3C,0x62DF,0x4F60,0x533F,0x817B,0x9006,0x6EBA,/* 0xE0-0xE7 */ ++ 0x852B,0x62C8,0x5E74,0x78BE,0x64B5,0x637B,0x5FF5,0x5A18,/* 0xE8-0xEF */ ++ 0x917F,0x9E1F,0x5C3F,0x634F,0x8042,0x5B7D,0x556E,0x954A,/* 0xF0-0xF7 */ + 0x954D,0x6D85,0x60A8,0x67E0,0x72DE,0x51DD,0x5B81,0x0000,/* 0xF8-0xFF */ + }; + +@@ -2396,9 +2398,9 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x81D4,0x81D5,0x81D6,0x81D7,0xF926,0x81D9,0x81DA,0x81DB,/* 0x40-0x47 */ ++ 0x81D4,0x81D5,0x81D6,0x81D7,0x81D8,0x81D9,0x81DA,0x81DB,/* 0x40-0x47 */ + 0x81DC,0x81DD,0x81DE,0x81DF,0x81E0,0x81E1,0x81E2,0x81E4,/* 0x48-0x4F */ +- 0x81E5,0x81E6,0xF9F6,0x81E9,0x81EB,0x81EE,0x81EF,0x81F0,/* 0x50-0x57 */ ++ 0x81E5,0x81E6,0x81E8,0x81E9,0x81EB,0x81EE,0x81EF,0x81F0,/* 0x50-0x57 */ + 0x81F1,0x81F2,0x81F5,0x81F6,0x81F7,0x81F8,0x81F9,0x81FA,/* 0x58-0x5F */ + 0x81FD,0x81FF,0x8203,0x8207,0x8208,0x8209,0x820A,0x820B,/* 0x60-0x67 */ + 0x820E,0x820F,0x8211,0x8213,0x8215,0x8216,0x8217,0x8218,/* 0x68-0x6F */ +@@ -2410,7 +2412,7 @@ + 0x8255,0x8256,0x8257,0x8259,0x825B,0x825C,0x825D,0x825E,/* 0x90-0x97 */ + 0x8260,0x8261,0x8262,0x8263,0x8264,0x8265,0x8266,0x8267,/* 0x98-0x9F */ + 0x8269,0x62E7,0x6CDE,0x725B,0x626D,0x94AE,0x7EBD,0x8113,/* 0xA0-0xA7 */ +- 0x6D53,0x519C,0xF943,0x5974,0x52AA,0xF960,0xF981,0x6696,/* 0xA8-0xAF */ ++ 0x6D53,0x519C,0x5F04,0x5974,0x52AA,0x6012,0x5973,0x6696,/* 0xA8-0xAF */ + 0x8650,0x759F,0x632A,0x61E6,0x7CEF,0x8BFA,0x54E6,0x6B27,/* 0xB0-0xB7 */ + 0x9E25,0x6BB4,0x85D5,0x5455,0x5076,0x6CA4,0x556A,0x8DB4,/* 0xB8-0xBF */ + 0x722C,0x5E15,0x6015,0x7436,0x62CD,0x6392,0x724C,0x5F98,/* 0xC0-0xC7 */ +@@ -2455,7 +2457,7 @@ + 0x66DD,0x7011,0x671F,0x6B3A,0x6816,0x621A,0x59BB,0x4E03,/* 0xD8-0xDF */ + 0x51C4,0x6F06,0x67D2,0x6C8F,0x5176,0x68CB,0x5947,0x6B67,/* 0xE0-0xE7 */ + 0x7566,0x5D0E,0x8110,0x9F50,0x65D7,0x7948,0x7941,0x9A91,/* 0xE8-0xEF */ +- 0x8D77,0x5C82,0x4E5E,0x4F01,0x542F,0xF909,0x780C,0x5668,/* 0xF0-0xF7 */ ++ 0x8D77,0x5C82,0x4E5E,0x4F01,0x542F,0x5951,0x780C,0x5668,/* 0xF0-0xF7 */ + 0x6C14,0x8FC4,0x5F03,0x6C7D,0x6CE3,0x8BAB,0x6390,0x0000,/* 0xF8-0xFF */ + }; + +@@ -2478,7 +2480,7 @@ + 0x83A4,0x83A5,0x83A6,0x83A7,0x83AC,0x83AD,0x83AE,0x0000,/* 0x78-0x7F */ + + 0x83AF,0x83B5,0x83BB,0x83BE,0x83BF,0x83C2,0x83C3,0x83C4,/* 0x80-0x87 */ +- 0x83C6,0x83C8,0xF93E,0x83CB,0x83CD,0x83CE,0x83D0,0x83D1,/* 0x88-0x8F */ ++ 0x83C6,0x83C8,0x83C9,0x83CB,0x83CD,0x83CE,0x83D0,0x83D1,/* 0x88-0x8F */ + 0x83D2,0x83D3,0x83D5,0x83D7,0x83D9,0x83DA,0x83DB,0x83DE,/* 0x90-0x97 */ + 0x83E2,0x83E3,0x83E4,0x83E6,0x83E7,0x83E8,0x83EB,0x83EC,/* 0x98-0x9F */ + 0x83ED,0x6070,0x6D3D,0x7275,0x6266,0x948E,0x94C5,0x5343,/* 0xA0-0xA7 */ +@@ -2487,9 +2489,9 @@ + 0x6B49,0x67AA,0x545B,0x8154,0x7F8C,0x5899,0x8537,0x5F3A,/* 0xB8-0xBF */ + 0x62A2,0x6A47,0x9539,0x6572,0x6084,0x6865,0x77A7,0x4E54,/* 0xC0-0xC7 */ + 0x4FA8,0x5DE7,0x9798,0x64AC,0x7FD8,0x5CED,0x4FCF,0x7A8D,/* 0xC8-0xCF */ +- 0xFA00,0x8304,0x4E14,0x602F,0x7A83,0x94A6,0x4FB5,0x4EB2,/* 0xD0-0xD7 */ ++ 0x5207,0x8304,0x4E14,0x602F,0x7A83,0x94A6,0x4FB5,0x4EB2,/* 0xD0-0xD7 */ + 0x79E6,0x7434,0x52E4,0x82B9,0x64D2,0x79BD,0x5BDD,0x6C81,/* 0xD8-0xDF */ +- 0x9752,0x8F7B,0x6C22,0x503E,0x537F,0x6E05,0x64CE,0xFA12,/* 0xE0-0xE7 */ ++ 0x9752,0x8F7B,0x6C22,0x503E,0x537F,0x6E05,0x64CE,0x6674,/* 0xE0-0xE7 */ + 0x6C30,0x60C5,0x9877,0x8BF7,0x5E86,0x743C,0x7A77,0x79CB,/* 0xE8-0xEF */ + 0x4E18,0x90B1,0x7403,0x6C42,0x56DA,0x914B,0x6CC5,0x8D8B,/* 0xF0-0xF7 */ + 0x533A,0x86C6,0x66F2,0x8EAF,0x5C48,0x9A71,0x6E20,0x0000,/* 0xF8-0xFF */ +@@ -2511,7 +2513,7 @@ + 0x8421,0x8422,0x8423,0x8429,0x842A,0x842B,0x842C,0x842D,/* 0x60-0x67 */ + 0x842E,0x842F,0x8430,0x8432,0x8433,0x8434,0x8435,0x8436,/* 0x68-0x6F */ + 0x8437,0x8439,0x843A,0x843B,0x843E,0x843F,0x8440,0x8441,/* 0x70-0x77 */ +- 0x8442,0x8443,0x8444,0x8445,0x8447,0x8448,0xF96E,0x0000,/* 0x78-0x7F */ ++ 0x8442,0x8443,0x8444,0x8445,0x8447,0x8448,0x8449,0x0000,/* 0x78-0x7F */ + + 0x844A,0x844B,0x844C,0x844D,0x844E,0x844F,0x8450,0x8452,/* 0x80-0x87 */ + 0x8453,0x8454,0x8455,0x8456,0x8458,0x845D,0x845E,0x845F,/* 0x88-0x8F */ +@@ -2526,9 +2528,9 @@ + 0x5203,0x598A,0x7EAB,0x6254,0x4ECD,0x65E5,0x620E,0x8338,/* 0xD0-0xD7 */ + 0x84C9,0x8363,0x878D,0x7194,0x6EB6,0x5BB9,0x7ED2,0x5197,/* 0xD8-0xDF */ + 0x63C9,0x67D4,0x8089,0x8339,0x8815,0x5112,0x5B7A,0x5982,/* 0xE0-0xE7 */ +- 0x8FB1,0x4E73,0x6C5D,0x5165,0x8925,0x8F6F,0xF9C6,0x854A,/* 0xE8-0xEF */ +- 0x745E,0x9510,0x95F0,0x6DA6,0xF974,0x5F31,0x6492,0x6D12,/* 0xF0-0xF7 */ +- 0x8428,0x816E,0x9CC3,0xF96C,0x8D5B,0x4E09,0x53C1,0x0000,/* 0xF8-0xFF */ ++ 0x8FB1,0x4E73,0x6C5D,0x5165,0x8925,0x8F6F,0x962E,0x854A,/* 0xE8-0xEF */ ++ 0x745E,0x9510,0x95F0,0x6DA6,0x82E5,0x5F31,0x6492,0x6D12,/* 0xF0-0xF7 */ ++ 0x8428,0x816E,0x9CC3,0x585E,0x8D5B,0x4E09,0x53C1,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_C9[256] = { +@@ -2550,7 +2552,7 @@ + 0x84CC,0x84CE,0x84CF,0x84D2,0x84D4,0x84D5,0x84D7,0x0000,/* 0x78-0x7F */ + + 0x84D8,0x84D9,0x84DA,0x84DB,0x84DC,0x84DE,0x84E1,0x84E2,/* 0x80-0x87 */ +- 0x84E4,0x84E7,0x84E8,0x84E9,0x84EA,0x84EB,0x84ED,0xF999,/* 0x88-0x8F */ ++ 0x84E4,0x84E7,0x84E8,0x84E9,0x84EA,0x84EB,0x84ED,0x84EE,/* 0x88-0x8F */ + 0x84EF,0x84F1,0x84F2,0x84F3,0x84F4,0x84F5,0x84F6,0x84F7,/* 0x90-0x97 */ + 0x84F8,0x84F9,0x84FA,0x84FB,0x84FD,0x84FE,0x8500,0x8501,/* 0x98-0x9F */ + 0x8502,0x4F1E,0x6563,0x6851,0x55D3,0x4E27,0x6414,0x9A9A,/* 0xA0-0xA7 */ +@@ -2563,7 +2565,7 @@ + 0x97F6,0x5C11,0x54E8,0x90B5,0x7ECD,0x5962,0x8D4A,0x86C7,/* 0xD8-0xDF */ + 0x820C,0x820D,0x8D66,0x6444,0x5C04,0x6151,0x6D89,0x793E,/* 0xE0-0xE7 */ + 0x8BBE,0x7837,0x7533,0x547B,0x4F38,0x8EAB,0x6DF1,0x5A20,/* 0xE8-0xEF */ +- 0x7EC5,0xFA19,0xF972,0x5BA1,0x5A76,0x751A,0x80BE,0x614E,/* 0xF0-0xF7 */ ++ 0x7EC5,0x795E,0x6C88,0x5BA1,0x5A76,0x751A,0x80BE,0x614E,/* 0xF0-0xF7 */ + 0x6E17,0x58F0,0x751F,0x7525,0x7272,0x5347,0x7EF3,0x0000,/* 0xF8-0xFF */ + }; + +@@ -2589,9 +2591,9 @@ + 0x8561,0x8562,0x8563,0x8565,0x8566,0x8567,0x8569,0x856A,/* 0x88-0x8F */ + 0x856B,0x856C,0x856D,0x856E,0x856F,0x8570,0x8571,0x8573,/* 0x90-0x97 */ + 0x8575,0x8576,0x8577,0x8578,0x857C,0x857D,0x857F,0x8580,/* 0x98-0x9F */ +- 0x8581,0xF96D,0x76DB,0x5269,0x80DC,0x5723,0x5E08,0x5931,/* 0xA0-0xA7 */ ++ 0x8581,0x7701,0x76DB,0x5269,0x80DC,0x5723,0x5E08,0x5931,/* 0xA0-0xA7 */ + 0x72EE,0x65BD,0x6E7F,0x8BD7,0x5C38,0x8671,0x5341,0x77F3,/* 0xA8-0xAF */ +- 0xF973,0x65F6,0xF9FD,0x98DF,0x8680,0x5B9E,0x8BC6,0x53F2,/* 0xB0-0xB7 */ ++ 0x62FE,0x65F6,0x4EC0,0x98DF,0x8680,0x5B9E,0x8BC6,0x53F2,/* 0xB0-0xB7 */ + 0x77E2,0x4F7F,0x5C4E,0x9A76,0x59CB,0x5F0F,0x793A,0x58EB,/* 0xB8-0xBF */ + 0x4E16,0x67FF,0x4E8B,0x62ED,0x8A93,0x901D,0x52BF,0x662F,/* 0xC0-0xC7 */ + 0x55DC,0x566C,0x9002,0x4ED5,0x4F8D,0x91CA,0x9970,0x6C0F,/* 0xC8-0xCF */ +@@ -2619,7 +2621,7 @@ + 0x85AB,0x85AC,0x85AD,0x85B1,0x85B2,0x85B3,0x85B4,0x85B5,/* 0x60-0x67 */ + 0x85B6,0x85B8,0x85BA,0x85BB,0x85BC,0x85BD,0x85BE,0x85BF,/* 0x68-0x6F */ + 0x85C0,0x85C2,0x85C3,0x85C4,0x85C5,0x85C6,0x85C7,0x85C8,/* 0x70-0x77 */ +- 0x85CA,0x85CB,0x85CC,0xF923,0x85CE,0x85D1,0x85D2,0x0000,/* 0x78-0x7F */ ++ 0x85CA,0x85CB,0x85CC,0x85CD,0x85CE,0x85D1,0x85D2,0x0000,/* 0x78-0x7F */ + + 0x85D4,0x85D6,0x85D7,0x85D8,0x85D9,0x85DA,0x85DB,0x85DD,/* 0x80-0x87 */ + 0x85DE,0x85DF,0x85E0,0x85E1,0x85E2,0x85E3,0x85E5,0x85E6,/* 0x88-0x8F */ +@@ -2635,7 +2637,7 @@ + 0x7D20,0x901F,0x7C9F,0x50F3,0x5851,0x6EAF,0x5BBF,0x8BC9,/* 0xD8-0xDF */ + 0x8083,0x9178,0x849C,0x7B97,0x867D,0x968B,0x968F,0x7EE5,/* 0xE0-0xE7 */ + 0x9AD3,0x788E,0x5C81,0x7A57,0x9042,0x96A7,0x795F,0x5B59,/* 0xE8-0xEF */ +- 0x635F,0x7B0B,0x84D1,0x68AD,0x5506,0x7F29,0x7410,0xF96A,/* 0xF0-0xF7 */ ++ 0x635F,0x7B0B,0x84D1,0x68AD,0x5506,0x7F29,0x7410,0x7D22,/* 0xF0-0xF7 */ + 0x9501,0x6240,0x584C,0x4ED6,0x5B83,0x5979,0x5854,0x0000,/* 0xF8-0xFF */ + }; + +@@ -2648,24 +2650,24 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x85F9,0xF9F0,0x85FC,0x85FD,0x85FE,0x8600,0x8601,0x8602,/* 0x40-0x47 */ +- 0x8603,0x8604,0xF935,0x8607,0x8608,0x8609,0x860A,0x860B,/* 0x48-0x4F */ ++ 0x85F9,0x85FA,0x85FC,0x85FD,0x85FE,0x8600,0x8601,0x8602,/* 0x40-0x47 */ ++ 0x8603,0x8604,0x8606,0x8607,0x8608,0x8609,0x860A,0x860B,/* 0x48-0x4F */ + 0x860C,0x860D,0x860E,0x860F,0x8610,0x8612,0x8613,0x8614,/* 0x50-0x57 */ + 0x8615,0x8617,0x8618,0x8619,0x861A,0x861B,0x861C,0x861D,/* 0x58-0x5F */ + 0x861E,0x861F,0x8620,0x8621,0x8622,0x8623,0x8624,0x8625,/* 0x60-0x67 */ +- 0x8626,0x8628,0x862A,0x862B,0x862C,0xF91F,0x862E,0x862F,/* 0x68-0x6F */ ++ 0x8626,0x8628,0x862A,0x862B,0x862C,0x862D,0x862E,0x862F,/* 0x68-0x6F */ + 0x8630,0x8631,0x8632,0x8633,0x8634,0x8635,0x8636,0x8637,/* 0x70-0x77 */ +- 0x8639,0x863A,0x863B,0x863D,0x863E,0xF910,0x8640,0x0000,/* 0x78-0x7F */ ++ 0x8639,0x863A,0x863B,0x863D,0x863E,0x863F,0x8640,0x0000,/* 0x78-0x7F */ + + 0x8641,0x8642,0x8643,0x8644,0x8645,0x8646,0x8647,0x8648,/* 0x80-0x87 */ + 0x8649,0x864A,0x864B,0x864C,0x8652,0x8653,0x8655,0x8656,/* 0x88-0x8F */ +- 0x8657,0x8658,0x8659,0x865B,0xF936,0x865D,0x865F,0x8660,/* 0x90-0x97 */ ++ 0x8657,0x8658,0x8659,0x865B,0x865C,0x865D,0x865F,0x8660,/* 0x90-0x97 */ + 0x8661,0x8663,0x8664,0x8665,0x8666,0x8667,0x8668,0x8669,/* 0x98-0x9F */ + 0x866A,0x736D,0x631E,0x8E4B,0x8E0F,0x80CE,0x82D4,0x62AC,/* 0xA0-0xA7 */ + 0x53F0,0x6CF0,0x915E,0x592A,0x6001,0x6C70,0x574D,0x644A,/* 0xA8-0xAF */ + 0x8D2A,0x762B,0x6EE9,0x575B,0x6A80,0x75F0,0x6F6D,0x8C2D,/* 0xB0-0xB7 */ + 0x8C08,0x5766,0x6BEF,0x8892,0x78B3,0x63A2,0x53F9,0x70AD,/* 0xB8-0xBF */ +- 0x6C64,0x5858,0x642A,0x5802,0x68E0,0x819B,0x5510,0xFA03,/* 0xC0-0xC7 */ ++ 0x6C64,0x5858,0x642A,0x5802,0x68E0,0x819B,0x5510,0x7CD6,/* 0xC0-0xC7 */ + 0x5018,0x8EBA,0x6DCC,0x8D9F,0x70EB,0x638F,0x6D9B,0x6ED4,/* 0xC8-0xCF */ + 0x7EE6,0x8404,0x6843,0x9003,0x6DD8,0x9676,0x8BA8,0x5957,/* 0xD0-0xD7 */ + 0x7279,0x85E4,0x817E,0x75BC,0x8A8A,0x68AF,0x5254,0x8E22,/* 0xD8-0xDF */ +@@ -2704,7 +2706,7 @@ + 0x5C60,0x571F,0x5410,0x5154,0x6E4D,0x56E2,0x63A8,0x9893,/* 0xC0-0xC7 */ + 0x817F,0x8715,0x892A,0x9000,0x541E,0x5C6F,0x81C0,0x62D6,/* 0xC8-0xCF */ + 0x6258,0x8131,0x9E35,0x9640,0x9A6E,0x9A7C,0x692D,0x59A5,/* 0xD0-0xD7 */ +- 0xFA02,0x553E,0x6316,0x54C7,0x86D9,0x6D3C,0x5A03,0x74E6,/* 0xD8-0xDF */ ++ 0x62D3,0x553E,0x6316,0x54C7,0x86D9,0x6D3C,0x5A03,0x74E6,/* 0xD8-0xDF */ + 0x889C,0x6B6A,0x5916,0x8C4C,0x5F2F,0x6E7E,0x73A9,0x987D,/* 0xE0-0xE7 */ + 0x4E38,0x70F7,0x5B8C,0x7897,0x633D,0x665A,0x7696,0x60CB,/* 0xE8-0xEF */ + 0x5B9B,0x5A49,0x4E07,0x8155,0x6C6A,0x738B,0x4EA1,0x6789,/* 0xF0-0xF7 */ +@@ -2768,7 +2770,7 @@ + 0x87FA,0x87FB,0x87FC,0x87FD,0x87FF,0x8800,0x8801,0x8802,/* 0x80-0x87 */ + 0x8804,0x8805,0x8806,0x8807,0x8808,0x8809,0x880B,0x880C,/* 0x88-0x8F */ + 0x880D,0x880E,0x880F,0x8810,0x8811,0x8812,0x8814,0x8817,/* 0x90-0x97 */ +- 0x8818,0x8819,0x881A,0x881C,0x881D,0x881E,0xF927,0x8820,/* 0x98-0x9F */ ++ 0x8818,0x8819,0x881A,0x881C,0x881D,0x881E,0x881F,0x8820,/* 0x98-0x9F */ + 0x8823,0x7A00,0x606F,0x5E0C,0x6089,0x819D,0x5915,0x60DC,/* 0xA0-0xA7 */ + 0x7184,0x70EF,0x6EAA,0x6C50,0x7280,0x6A84,0x88AD,0x5E2D,/* 0xA8-0xAF */ + 0x4E60,0x5AB3,0x559C,0x94E3,0x6D17,0x7CFB,0x9699,0x620F,/* 0xB0-0xB7 */ +@@ -2778,7 +2780,7 @@ + 0x95F2,0x6D8E,0x5F26,0x5ACC,0x663E,0x9669,0x73B0,0x732E,/* 0xD0-0xD7 */ + 0x53BF,0x817A,0x9985,0x7FA1,0x5BAA,0x9677,0x9650,0x7EBF,/* 0xD8-0xDF */ + 0x76F8,0x53A2,0x9576,0x9999,0x7BB1,0x8944,0x6E58,0x4E61,/* 0xE0-0xE7 */ +- 0x7FD4,0xFA1A,0x8BE6,0x60F3,0x54CD,0x4EAB,0x9879,0x5DF7,/* 0xE8-0xEF */ ++ 0x7FD4,0x7965,0x8BE6,0x60F3,0x54CD,0x4EAB,0x9879,0x5DF7,/* 0xE8-0xEF */ + 0x6A61,0x50CF,0x5411,0x8C61,0x8427,0x785D,0x9704,0x524A,/* 0xF0-0xF7 */ + 0x54EE,0x56A3,0x9500,0x6D88,0x5BB5,0x6DC6,0x6653,0x0000,/* 0xF8-0xFF */ + }; +@@ -2811,7 +2813,7 @@ + 0x61C8,0x6CC4,0x6CFB,0x8C22,0x5C51,0x85AA,0x82AF,0x950C,/* 0xB8-0xBF */ + 0x6B23,0x8F9B,0x65B0,0x5FFB,0x5FC3,0x4FE1,0x8845,0x661F,/* 0xC0-0xC7 */ + 0x8165,0x7329,0x60FA,0x5174,0x5211,0x578B,0x5F62,0x90A2,/* 0xC8-0xCF */ +- 0xFA08,0x9192,0x5E78,0x674F,0x6027,0x59D3,0x5144,0x51F6,/* 0xD0-0xD7 */ ++ 0x884C,0x9192,0x5E78,0x674F,0x6027,0x59D3,0x5144,0x51F6,/* 0xD0-0xD7 */ + 0x80F8,0x5308,0x6C79,0x96C4,0x718A,0x4F11,0x4FEE,0x7F9E,/* 0xD8-0xDF */ + 0x673D,0x55C5,0x9508,0x79C0,0x8896,0x7EE3,0x589F,0x620C,/* 0xE0-0xE7 */ + 0x9700,0x865A,0x5618,0x987B,0x5F90,0x8BB8,0x84C4,0x9157,/* 0xE8-0xEF */ +@@ -2832,7 +2834,7 @@ + 0x88B6,0x88B8,0x88B9,0x88BA,0x88BB,0x88BD,0x88BE,0x88BF,/* 0x48-0x4F */ + 0x88C0,0x88C3,0x88C4,0x88C7,0x88C8,0x88CA,0x88CB,0x88CC,/* 0x50-0x57 */ + 0x88CD,0x88CF,0x88D0,0x88D1,0x88D3,0x88D6,0x88D7,0x88DA,/* 0x58-0x5F */ +- 0x88DB,0x88DC,0x88DD,0x88DE,0x88E0,0xF9E8,0x88E6,0x88E7,/* 0x60-0x67 */ ++ 0x88DB,0x88DC,0x88DD,0x88DE,0x88E0,0x88E1,0x88E6,0x88E7,/* 0x60-0x67 */ + 0x88E9,0x88EA,0x88EB,0x88EC,0x88ED,0x88EE,0x88EF,0x88F2,/* 0x68-0x6F */ + 0x88F5,0x88F6,0x88F7,0x88FA,0x88FB,0x88FD,0x88FF,0x8900,/* 0x70-0x77 */ + 0x8901,0x8903,0x8904,0x8905,0x8906,0x8907,0x8908,0x0000,/* 0x78-0x7F */ +@@ -2846,7 +2848,7 @@ + 0x5BFB,0x9A6F,0x5DE1,0x6B89,0x6C5B,0x8BAD,0x8BAF,0x900A,/* 0xB0-0xB7 */ + 0x8FC5,0x538B,0x62BC,0x9E26,0x9E2D,0x5440,0x4E2B,0x82BD,/* 0xB8-0xBF */ + 0x7259,0x869C,0x5D16,0x8859,0x6DAF,0x96C5,0x54D1,0x4E9A,/* 0xC0-0xC7 */ +- 0x8BB6,0x7109,0xF99E,0x9609,0x70DF,0x6DF9,0x76D0,0x4E25,/* 0xC8-0xCF */ ++ 0x8BB6,0x7109,0x54BD,0x9609,0x70DF,0x6DF9,0x76D0,0x4E25,/* 0xC8-0xCF */ + 0x7814,0x8712,0x5CA9,0x5EF6,0x8A00,0x989C,0x960E,0x708E,/* 0xD0-0xD7 */ + 0x6CBF,0x5944,0x63A9,0x773C,0x884D,0x6F14,0x8273,0x5830,/* 0xD8-0xDF */ + 0x71D5,0x538C,0x781A,0x96C1,0x5501,0x5F66,0x7130,0x5BB4,/* 0xE0-0xE7 */ +@@ -2869,12 +2871,12 @@ + 0x894A,0x894B,0x894C,0x894D,0x894E,0x894F,0x8950,0x8951,/* 0x50-0x57 */ + 0x8952,0x8953,0x8954,0x8955,0x8956,0x8957,0x8958,0x8959,/* 0x58-0x5F */ + 0x895A,0x895B,0x895C,0x895D,0x8960,0x8961,0x8962,0x8963,/* 0x60-0x67 */ +- 0xF924,0x8965,0x8967,0x8968,0x8969,0x896A,0x896B,0x896C,/* 0x68-0x6F */ ++ 0x8964,0x8965,0x8967,0x8968,0x8969,0x896A,0x896B,0x896C,/* 0x68-0x6F */ + 0x896D,0x896E,0x896F,0x8970,0x8971,0x8972,0x8973,0x8974,/* 0x70-0x77 */ + 0x8975,0x8976,0x8977,0x8978,0x8979,0x897A,0x897C,0x0000,/* 0x78-0x7F */ + + 0x897D,0x897E,0x8980,0x8982,0x8984,0x8985,0x8987,0x8988,/* 0x80-0x87 */ +- 0x8989,0x898A,0xFA0A,0x898C,0x898D,0x898E,0x898F,0x8990,/* 0x88-0x8F */ ++ 0x8989,0x898A,0x898B,0x898C,0x898D,0x898E,0x898F,0x8990,/* 0x88-0x8F */ + 0x8991,0x8992,0x8993,0x8994,0x8995,0x8996,0x8997,0x8998,/* 0x90-0x97 */ + 0x8999,0x899A,0x899B,0x899C,0x899D,0x899E,0x899F,0x89A0,/* 0x98-0x9F */ + 0x89A1,0x6447,0x5C27,0x9065,0x7A91,0x8C23,0x59DA,0x54AC,/* 0xA0-0xA7 */ +@@ -2883,9 +2885,9 @@ + 0x814B,0x591C,0x6DB2,0x4E00,0x58F9,0x533B,0x63D6,0x94F1,/* 0xB8-0xBF */ + 0x4F9D,0x4F0A,0x8863,0x9890,0x5937,0x9057,0x79FB,0x4EEA,/* 0xC0-0xC7 */ + 0x80F0,0x7591,0x6C82,0x5B9C,0x59E8,0x5F5D,0x6905,0x8681,/* 0xC8-0xCF */ +- 0x501A,0x5DF2,0x4E59,0x77E3,0x4EE5,0x827A,0x6291,0xF9E0,/* 0xD0-0xD7 */ +- 0x9091,0x5C79,0x4EBF,0x5F79,0x81C6,0xFA25,0x8084,0x75AB,/* 0xD8-0xDF */ +- 0x4EA6,0x88D4,0x610F,0x6BC5,0x5FC6,0x4E49,0xFA17,0x6EA2,/* 0xE0-0xE7 */ ++ 0x501A,0x5DF2,0x4E59,0x77E3,0x4EE5,0x827A,0x6291,0x6613,/* 0xD0-0xD7 */ ++ 0x9091,0x5C79,0x4EBF,0x5F79,0x81C6,0x9038,0x8084,0x75AB,/* 0xD8-0xDF */ ++ 0x4EA6,0x88D4,0x610F,0x6BC5,0x5FC6,0x4E49,0x76CA,0x6EA2,/* 0xE0-0xE7 */ + 0x8BE3,0x8BAE,0x8C0A,0x8BD1,0x5F02,0x7FFC,0x7FCC,0x7ECE,/* 0xE8-0xEF */ + 0x8335,0x836B,0x56E0,0x6BB7,0x97F3,0x9634,0x59FB,0x541F,/* 0xF0-0xF7 */ + 0x94F6,0x6DEB,0x5BC5,0x996E,0x5C39,0x5F15,0x9690,0x0000,/* 0xF8-0xFF */ +@@ -2923,7 +2925,7 @@ + 0x8FC2,0x6DE4,0x4E8E,0x76C2,0x6986,0x865E,0x611A,0x8206,/* 0xD8-0xDF */ + 0x4F59,0x4FDE,0x903E,0x9C7C,0x6109,0x6E1D,0x6E14,0x9685,/* 0xE0-0xE7 */ + 0x4E88,0x5A31,0x96E8,0x4E0E,0x5C7F,0x79B9,0x5B87,0x8BED,/* 0xE8-0xEF */ +- 0xFA1E,0x7389,0x57DF,0x828B,0x90C1,0x5401,0x9047,0x55BB,/* 0xF0-0xF7 */ ++ 0x7FBD,0x7389,0x57DF,0x828B,0x90C1,0x5401,0x9047,0x55BB,/* 0xF0-0xF7 */ + 0x5CEA,0x5FA1,0x6108,0x6B32,0x72F1,0x80B2,0x8A89,0x0000,/* 0xF8-0xFF */ + }; + +@@ -2976,17 +2978,17 @@ + 0x8A8B,0x8A8C,0x8A8D,0x8A8E,0x8A8F,0x8A90,0x8A91,0x8A92,/* 0x48-0x4F */ + 0x8A94,0x8A95,0x8A96,0x8A97,0x8A98,0x8A99,0x8A9A,0x8A9B,/* 0x50-0x57 */ + 0x8A9C,0x8A9D,0x8A9E,0x8A9F,0x8AA0,0x8AA1,0x8AA2,0x8AA3,/* 0x58-0x5F */ +- 0x8AA4,0x8AA5,0x8AA6,0x8AA7,0x8AA8,0x8AA9,0xF9A1,0x8AAB,/* 0x60-0x67 */ ++ 0x8AA4,0x8AA5,0x8AA6,0x8AA7,0x8AA8,0x8AA9,0x8AAA,0x8AAB,/* 0x60-0x67 */ + 0x8AAC,0x8AAD,0x8AAE,0x8AAF,0x8AB0,0x8AB1,0x8AB2,0x8AB3,/* 0x68-0x6F */ + 0x8AB4,0x8AB5,0x8AB6,0x8AB7,0x8AB8,0x8AB9,0x8ABA,0x8ABB,/* 0x70-0x77 */ + 0x8ABC,0x8ABD,0x8ABE,0x8ABF,0x8AC0,0x8AC1,0x8AC2,0x0000,/* 0x78-0x7F */ + + 0x8AC3,0x8AC4,0x8AC5,0x8AC6,0x8AC7,0x8AC8,0x8AC9,0x8ACA,/* 0x80-0x87 */ +- 0x8ACB,0x8ACC,0x8ACD,0x8ACE,0x8ACF,0x8AD0,0x8AD1,0xF97D,/* 0x88-0x8F */ +- 0x8AD3,0x8AD4,0x8AD5,0xF941,0x8AD7,0x8AD8,0x8AD9,0x8ADA,/* 0x90-0x97 */ ++ 0x8ACB,0x8ACC,0x8ACD,0x8ACE,0x8ACF,0x8AD0,0x8AD1,0x8AD2,/* 0x88-0x8F */ ++ 0x8AD3,0x8AD4,0x8AD5,0x8AD6,0x8AD7,0x8AD8,0x8AD9,0x8ADA,/* 0x90-0x97 */ + 0x8ADB,0x8ADC,0x8ADD,0x8ADE,0x8ADF,0x8AE0,0x8AE1,0x8AE2,/* 0x98-0x9F */ + 0x8AE3,0x94E1,0x95F8,0x7728,0x6805,0x69A8,0x548B,0x4E4D,/* 0xA0-0xA7 */ +- 0x70B8,0x8BC8,0x6458,0x658B,0xFA04,0x7A84,0x503A,0x5BE8,/* 0xA8-0xAF */ ++ 0x70B8,0x8BC8,0x6458,0x658B,0x5B85,0x7A84,0x503A,0x5BE8,/* 0xA8-0xAF */ + 0x77BB,0x6BE1,0x8A79,0x7C98,0x6CBE,0x76CF,0x65A9,0x8F97,/* 0xB0-0xB7 */ + 0x5D2D,0x5C55,0x8638,0x6808,0x5360,0x6218,0x7AD9,0x6E5B,/* 0xB8-0xBF */ + 0x7EFD,0x6A1F,0x7AE0,0x5F70,0x6F33,0x5F20,0x638C,0x6DA8,/* 0xC0-0xC7 */ +@@ -3010,8 +3012,8 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x8AE4,0x8AE5,0x8AE6,0x8AE7,0x8AE8,0x8AE9,0x8AEA,0x8AEB,/* 0x40-0x47 */ + 0x8AEC,0x8AED,0x8AEE,0x8AEF,0x8AF0,0x8AF1,0x8AF2,0x8AF3,/* 0x48-0x4F */ +- 0x8AF4,0x8AF5,0x8AF6,0x8AF7,0xFA22,0x8AF9,0x8AFA,0x8AFB,/* 0x50-0x57 */ +- 0x8AFC,0x8AFD,0xF95D,0x8AFF,0x8B00,0x8B01,0x8B02,0x8B03,/* 0x58-0x5F */ ++ 0x8AF4,0x8AF5,0x8AF6,0x8AF7,0x8AF8,0x8AF9,0x8AFA,0x8AFB,/* 0x50-0x57 */ ++ 0x8AFC,0x8AFD,0x8AFE,0x8AFF,0x8B00,0x8B01,0x8B02,0x8B03,/* 0x58-0x5F */ + 0x8B04,0x8B05,0x8B06,0x8B08,0x8B09,0x8B0A,0x8B0B,0x8B0C,/* 0x60-0x67 */ + 0x8B0D,0x8B0E,0x8B0F,0x8B10,0x8B11,0x8B12,0x8B13,0x8B14,/* 0x68-0x6F */ + 0x8B15,0x8B16,0x8B17,0x8B18,0x8B19,0x8B1A,0x8B1B,0x8B1C,/* 0x70-0x77 */ +@@ -3026,7 +3028,7 @@ + 0x804C,0x76F4,0x690D,0x6B96,0x6267,0x503C,0x4F84,0x5740,/* 0xB0-0xB7 */ + 0x6307,0x6B62,0x8DBE,0x53EA,0x65E8,0x7EB8,0x5FD7,0x631A,/* 0xB8-0xBF */ + 0x63B7,0x81F3,0x81F4,0x7F6E,0x5E1C,0x5CD9,0x5236,0x667A,/* 0xC0-0xC7 */ +- 0x79E9,0x7A1A,0x8D28,0xF9FB,0x75D4,0x6EDE,0x6CBB,0x7A92,/* 0xC8-0xCF */ ++ 0x79E9,0x7A1A,0x8D28,0x7099,0x75D4,0x6EDE,0x6CBB,0x7A92,/* 0xC8-0xCF */ + 0x4E2D,0x76C5,0x5FE0,0x949F,0x8877,0x7EC8,0x79CD,0x80BF,/* 0xD0-0xD7 */ + 0x91CD,0x4EF2,0x4F17,0x821F,0x5468,0x5DDE,0x6D32,0x8BCC,/* 0xD8-0xDF */ + 0x7CA5,0x8F74,0x8098,0x5E1A,0x5492,0x76B1,0x5B99,0x663C,/* 0xE0-0xE7 */ +@@ -3046,12 +3048,12 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x8B46,0x8B47,0x8B48,0x8B49,0x8B4A,0x8B4B,0x8B4C,0x8B4D,/* 0x40-0x47 */ + 0x8B4E,0x8B4F,0x8B50,0x8B51,0x8B52,0x8B53,0x8B54,0x8B55,/* 0x48-0x4F */ +- 0x8B56,0x8B57,0xF9FC,0x8B59,0x8B5A,0x8B5B,0x8B5C,0x8B5D,/* 0x50-0x57 */ ++ 0x8B56,0x8B57,0x8B58,0x8B59,0x8B5A,0x8B5B,0x8B5C,0x8B5D,/* 0x50-0x57 */ + 0x8B5E,0x8B5F,0x8B60,0x8B61,0x8B62,0x8B63,0x8B64,0x8B65,/* 0x58-0x5F */ + 0x8B67,0x8B68,0x8B69,0x8B6A,0x8B6B,0x8B6D,0x8B6E,0x8B6F,/* 0x60-0x67 */ + 0x8B70,0x8B71,0x8B72,0x8B73,0x8B74,0x8B75,0x8B76,0x8B77,/* 0x68-0x6F */ + 0x8B78,0x8B79,0x8B7A,0x8B7B,0x8B7C,0x8B7D,0x8B7E,0x8B7F,/* 0x70-0x77 */ +- 0xF95A,0x8B81,0x8B82,0x8B83,0x8B84,0x8B85,0x8B86,0x0000,/* 0x78-0x7F */ ++ 0x8B80,0x8B81,0x8B82,0x8B83,0x8B84,0x8B85,0x8B86,0x0000,/* 0x78-0x7F */ + + 0x8B87,0x8B88,0x8B89,0x8B8A,0x8B8B,0x8B8C,0x8B8D,0x8B8E,/* 0x80-0x87 */ + 0x8B8F,0x8B90,0x8B91,0x8B92,0x8B93,0x8B94,0x8B95,0x8B96,/* 0x88-0x8F */ +@@ -3081,11 +3083,11 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x8C38,0x8C39,0x8C3A,0x8C3B,0x8C3C,0x8C3D,0x8C3E,0x8C3F,/* 0x40-0x47 */ +- 0x8C40,0x8C42,0x8C43,0x8C44,0x8C45,0xF900,0x8C4A,0x8C4B,/* 0x48-0x4F */ ++ 0x8C40,0x8C42,0x8C43,0x8C44,0x8C45,0x8C48,0x8C4A,0x8C4B,/* 0x48-0x4F */ + 0x8C4D,0x8C4E,0x8C4F,0x8C50,0x8C51,0x8C52,0x8C53,0x8C54,/* 0x50-0x57 */ + 0x8C56,0x8C57,0x8C58,0x8C59,0x8C5B,0x8C5C,0x8C5D,0x8C5E,/* 0x58-0x5F */ + 0x8C5F,0x8C60,0x8C63,0x8C64,0x8C65,0x8C66,0x8C67,0x8C68,/* 0x60-0x67 */ +- 0x8C69,0xFA16,0x8C6D,0x8C6E,0x8C6F,0x8C70,0x8C71,0x8C72,/* 0x68-0x6F */ ++ 0x8C69,0x8C6C,0x8C6D,0x8C6E,0x8C6F,0x8C70,0x8C71,0x8C72,/* 0x68-0x6F */ + 0x8C74,0x8C75,0x8C76,0x8C77,0x8C7B,0x8C7C,0x8C7D,0x8C7E,/* 0x70-0x77 */ + 0x8C7F,0x8C80,0x8C81,0x8C83,0x8C84,0x8C86,0x8C87,0x0000,/* 0x78-0x7F */ + +@@ -3118,8 +3120,8 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x8CAE,0x8CAF,0x8CB0,0x8CB1,0x8CB2,0x8CB3,0x8CB4,0x8CB5,/* 0x40-0x47 */ + 0x8CB6,0x8CB7,0x8CB8,0x8CB9,0x8CBA,0x8CBB,0x8CBC,0x8CBD,/* 0x48-0x4F */ +- 0x8CBE,0x8CBF,0x8CC0,0x8CC1,0xF948,0x8CC3,0x8CC4,0x8CC5,/* 0x50-0x57 */ +- 0x8CC6,0x8CC7,0xF903,0x8CC9,0x8CCA,0x8CCB,0x8CCC,0x8CCD,/* 0x58-0x5F */ ++ 0x8CBE,0x8CBF,0x8CC0,0x8CC1,0x8CC2,0x8CC3,0x8CC4,0x8CC5,/* 0x50-0x57 */ ++ 0x8CC6,0x8CC7,0x8CC8,0x8CC9,0x8CCA,0x8CCB,0x8CCC,0x8CCD,/* 0x58-0x5F */ + 0x8CCE,0x8CCF,0x8CD0,0x8CD1,0x8CD2,0x8CD3,0x8CD4,0x8CD5,/* 0x60-0x67 */ + 0x8CD6,0x8CD7,0x8CD8,0x8CD9,0x8CDA,0x8CDB,0x8CDC,0x8CDD,/* 0x68-0x6F */ + 0x8CDE,0x8CDF,0x8CE0,0x8CE1,0x8CE2,0x8CE3,0x8CE4,0x8CE5,/* 0x70-0x77 */ +@@ -3233,7 +3235,7 @@ + 0x8EB3,0x8EB4,0x8EB5,0x8EB6,0x8EB7,0x8EB8,0x8EB9,0x8EBB,/* 0x70-0x77 */ + 0x8EBC,0x8EBD,0x8EBE,0x8EBF,0x8EC0,0x8EC1,0x8EC2,0x0000,/* 0x78-0x7F */ + +- 0x8EC3,0x8EC4,0x8EC5,0x8EC6,0x8EC7,0x8EC8,0x8EC9,0xF902,/* 0x80-0x87 */ ++ 0x8EC3,0x8EC4,0x8EC5,0x8EC6,0x8EC7,0x8EC8,0x8EC9,0x8ECA,/* 0x80-0x87 */ + 0x8ECB,0x8ECC,0x8ECD,0x8ECF,0x8ED0,0x8ED1,0x8ED2,0x8ED3,/* 0x88-0x8F */ + 0x8ED4,0x8ED5,0x8ED6,0x8ED7,0x8ED8,0x8ED9,0x8EDA,0x8EDB,/* 0x90-0x97 */ + 0x8EDC,0x8EDD,0x8EDE,0x8EDF,0x8EE0,0x8EE1,0x8EE2,0x8EE3,/* 0x98-0x9F */ +@@ -3269,9 +3271,9 @@ + 0x8F15,0x8F16,0x8F17,0x8F18,0x8F19,0x8F1A,0x8F1B,0x8F1C,/* 0x70-0x77 */ + 0x8F1D,0x8F1E,0x8F1F,0x8F20,0x8F21,0x8F22,0x8F23,0x0000,/* 0x78-0x7F */ + +- 0x8F24,0x8F25,0xF998,0x8F27,0x8F28,0x8F29,0xF9D7,0x8F2B,/* 0x80-0x87 */ ++ 0x8F24,0x8F25,0x8F26,0x8F27,0x8F28,0x8F29,0x8F2A,0x8F2B,/* 0x80-0x87 */ + 0x8F2C,0x8F2D,0x8F2E,0x8F2F,0x8F30,0x8F31,0x8F32,0x8F33,/* 0x88-0x8F */ +- 0x8F34,0x8F35,0x8F36,0x8F37,0x8F38,0x8F39,0x8F3A,0xFA07,/* 0x90-0x97 */ ++ 0x8F34,0x8F35,0x8F36,0x8F37,0x8F38,0x8F39,0x8F3A,0x8F3B,/* 0x90-0x97 */ + 0x8F3C,0x8F3D,0x8F3E,0x8F3F,0x8F40,0x8F41,0x8F42,0x8F43,/* 0x98-0x9F */ + 0x8F44,0x8368,0x831B,0x8369,0x836C,0x836A,0x836D,0x836E,/* 0xA0-0xA7 */ + 0x83B0,0x8378,0x83B3,0x83B4,0x83A0,0x83AA,0x8393,0x839C,/* 0xA8-0xAF */ +@@ -3299,7 +3301,7 @@ + 0x8F45,0x8F46,0x8F47,0x8F48,0x8F49,0x8F4A,0x8F4B,0x8F4C,/* 0x40-0x47 */ + 0x8F4D,0x8F4E,0x8F4F,0x8F50,0x8F51,0x8F52,0x8F53,0x8F54,/* 0x48-0x4F */ + 0x8F55,0x8F56,0x8F57,0x8F58,0x8F59,0x8F5A,0x8F5B,0x8F5C,/* 0x50-0x57 */ +- 0x8F5D,0x8F5E,0x8F5F,0x8F60,0x8F61,0xF98D,0x8F63,0x8F64,/* 0x58-0x5F */ ++ 0x8F5D,0x8F5E,0x8F5F,0x8F60,0x8F61,0x8F62,0x8F63,0x8F64,/* 0x58-0x5F */ + 0x8F65,0x8F6A,0x8F80,0x8F8C,0x8F92,0x8F9D,0x8FA0,0x8FA1,/* 0x60-0x67 */ + 0x8FA2,0x8FA4,0x8FA5,0x8FA6,0x8FA7,0x8FAA,0x8FAC,0x8FAD,/* 0x68-0x6F */ + 0x8FAE,0x8FAF,0x8FB2,0x8FB3,0x8FB4,0x8FB5,0x8FB7,0x8FB8,/* 0x70-0x77 */ +@@ -3309,7 +3311,7 @@ + 0x8FD7,0x8FDA,0x8FE0,0x8FE1,0x8FE3,0x8FE7,0x8FEC,0x8FEF,/* 0x88-0x8F */ + 0x8FF1,0x8FF2,0x8FF4,0x8FF5,0x8FF6,0x8FFA,0x8FFB,0x8FFC,/* 0x90-0x97 */ + 0x8FFE,0x8FFF,0x9007,0x9008,0x900C,0x900E,0x9013,0x9015,/* 0x98-0x9F */ +- 0x9018,0x8556,0x853B,0x84FF,0xF9C2,0x8559,0x8548,0x8568,/* 0xA0-0xA7 */ ++ 0x9018,0x8556,0x853B,0x84FF,0x84FC,0x8559,0x8548,0x8568,/* 0xA0-0xA7 */ + 0x8564,0x855E,0x857A,0x77A2,0x8543,0x8572,0x857B,0x85A4,/* 0xA8-0xAF */ + 0x85A8,0x8587,0x858F,0x8579,0x85AE,0x859C,0x8585,0x85B9,/* 0xB0-0xB7 */ + 0x85B7,0x85B0,0x85D3,0x85C1,0x85DC,0x85FF,0x8627,0x8605,/* 0xB8-0xBF */ +@@ -3332,17 +3334,17 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x9019,0x901C,0xF99A,0x9024,0x9025,0x9027,0x9028,0x9029,/* 0x40-0x47 */ ++ 0x9019,0x901C,0x9023,0x9024,0x9025,0x9027,0x9028,0x9029,/* 0x40-0x47 */ + 0x902A,0x902B,0x902C,0x9030,0x9031,0x9032,0x9033,0x9034,/* 0x48-0x4F */ + 0x9037,0x9039,0x903A,0x903D,0x903F,0x9040,0x9043,0x9045,/* 0x50-0x57 */ + 0x9046,0x9048,0x9049,0x904A,0x904B,0x904C,0x904E,0x9054,/* 0x58-0x5F */ + 0x9055,0x9056,0x9059,0x905A,0x905C,0x905D,0x905E,0x905F,/* 0x60-0x67 */ + 0x9060,0x9061,0x9064,0x9066,0x9067,0x9069,0x906A,0x906B,/* 0x68-0x6F */ + 0x906C,0x906F,0x9070,0x9071,0x9072,0x9073,0x9076,0x9077,/* 0x70-0x77 */ +- 0x9078,0x9079,0x907A,0x907B,0xF9C3,0x907E,0x9081,0x0000,/* 0x78-0x7F */ ++ 0x9078,0x9079,0x907A,0x907B,0x907C,0x907E,0x9081,0x0000,/* 0x78-0x7F */ + + 0x9084,0x9085,0x9086,0x9087,0x9089,0x908A,0x908C,0x908D,/* 0x80-0x87 */ +- 0x908E,0xF913,0x9090,0x9092,0x9094,0x9096,0x9098,0x909A,/* 0x88-0x8F */ ++ 0x908E,0x908F,0x9090,0x9092,0x9094,0x9096,0x9098,0x909A,/* 0x88-0x8F */ + 0x909C,0x909E,0x909F,0x90A0,0x90A4,0x90A5,0x90A7,0x90A8,/* 0x90-0x97 */ + 0x90A9,0x90AB,0x90AD,0x90B2,0x90B7,0x90BC,0x90BD,0x90BF,/* 0x98-0x9F */ + 0x90C0,0x647A,0x64B7,0x64B8,0x6499,0x64BA,0x64C0,0x64D0,/* 0xA0-0xA7 */ +@@ -3391,7 +3393,7 @@ + 0x562D,0x5658,0x5639,0x5657,0x562C,0x564D,0x5662,0x5659,/* 0xD8-0xDF */ + 0x565C,0x564C,0x5654,0x5686,0x5664,0x5671,0x566B,0x567B,/* 0xE0-0xE7 */ + 0x567C,0x5685,0x5693,0x56AF,0x56D4,0x56D7,0x56DD,0x56E1,/* 0xE8-0xEF */ +- 0x56F5,0x56EB,0xF9A9,0x56FF,0x5704,0x570A,0x5709,0x571C,/* 0xF0-0xF7 */ ++ 0x56F5,0x56EB,0x56F9,0x56FF,0x5704,0x570A,0x5709,0x571C,/* 0xF0-0xF7 */ + 0x5E0F,0x5E19,0x5E14,0x5E11,0x5E31,0x5E3B,0x5E3C,0x0000,/* 0xF8-0xFF */ + }; + +@@ -3450,7 +3452,7 @@ + 0x921E,0x921F,0x9220,0x9221,0x9222,0x9223,0x9224,0x0000,/* 0x78-0x7F */ + + 0x9225,0x9226,0x9227,0x9228,0x9229,0x922A,0x922B,0x922C,/* 0x80-0x87 */ +- 0x922D,0x922E,0x922F,0x9230,0x9231,0x9232,0x9233,0xF9B1,/* 0x88-0x8F */ ++ 0x922D,0x922E,0x922F,0x9230,0x9231,0x9232,0x9233,0x9234,/* 0x88-0x8F */ + 0x9235,0x9236,0x9237,0x9238,0x9239,0x923A,0x923B,0x923C,/* 0x90-0x97 */ + 0x923D,0x923E,0x923F,0x9240,0x9241,0x9242,0x9243,0x9244,/* 0x98-0x9F */ + 0x9245,0x72FB,0x7317,0x7313,0x7321,0x730A,0x731E,0x731D,/* 0xA0-0xA7 */ +@@ -3524,7 +3526,7 @@ + 0x92E9,0x92EA,0x92EB,0x92EC,0x92ED,0x92EE,0x92EF,0x92F0,/* 0x80-0x87 */ + 0x92F1,0x92F2,0x92F3,0x92F4,0x92F5,0x92F6,0x92F7,0x92F8,/* 0x88-0x8F */ + 0x92F9,0x92FA,0x92FB,0x92FC,0x92FD,0x92FE,0x92FF,0x9300,/* 0x90-0x97 */ +- 0x9301,0x9302,0x9303,0xF93F,0x9305,0x9306,0x9307,0x9308,/* 0x98-0x9F */ ++ 0x9301,0x9302,0x9303,0x9304,0x9305,0x9306,0x9307,0x9308,/* 0x98-0x9F */ + 0x9309,0x6D39,0x6D27,0x6D0C,0x6D43,0x6D48,0x6D07,0x6D04,/* 0xA0-0xA7 */ + 0x6D19,0x6D0E,0x6D2B,0x6D4D,0x6D2E,0x6D35,0x6D1A,0x6D4F,/* 0xA8-0xAF */ + 0x6D52,0x6D54,0x6D33,0x6D91,0x6D6F,0x6D9E,0x6DA0,0x6D5E,/* 0xB0-0xB7 */ +@@ -3557,14 +3559,14 @@ + 0x933A,0x933B,0x933C,0x933D,0x933F,0x9340,0x9341,0x9342,/* 0x70-0x77 */ + 0x9343,0x9344,0x9345,0x9346,0x9347,0x9348,0x9349,0x0000,/* 0x78-0x7F */ + +- 0xF99B,0x934B,0x934C,0x934D,0x934E,0x934F,0x9350,0x9351,/* 0x80-0x87 */ ++ 0x934A,0x934B,0x934C,0x934D,0x934E,0x934F,0x9350,0x9351,/* 0x80-0x87 */ + 0x9352,0x9353,0x9354,0x9355,0x9356,0x9357,0x9358,0x9359,/* 0x88-0x8F */ + 0x935A,0x935B,0x935C,0x935D,0x935E,0x935F,0x9360,0x9361,/* 0x90-0x97 */ + 0x9362,0x9363,0x9364,0x9365,0x9366,0x9367,0x9368,0x9369,/* 0x98-0x9F */ + 0x936B,0x6FC9,0x6FA7,0x6FB9,0x6FB6,0x6FC2,0x6FE1,0x6FEE,/* 0xA0-0xA7 */ + 0x6FDE,0x6FE0,0x6FEF,0x701A,0x7023,0x701B,0x7039,0x7035,/* 0xA8-0xAF */ + 0x704F,0x705E,0x5B80,0x5B84,0x5B95,0x5B93,0x5BA5,0x5BB8,/* 0xB0-0xB7 */ +- 0x752F,0x9A9E,0x6434,0x5BE4,0xF9BC,0x8930,0x5BF0,0x8E47,/* 0xB8-0xBF */ ++ 0x752F,0x9A9E,0x6434,0x5BE4,0x5BEE,0x8930,0x5BF0,0x8E47,/* 0xB8-0xBF */ + 0x8B07,0x8FB6,0x8FD3,0x8FD5,0x8FE5,0x8FEE,0x8FE4,0x8FE9,/* 0xC0-0xC7 */ + 0x8FE6,0x8FF3,0x8FE8,0x9005,0x9004,0x900B,0x9026,0x9011,/* 0xC8-0xCF */ + 0x900D,0x9016,0x9021,0x9035,0x9036,0x902D,0x902F,0x9044,/* 0xD0-0xD7 */ +@@ -3643,7 +3645,7 @@ + 0x7F32,0x7F33,0x7F35,0x5E7A,0x757F,0x5DDB,0x753E,0x9095,/* 0xD8-0xDF */ + 0x738E,0x7391,0x73AE,0x73A2,0x739F,0x73CF,0x73C2,0x73D1,/* 0xE0-0xE7 */ + 0x73B7,0x73B3,0x73C0,0x73C9,0x73C8,0x73E5,0x73D9,0x987C,/* 0xE8-0xEF */ +- 0x740A,0x73E9,0x73E7,0xF917,0x73BA,0x73F2,0x740F,0x742A,/* 0xF0-0xF7 */ ++ 0x740A,0x73E9,0x73E7,0x73DE,0x73BA,0x73F2,0x740F,0x742A,/* 0xF0-0xF7 */ + 0x745B,0x7426,0x7425,0x7428,0x7430,0x742E,0x742C,0x0000,/* 0xF8-0xFF */ + }; + +@@ -3701,7 +3703,7 @@ + 0x959C,0x959D,0x959E,0x959F,0x95A0,0x95A1,0x95A2,0x95A3,/* 0x70-0x77 */ + 0x95A4,0x95A5,0x95A6,0x95A7,0x95A8,0x95A9,0x95AA,0x0000,/* 0x78-0x7F */ + +- 0x95AB,0x95AC,0xF986,0x95AE,0x95AF,0x95B0,0x95B1,0x95B2,/* 0x80-0x87 */ ++ 0x95AB,0x95AC,0x95AD,0x95AE,0x95AF,0x95B0,0x95B1,0x95B2,/* 0x80-0x87 */ + 0x95B3,0x95B4,0x95B5,0x95B6,0x95B7,0x95B8,0x95B9,0x95BA,/* 0x88-0x8F */ + 0x95BB,0x95BC,0x95BD,0x95BE,0x95BF,0x95C0,0x95C1,0x95C2,/* 0x90-0x97 */ + 0x95C3,0x95C4,0x95C5,0x95C6,0x95C7,0x95C8,0x95C9,0x95CA,/* 0x98-0x9F */ +@@ -3739,7 +3741,7 @@ + + 0x9658,0x9659,0x965A,0x965C,0x965D,0x965E,0x9660,0x9663,/* 0x80-0x87 */ + 0x9665,0x9666,0x966B,0x966D,0x966E,0x966F,0x9670,0x9671,/* 0x88-0x8F */ +- 0x9673,0xF9D3,0x9679,0x967A,0x967B,0x967C,0x967D,0x967E,/* 0x90-0x97 */ ++ 0x9673,0x9678,0x9679,0x967A,0x967B,0x967C,0x967D,0x967E,/* 0x90-0x97 */ + 0x967F,0x9680,0x9681,0x9682,0x9683,0x9684,0x9687,0x9689,/* 0x98-0x9F */ + 0x968A,0x8F8D,0x8F8E,0x8F8F,0x8F98,0x8F9A,0x8ECE,0x620B,/* 0xA0-0xA7 */ + 0x6217,0x621B,0x621F,0x6222,0x6221,0x6225,0x6224,0x622C,/* 0xA8-0xAF */ +@@ -3768,10 +3770,10 @@ + 0x969B,0x969D,0x969E,0x969F,0x96A0,0x96A1,0x96A2,0x96A3,/* 0x48-0x4F */ + 0x96A4,0x96A5,0x96A6,0x96A8,0x96A9,0x96AA,0x96AB,0x96AC,/* 0x50-0x57 */ + 0x96AD,0x96AE,0x96AF,0x96B1,0x96B2,0x96B4,0x96B5,0x96B7,/* 0x58-0x5F */ +- 0xF9B8,0x96BA,0x96BB,0x96BF,0x96C2,0x96C3,0x96C8,0x96CA,/* 0x60-0x67 */ ++ 0x96B8,0x96BA,0x96BB,0x96BF,0x96C2,0x96C3,0x96C8,0x96CA,/* 0x60-0x67 */ + 0x96CB,0x96D0,0x96D1,0x96D3,0x96D4,0x96D6,0x96D7,0x96D8,/* 0x68-0x6F */ + 0x96D9,0x96DA,0x96DB,0x96DC,0x96DD,0x96DE,0x96DF,0x96E1,/* 0x70-0x77 */ +- 0xF9EA,0x96E3,0x96E4,0x96E5,0x96E6,0x96E7,0x96EB,0x0000,/* 0x78-0x7F */ ++ 0x96E2,0x96E3,0x96E4,0x96E5,0x96E6,0x96E7,0x96EB,0x0000,/* 0x78-0x7F */ + + 0x96EC,0x96ED,0x96EE,0x96F0,0x96F1,0x96F2,0x96F4,0x96F5,/* 0x80-0x87 */ + 0x96F8,0x96FA,0x96FB,0x96FC,0x96FD,0x96FF,0x9702,0x9703,/* 0x88-0x8F */ +@@ -3804,7 +3806,7 @@ + 0x9729,0x972B,0x972C,0x972E,0x972F,0x9731,0x9733,0x9734,/* 0x48-0x4F */ + 0x9735,0x9736,0x9737,0x973A,0x973B,0x973C,0x973D,0x973F,/* 0x50-0x57 */ + 0x9740,0x9741,0x9742,0x9743,0x9744,0x9745,0x9746,0x9747,/* 0x58-0x5F */ +- 0xF9B3,0x9749,0x974A,0x974B,0x974C,0x974D,0x974E,0x974F,/* 0x60-0x67 */ ++ 0x9748,0x9749,0x974A,0x974B,0x974C,0x974D,0x974E,0x974F,/* 0x60-0x67 */ + 0x9750,0x9751,0x9754,0x9755,0x9757,0x9758,0x975A,0x975C,/* 0x68-0x6F */ + 0x975D,0x975F,0x9763,0x9764,0x9766,0x9767,0x9768,0x976A,/* 0x70-0x77 */ + 0x976B,0x976C,0x976D,0x976E,0x976F,0x9770,0x9771,0x0000,/* 0x78-0x7F */ +@@ -3873,7 +3875,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x980F,0x9810,0x9811,0x9812,0x9813,0x9814,0x9815,0x9816,/* 0x40-0x47 */ +- 0x9817,0xF9B4,0x9819,0x981A,0x981B,0x981C,0x981D,0x981E,/* 0x48-0x4F */ ++ 0x9817,0x9818,0x9819,0x981A,0x981B,0x981C,0x981D,0x981E,/* 0x48-0x4F */ + 0x981F,0x9820,0x9821,0x9822,0x9823,0x9824,0x9825,0x9826,/* 0x50-0x57 */ + 0x9827,0x9828,0x9829,0x982A,0x982B,0x982C,0x982D,0x982E,/* 0x58-0x5F */ + 0x982F,0x9830,0x9831,0x9832,0x9833,0x9834,0x9835,0x9836,/* 0x60-0x67 */ +@@ -3883,12 +3885,12 @@ + + 0x984E,0x984F,0x9850,0x9851,0x9852,0x9853,0x9854,0x9855,/* 0x80-0x87 */ + 0x9856,0x9857,0x9858,0x9859,0x985A,0x985B,0x985C,0x985D,/* 0x88-0x8F */ +- 0xF9D0,0x985F,0x9860,0x9861,0x9862,0x9863,0x9864,0x9865,/* 0x90-0x97 */ ++ 0x985E,0x985F,0x9860,0x9861,0x9862,0x9863,0x9864,0x9865,/* 0x90-0x97 */ + 0x9866,0x9867,0x9868,0x9869,0x986A,0x986B,0x986C,0x986D,/* 0x98-0x9F */ + 0x986E,0x7762,0x7765,0x777F,0x778D,0x777D,0x7780,0x778C,/* 0xA0-0xA7 */ + 0x7791,0x779F,0x77A0,0x77B0,0x77B5,0x77BD,0x753A,0x7540,/* 0xA8-0xAF */ + 0x754E,0x754B,0x7548,0x755B,0x7572,0x7579,0x7583,0x7F58,/* 0xB0-0xB7 */ +- 0x7F61,0x7F5F,0x8A48,0x7F68,0x7F74,0x7F71,0xF9E6,0x7F81,/* 0xB8-0xBF */ ++ 0x7F61,0x7F5F,0x8A48,0x7F68,0x7F74,0x7F71,0x7F79,0x7F81,/* 0xB8-0xBF */ + 0x7F7E,0x76CD,0x76E5,0x8832,0x9485,0x9486,0x9487,0x948B,/* 0xC0-0xC7 */ + 0x948A,0x948C,0x948D,0x948F,0x9490,0x9494,0x9497,0x9495,/* 0xC8-0xCF */ + 0x949A,0x949B,0x949C,0x94A3,0x94A4,0x94AB,0x94AA,0x94AD,/* 0xD0-0xD7 */ +@@ -3918,8 +3920,8 @@ + 0x98DC,0x98DD,0x98E0,0x98E1,0x98E2,0x98E3,0x98E4,0x0000,/* 0x78-0x7F */ + + 0x98E5,0x98E6,0x98E9,0x98EA,0x98EB,0x98EC,0x98ED,0x98EE,/* 0x80-0x87 */ +- 0xFA2A,0x98F0,0x98F1,0x98F2,0x98F3,0x98F4,0x98F5,0x98F6,/* 0x88-0x8F */ +- 0x98F7,0x98F8,0x98F9,0x98FA,0x98FB,0xFA2B,0x98FD,0x98FE,/* 0x90-0x97 */ ++ 0x98EF,0x98F0,0x98F1,0x98F2,0x98F3,0x98F4,0x98F5,0x98F6,/* 0x88-0x8F */ ++ 0x98F7,0x98F8,0x98F9,0x98FA,0x98FB,0x98FC,0x98FD,0x98FE,/* 0x90-0x97 */ + 0x98FF,0x9900,0x9901,0x9902,0x9903,0x9904,0x9905,0x9906,/* 0x98-0x9F */ + 0x9907,0x94E9,0x94EB,0x94EE,0x94EF,0x94F3,0x94F4,0x94F5,/* 0xA0-0xA7 */ + 0x94F7,0x94F9,0x94FC,0x94FD,0x94FF,0x9503,0x9502,0x9506,/* 0xA8-0xAF */ +@@ -3947,7 +3949,7 @@ + 0x9908,0x9909,0x990A,0x990B,0x990C,0x990E,0x990F,0x9911,/* 0x40-0x47 */ + 0x9912,0x9913,0x9914,0x9915,0x9916,0x9917,0x9918,0x9919,/* 0x48-0x4F */ + 0x991A,0x991B,0x991C,0x991D,0x991E,0x991F,0x9920,0x9921,/* 0x50-0x57 */ +- 0x9922,0x9923,0x9924,0x9925,0x9926,0x9927,0xFA2C,0x9929,/* 0x58-0x5F */ ++ 0x9922,0x9923,0x9924,0x9925,0x9926,0x9927,0x9928,0x9929,/* 0x58-0x5F */ + 0x992A,0x992B,0x992C,0x992D,0x992F,0x9930,0x9931,0x9932,/* 0x60-0x67 */ + 0x9933,0x9934,0x9935,0x9936,0x9937,0x9938,0x9939,0x993A,/* 0x68-0x6F */ + 0x993B,0x993C,0x993D,0x993E,0x993F,0x9940,0x9941,0x9942,/* 0x70-0x77 */ +@@ -3992,7 +3994,7 @@ + 0x99D9,0x99DA,0x99DB,0x99DC,0x99DD,0x99DE,0x99DF,0x99E0,/* 0x80-0x87 */ + 0x99E1,0x99E2,0x99E3,0x99E4,0x99E5,0x99E6,0x99E7,0x99E8,/* 0x88-0x8F */ + 0x99E9,0x99EA,0x99EB,0x99EC,0x99ED,0x99EE,0x99EF,0x99F0,/* 0x90-0x97 */ +- 0xF91A,0x99F2,0x99F3,0x99F4,0x99F5,0x99F6,0x99F7,0x99F8,/* 0x98-0x9F */ ++ 0x99F1,0x99F2,0x99F3,0x99F4,0x99F5,0x99F6,0x99F7,0x99F8,/* 0x98-0x9F */ + 0x99F9,0x761B,0x763C,0x7622,0x7620,0x7640,0x762D,0x7630,/* 0xA0-0xA7 */ + 0x763F,0x7635,0x7643,0x763E,0x7633,0x764D,0x765E,0x7654,/* 0xA8-0xAF */ + 0x765C,0x7656,0x766B,0x766F,0x7FCA,0x7AE6,0x7A78,0x7A79,/* 0xB0-0xB7 */ +@@ -4003,7 +4005,7 @@ + 0x8919,0x8913,0x891B,0x890A,0x8934,0x892B,0x8936,0x8941,/* 0xD8-0xDF */ + 0x8966,0x897B,0x758B,0x80E5,0x76B2,0x76B4,0x77DC,0x8012,/* 0xE0-0xE7 */ + 0x8014,0x8016,0x801C,0x8020,0x8022,0x8025,0x8026,0x8027,/* 0xE8-0xEF */ +- 0x8029,0x8028,0x8031,0x800B,0x8035,0x8043,0xF9B0,0x804D,/* 0xF0-0xF7 */ ++ 0x8029,0x8028,0x8031,0x800B,0x8035,0x8043,0x8046,0x804D,/* 0xF0-0xF7 */ + 0x8052,0x8069,0x8071,0x8983,0x9878,0x9880,0x9883,0x0000,/* 0xF8-0xFF */ + }; + +@@ -4054,7 +4056,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x9A5A,0x9A5B,0x9A5C,0x9A5D,0x9A5E,0x9A5F,0x9A60,0x9A61,/* 0x40-0x47 */ + 0x9A62,0x9A63,0x9A64,0x9A65,0x9A66,0x9A67,0x9A68,0x9A69,/* 0x48-0x4F */ +- 0xF987,0x9A6B,0x9A72,0x9A83,0x9A89,0x9A8D,0x9A8E,0x9A94,/* 0x50-0x57 */ ++ 0x9A6A,0x9A6B,0x9A72,0x9A83,0x9A89,0x9A8D,0x9A8E,0x9A94,/* 0x50-0x57 */ + 0x9A95,0x9A99,0x9AA6,0x9AA9,0x9AAA,0x9AAB,0x9AAC,0x9AAD,/* 0x58-0x5F */ + 0x9AAE,0x9AAF,0x9AB2,0x9AB3,0x9AB4,0x9AB5,0x9AB9,0x9ABB,/* 0x60-0x67 */ + 0x9ABD,0x9ABE,0x9ABF,0x9AC3,0x9AC4,0x9AC6,0x9AC7,0x9AC8,/* 0x68-0x6F */ +@@ -4071,7 +4073,7 @@ + 0x87FE,0x880A,0x881B,0x8821,0x8839,0x883C,0x7F36,0x7F42,/* 0xB8-0xBF */ + 0x7F44,0x7F45,0x8210,0x7AFA,0x7AFD,0x7B08,0x7B03,0x7B04,/* 0xC0-0xC7 */ + 0x7B15,0x7B0A,0x7B2B,0x7B0F,0x7B47,0x7B38,0x7B2A,0x7B19,/* 0xC8-0xCF */ +- 0x7B2E,0x7B31,0xF9F8,0x7B25,0x7B24,0x7B33,0x7B3E,0x7B1E,/* 0xD0-0xD7 */ ++ 0x7B2E,0x7B31,0x7B20,0x7B25,0x7B24,0x7B33,0x7B3E,0x7B1E,/* 0xD0-0xD7 */ + 0x7B58,0x7B5A,0x7B45,0x7B75,0x7B4C,0x7B5D,0x7B60,0x7B6E,/* 0xD8-0xDF */ + 0x7B7B,0x7B62,0x7B72,0x7B71,0x7B90,0x7BA6,0x7BA7,0x7BB8,/* 0xE0-0xE7 */ + 0x7BAC,0x7B9D,0x7BA8,0x7B85,0x7BAA,0x7B9C,0x7BA2,0x7BAB,/* 0xE8-0xEF */ +@@ -4099,7 +4101,7 @@ + + 0x9B5B,0x9B5C,0x9B5D,0x9B5E,0x9B5F,0x9B60,0x9B61,0x9B62,/* 0x80-0x87 */ + 0x9B63,0x9B64,0x9B65,0x9B66,0x9B67,0x9B68,0x9B69,0x9B6A,/* 0x88-0x8F */ +- 0x9B6B,0x9B6C,0x9B6D,0x9B6E,0xF939,0x9B70,0x9B71,0x9B72,/* 0x90-0x97 */ ++ 0x9B6B,0x9B6C,0x9B6D,0x9B6E,0x9B6F,0x9B70,0x9B71,0x9B72,/* 0x90-0x97 */ + 0x9B73,0x9B74,0x9B75,0x9B76,0x9B77,0x9B78,0x9B79,0x9B7A,/* 0x98-0x9F */ + 0x9B7B,0x7C1F,0x7C2A,0x7C26,0x7C38,0x7C41,0x7C40,0x81FE,/* 0xA0-0xA7 */ + 0x8201,0x8202,0x8204,0x81EC,0x8844,0x8221,0x8222,0x8223,/* 0xA8-0xAF */ +@@ -4139,7 +4141,7 @@ + 0x9BD3,0x9BD4,0x9BD5,0x9BD6,0x9BD7,0x9BD8,0x9BD9,0x9BDA,/* 0x98-0x9F */ + 0x9BDB,0x9162,0x9161,0x9170,0x9169,0x916F,0x917D,0x917E,/* 0xA0-0xA7 */ + 0x9172,0x9174,0x9179,0x918C,0x9185,0x9190,0x918D,0x9191,/* 0xA8-0xAF */ +- 0x91A2,0x91A3,0x91AA,0x91AD,0x91AE,0x91AF,0x91B5,0xF9B7,/* 0xB0-0xB7 */ ++ 0x91A2,0x91A3,0x91AA,0x91AD,0x91AE,0x91AF,0x91B5,0x91B4,/* 0xB0-0xB7 */ + 0x91BA,0x8C55,0x9E7E,0x8DB8,0x8DEB,0x8E05,0x8E59,0x8E69,/* 0xB8-0xBF */ + 0x8DB5,0x8DBF,0x8DBC,0x8DBA,0x8DC4,0x8DD6,0x8DD7,0x8DDA,/* 0xC0-0xC7 */ + 0x8DDE,0x8DCE,0x8DCF,0x8DDB,0x8DC6,0x8DEC,0x8DF7,0x8DF8,/* 0xC8-0xCF */ +@@ -4199,7 +4201,7 @@ + 0x9C3C,0x9C3D,0x9C3E,0x9C3F,0x9C40,0x9C41,0x9C42,0x9C43,/* 0x40-0x47 */ + 0x9C44,0x9C45,0x9C46,0x9C47,0x9C48,0x9C49,0x9C4A,0x9C4B,/* 0x48-0x4F */ + 0x9C4C,0x9C4D,0x9C4E,0x9C4F,0x9C50,0x9C51,0x9C52,0x9C53,/* 0x50-0x57 */ +- 0x9C54,0x9C55,0x9C56,0xF9F2,0x9C58,0x9C59,0x9C5A,0x9C5B,/* 0x58-0x5F */ ++ 0x9C54,0x9C55,0x9C56,0x9C57,0x9C58,0x9C59,0x9C5A,0x9C5B,/* 0x58-0x5F */ + 0x9C5C,0x9C5D,0x9C5E,0x9C5F,0x9C60,0x9C61,0x9C62,0x9C63,/* 0x60-0x67 */ + 0x9C64,0x9C65,0x9C66,0x9C67,0x9C68,0x9C69,0x9C6A,0x9C6B,/* 0x68-0x6F */ + 0x9C6C,0x9C6D,0x9C6E,0x9C6F,0x9C70,0x9C71,0x9C72,0x9C73,/* 0x70-0x77 */ +@@ -4218,7 +4220,7 @@ + 0x990D,0x992E,0x9955,0x9954,0x9ADF,0x9AE1,0x9AE6,0x9AEF,/* 0xD0-0xD7 */ + 0x9AEB,0x9AFB,0x9AED,0x9AF9,0x9B08,0x9B0F,0x9B13,0x9B1F,/* 0xD8-0xDF */ + 0x9B23,0x9EBD,0x9EBE,0x7E3B,0x9E82,0x9E87,0x9E88,0x9E8B,/* 0xE0-0xE7 */ +- 0x9E92,0x93D6,0x9E9D,0xF9F3,0x9EDB,0x9EDC,0x9EDD,0x9EE0,/* 0xE8-0xEF */ ++ 0x9E92,0x93D6,0x9E9D,0x9E9F,0x9EDB,0x9EDC,0x9EDD,0x9EE0,/* 0xE8-0xEF */ + 0x9EDF,0x9EE2,0x9EE9,0x9EE7,0x9EE5,0x9EEA,0x9EEF,0x9F22,/* 0xF0-0xF7 */ + 0x9F2C,0x9F2F,0x9F39,0x9F37,0x9F3D,0x9F3E,0x9F44,0x0000,/* 0xF8-0xFF */ + }; +@@ -4246,17 +4248,6 @@ + 0x9D32,0x9D33,0x9D34,0x9D35,0x9D36,0x9D37,0x9D38,0x9D39,/* 0x90-0x97 */ + 0x9D3A,0x9D3B,0x9D3C,0x9D3D,0x9D3E,0x9D3F,0x9D40,0x9D41,/* 0x98-0x9F */ + 0x9D42,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA8-0xAF */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xB0-0xB7 */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xB8-0xBF */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC0-0xC7 */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC8-0xCF */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD0-0xD7 */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD8-0xDF */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE0-0xE7 */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE8-0xEF */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF0-0xF7 */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_F9[256] = { +@@ -4295,7 +4286,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x9DA3,0x9DA4,0x9DA5,0x9DA6,0x9DA7,0x9DA8,0x9DA9,0x9DAA,/* 0x40-0x47 */ + 0x9DAB,0x9DAC,0x9DAD,0x9DAE,0x9DAF,0x9DB0,0x9DB1,0x9DB2,/* 0x48-0x4F */ +- 0x9DB3,0xFA2D,0x9DB5,0x9DB6,0x9DB7,0x9DB8,0x9DB9,0x9DBA,/* 0x50-0x57 */ ++ 0x9DB3,0x9DB4,0x9DB5,0x9DB6,0x9DB7,0x9DB8,0x9DB9,0x9DBA,/* 0x50-0x57 */ + 0x9DBB,0x9DBC,0x9DBD,0x9DBE,0x9DBF,0x9DC0,0x9DC1,0x9DC2,/* 0x58-0x5F */ + 0x9DC3,0x9DC4,0x9DC5,0x9DC6,0x9DC7,0x9DC8,0x9DC9,0x9DCA,/* 0x60-0x67 */ + 0x9DCB,0x9DCC,0x9DCD,0x9DCE,0x9DCF,0x9DD0,0x9DD1,0x9DD2,/* 0x68-0x6F */ +@@ -4305,7 +4296,7 @@ + 0x9DE2,0x9DE3,0x9DE4,0x9DE5,0x9DE6,0x9DE7,0x9DE8,0x9DE9,/* 0x80-0x87 */ + 0x9DEA,0x9DEB,0x9DEC,0x9DED,0x9DEE,0x9DEF,0x9DF0,0x9DF1,/* 0x88-0x8F */ + 0x9DF2,0x9DF3,0x9DF4,0x9DF5,0x9DF6,0x9DF7,0x9DF8,0x9DF9,/* 0x90-0x97 */ +- 0xF93A,0x9DFB,0x9DFC,0x9DFD,0x9DFE,0x9DFF,0x9E00,0x9E01,/* 0x98-0x9F */ ++ 0x9DFA,0x9DFB,0x9DFC,0x9DFD,0x9DFE,0x9DFF,0x9E00,0x9E01,/* 0x98-0x9F */ + 0x9E02,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ + }; + +@@ -4321,7 +4312,7 @@ + 0x9E03,0x9E04,0x9E05,0x9E06,0x9E07,0x9E08,0x9E09,0x9E0A,/* 0x40-0x47 */ + 0x9E0B,0x9E0C,0x9E0D,0x9E0E,0x9E0F,0x9E10,0x9E11,0x9E12,/* 0x48-0x4F */ + 0x9E13,0x9E14,0x9E15,0x9E16,0x9E17,0x9E18,0x9E19,0x9E1A,/* 0x50-0x57 */ +- 0x9E1B,0x9E1C,0x9E1D,0xF920,0x9E24,0x9E27,0x9E2E,0x9E30,/* 0x58-0x5F */ ++ 0x9E1B,0x9E1C,0x9E1D,0x9E1E,0x9E24,0x9E27,0x9E2E,0x9E30,/* 0x58-0x5F */ + 0x9E34,0x9E3B,0x9E3C,0x9E40,0x9E4D,0x9E50,0x9E52,0x9E53,/* 0x60-0x67 */ + 0x9E54,0x9E56,0x9E59,0x9E5D,0x9E5F,0x9E60,0x9E61,0x9E62,/* 0x68-0x6F */ + 0x9E65,0x9E6E,0x9E6F,0x9E72,0x9E74,0x9E75,0x9E76,0x9E77,/* 0x70-0x77 */ +@@ -4329,7 +4320,7 @@ + + 0x9E81,0x9E83,0x9E84,0x9E85,0x9E86,0x9E89,0x9E8A,0x9E8C,/* 0x80-0x87 */ + 0x9E8D,0x9E8E,0x9E8F,0x9E90,0x9E91,0x9E94,0x9E95,0x9E96,/* 0x88-0x8F */ +- 0xF988,0x9E98,0x9E99,0x9E9A,0x9E9B,0x9E9C,0x9E9E,0x9EA0,/* 0x90-0x97 */ ++ 0x9E97,0x9E98,0x9E99,0x9E9A,0x9E9B,0x9E9C,0x9E9E,0x9EA0,/* 0x90-0x97 */ + 0x9EA1,0x9EA2,0x9EA3,0x9EA4,0x9EA5,0x9EA7,0x9EA8,0x9EA9,/* 0x98-0x9F */ + 0x9EAA,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ + }; +@@ -4378,8 +4369,8 @@ + 0x9F72,0x9F73,0x9F74,0x9F75,0x9F76,0x9F77,0x9F78,0x0000,/* 0x78-0x7F */ + + 0x9F79,0x9F7A,0x9F7B,0x9F7C,0x9F7D,0x9F7E,0x9F81,0x9F82,/* 0x80-0x87 */ +- 0xF9C4,0x9F8E,0x9F8F,0x9F90,0x9F91,0x9F92,0x9F93,0x9F94,/* 0x88-0x8F */ +- 0x9F95,0x9F96,0x9F97,0x9F98,0xF908,0x9F9D,0x9F9E,0x9FA1,/* 0x90-0x97 */ ++ 0x9F8D,0x9F8E,0x9F8F,0x9F90,0x9F91,0x9F92,0x9F93,0x9F94,/* 0x88-0x8F */ ++ 0x9F95,0x9F96,0x9F97,0x9F98,0x9F9C,0x9F9D,0x9F9E,0x9FA1,/* 0x90-0x97 */ + 0x9FA2,0x9FA3,0x9FA4,0x9FA5,0xF92C,0xF979,0xF995,0xF9E7,/* 0x98-0x9F */ + 0xF9F1,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ + }; +@@ -4432,18 +4423,88 @@ + c2u_F8, c2u_F9, c2u_FA, c2u_FB, c2u_FC, c2u_FD, c2u_FE, NULL, + }; + ++ ++static unsigned char u2c_00[512] = { ++ 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, /* 0x00-0x03 */ ++ 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, /* 0x04-0x07 */ ++ 0x00, 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, /* 0x08-0x0B */ ++ 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, /* 0x0C-0x0F */ ++ 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, /* 0x10-0x13 */ ++ 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, /* 0x14-0x17 */ ++ 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, /* 0x18-0x1B */ ++ 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, /* 0x1C-0x1F */ ++ 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, /* 0x20-0x23 */ ++ 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, /* 0x24-0x27 */ ++ 0x00, 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, /* 0x28-0x2B */ ++ 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2E, 0x00, 0x2F, /* 0x2C-0x2F */ ++ 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, /* 0x30-0x33 */ ++ 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, /* 0x34-0x37 */ ++ 0x00, 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, /* 0x38-0x3B */ ++ 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3F, /* 0x3C-0x3F */ ++ 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, /* 0x40-0x43 */ ++ 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, /* 0x44-0x47 */ ++ 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, /* 0x48-0x4B */ ++ 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, /* 0x4C-0x4F */ ++ 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, /* 0x50-0x53 */ ++ 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, /* 0x54-0x57 */ ++ 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, /* 0x58-0x5B */ ++ 0x00, 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00, 0x5F, /* 0x5C-0x5F */ ++ 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, /* 0x60-0x63 */ ++ 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, /* 0x64-0x67 */ ++ 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00, 0x6B, /* 0x68-0x6B */ ++ 0x00, 0x6C, 0x00, 0x6D, 0x00, 0x6E, 0x00, 0x6F, /* 0x6C-0x6F */ ++ 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, /* 0x70-0x73 */ ++ 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, /* 0x74-0x77 */ ++ 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, /* 0x78-0x7B */ ++ 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, /* 0x7C-0x7F */ ++ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ ++ 0xA1, 0xE8, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xEC, /* 0xA4-0xA7 */ ++ 0xA1, 0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ ++ 0xA1, 0xE3, 0xA1, 0xC0, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xA4, /* 0xB4-0xB7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC1, /* 0xD4-0xD7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ ++ 0xA8, 0xA4, 0xA8, 0xA2, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE4-0xE7 */ ++ 0xA8, 0xA8, 0xA8, 0xA6, 0xA8, 0xBA, 0x00, 0x00, /* 0xE8-0xEB */ ++ 0xA8, 0xAC, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ ++ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xB0, 0xA8, 0xAE, /* 0xF0-0xF3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC2, /* 0xF4-0xF7 */ ++ 0x00, 0x00, 0xA8, 0xB4, 0xA8, 0xB2, 0x00, 0x00, /* 0xF8-0xFB */ ++ 0xA8, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ ++}; ++ ++ + static unsigned char u2c_01[512] = { +- 0xA8, 0xA1, 0xA8, 0xA1, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ ++ 0x00, 0x00, 0xA8, 0xA1, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ +- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA5, 0xA8, 0xA5, /* 0x10-0x13 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA5, /* 0x10-0x13 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ +- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA7, 0xA8, 0xA7, /* 0x18-0x1B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA7, /* 0x18-0x1B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ +- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA9, 0xA8, 0xA9, /* 0x28-0x2B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA9, /* 0x28-0x2B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ +@@ -4452,14 +4513,14 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ + 0xA8, 0xBD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ + 0xA8, 0xBE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ +- 0xA8, 0xAD, 0xA8, 0xAD, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ ++ 0x00, 0x00, 0xA8, 0xAD, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ +- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xB1, 0xA8, 0xB1, /* 0x68-0x6B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xB1, /* 0x68-0x6B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ +@@ -4482,13 +4543,13 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ +- 0x00, 0x00, 0xA1, 0xCE, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ +- 0x00, 0x00, 0xA8, 0xA3, 0xA8, 0xA3, 0xA8, 0xAB, /* 0xCC-0xCF */ +- 0xA8, 0xAB, 0xA8, 0xAF, 0xA8, 0xAF, 0xA8, 0xB3, /* 0xD0-0xD3 */ +- 0xA8, 0xB3, 0xA8, 0xB5, 0xA8, 0xB5, 0xA8, 0xB6, /* 0xD4-0xD7 */ +- 0xA8, 0xB6, 0xA8, 0xB7, 0xA8, 0xB7, 0xA8, 0xB8, /* 0xD8-0xDB */ ++ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA3, 0x00, 0x00, /* 0xCC-0xCF */ ++ 0xA8, 0xAB, 0x00, 0x00, 0xA8, 0xAF, 0x00, 0x00, /* 0xD0-0xD3 */ ++ 0xA8, 0xB3, 0x00, 0x00, 0xA8, 0xB5, 0x00, 0x00, /* 0xD4-0xD7 */ ++ 0xA8, 0xB6, 0x00, 0x00, 0xA8, 0xB7, 0x00, 0x00, /* 0xD8-0xDB */ + 0xA8, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ + }; + +@@ -4699,7 +4760,7 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC7, /* 0x0C-0x0F */ + 0x00, 0x00, 0xA1, 0xC6, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ + 0x00, 0x00, 0xA8, 0x4D, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ +- 0xA1, 0xE3, 0x00, 0x00, 0xA1, 0xCC, 0x00, 0x00, /* 0x18-0x1B */ ++ 0x00, 0x00, 0x00, 0x00, 0xA1, 0xCC, 0x00, 0x00, /* 0x18-0x1B */ + 0x00, 0x00, 0xA1, 0xD8, 0xA1, 0xDE, 0xA8, 0x4E, /* 0x1C-0x1F */ + 0xA1, 0xCF, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x4F, /* 0x20-0x23 */ + 0x00, 0x00, 0xA1, 0xCE, 0x00, 0x00, 0xA1, 0xC4, /* 0x24-0x27 */ +@@ -4708,7 +4769,7 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ + 0xA1, 0xE0, 0xA1, 0xDF, 0xA1, 0xC3, 0xA1, 0xCB, /* 0x34-0x37 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ +- 0xA1, 0xAB, 0xA1, 0xD7, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ ++ 0x00, 0x00, 0xA1, 0xD7, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ + 0xA1, 0xD6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ +@@ -4855,12 +4916,6 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ + 0x00, 0x00, 0x00, 0x00, 0xA8, 0x8D, 0xA8, 0x8E, /* 0xE0-0xE3 */ + 0xA8, 0x8F, 0xA8, 0x90, 0x00, 0x00, 0x00, 0x00, /* 0xE4-0xE7 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF4-0xF7 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ + }; + + static unsigned char u2c_26[512] = { +@@ -4963,36 +5018,6 @@ + 0xA8, 0xE0, 0xA8, 0xE1, 0xA8, 0xE2, 0xA8, 0xE3, /* 0x20-0x23 */ + 0xA8, 0xE4, 0xA8, 0xE5, 0xA8, 0xE6, 0xA8, 0xE7, /* 0x24-0x27 */ + 0xA8, 0xE8, 0xA8, 0xE9, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ +- +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ +- 0x00, 0x00, 0x00, 0x00, 0xD2, 0xBB, 0xB6, 0xFE, /* 0x90-0x93 */ +- 0xC8, 0xFD, 0xCB, 0xC4, 0xC9, 0xCF, 0xD6, 0xD0, /* 0x94-0x97 */ +- 0xCF, 0xC2, 0xBC, 0xD7, 0xD2, 0xD2, 0xB1, 0xFB, /* 0x98-0x9B */ +- 0xB6, 0xA1, 0xCC, 0xEC, 0xB5, 0xD8, 0xC8, 0xCB, /* 0x9C-0x9F */ + }; + + static unsigned char u2c_32[512] = { +@@ -5006,13 +5031,13 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ + 0xA2, 0xE5, 0xA2, 0xE6, 0xA2, 0xE7, 0xA2, 0xE8, /* 0x20-0x23 */ + 0xA2, 0xE9, 0xA2, 0xEA, 0xA2, 0xEB, 0xA2, 0xEC, /* 0x24-0x27 */ +- 0xA2, 0xED, 0xA2, 0xEE, 0xD4, 0xC2, 0xBB, 0xF0, /* 0x28-0x2B */ +- 0xCB, 0xAE, 0xC4, 0xBE, 0xBD, 0xF0, 0xCD, 0xC1, /* 0x2C-0x2F */ +- 0xC8, 0xD5, 0xA9, 0x5A, 0xD3, 0xD0, 0xC9, 0xE7, /* 0x30-0x33 */ +- 0xC3, 0xFB, 0xCC, 0xD8, 0xB2, 0xC6, 0xD7, 0xA3, /* 0x34-0x37 */ +- 0xC0, 0xCD, 0xB4, 0xFA, 0xBA, 0xF4, 0xD1, 0xA7, /* 0x38-0x3B */ +- 0xBC, 0xE0, 0xC6, 0xF3, 0xD7, 0xCA, 0xD0, 0xAD, /* 0x3C-0x3F */ +- 0xBC, 0xC0, 0xD0, 0xDD, 0xD7, 0xD4, 0xD6, 0xC1, /* 0x40-0x43 */ ++ 0xA2, 0xED, 0xA2, 0xEE, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ ++ 0x00, 0x00, 0xA9, 0x5A, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ +@@ -5029,19 +5054,15 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ + +- 0xD2, 0xBB, 0xB6, 0xFE, 0xC8, 0xFD, 0xCB, 0xC4, /* 0x80-0x83 */ +- 0xCE, 0xE5, 0xC1, 0xF9, 0xC6, 0xDF, 0xB0, 0xCB, /* 0x84-0x87 */ +- 0xBE, 0xC5, 0xCA, 0xAE, 0xD4, 0xC2, 0xBB, 0xF0, /* 0x88-0x8B */ +- 0xCB, 0xAE, 0xC4, 0xBE, 0xBD, 0xF0, 0xCD, 0xC1, /* 0x8C-0x8F */ +- 0xC8, 0xD5, 0xD6, 0xEA, 0xD3, 0xD0, 0xC9, 0xE7, /* 0x90-0x93 */ +- 0xC3, 0xFB, 0xCC, 0xD8, 0xB2, 0xC6, 0xD7, 0xA3, /* 0x94-0x97 */ +- 0xC0, 0xCD, 0xC3, 0xD8, 0xC4, 0xD0, 0xC5, 0xAE, /* 0x98-0x9B */ +- 0xCA, 0xCA, 0xD3, 0xC5, 0x00, 0x00, 0xD7, 0xA2, /* 0x9C-0x9F */ +- 0xCF, 0xEE, 0xD0, 0xDD, 0xD0, 0xB4, 0xA9, 0x49, /* 0xA0-0xA3 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ +- 0x00, 0x00, 0xD2, 0xBD, 0xD7, 0xDA, 0xD1, 0xA7, /* 0xA8-0xAB */ +- 0xBC, 0xE0, 0xC6, 0xF3, 0xD7, 0xCA, 0xD0, 0xAD, /* 0xAC-0xAF */ +- 0xD2, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA9, 0x49, /* 0xA0-0xA3 */ + }; + + static unsigned char u2c_33[512] = { +@@ -10656,91 +10677,82 @@ + 0xFD, 0x9A, 0xFD, 0x9B, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ + }; + +-static unsigned char u2c_DC[512] = { ++static unsigned char u2c_F9[512] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ +-}; +- +-static unsigned char u2c_F9[512] = { +- 0xD8, 0x4D, 0xB8, 0xFC, 0xDC, 0x87, 0xD9, 0x5A, /* 0x00-0x03 */ +- 0xBB, 0xAC, 0xB4, 0xAE, 0xBE, 0xE4, 0xFD, 0x94, /* 0x04-0x07 */ +- 0xFD, 0x94, 0xC6, 0xF5, 0xBD, 0xF0, 0xC0, 0xAE, /* 0x08-0x0B */ +- 0xC4, 0xCE, 0x91, 0xD0, 0xB0, 0x5D, 0xC1, 0x5F, /* 0x0C-0x0F */ +- 0xCC, 0x7D, 0xC2, 0xDD, 0xC2, 0xE3, 0xDF, 0x89, /* 0x10-0x13 */ +- 0x98, 0xB7, 0xC2, 0xE5, 0xC0, 0xD3, 0xE7, 0xF3, /* 0x14-0x17 */ +- 0xC2, 0xE4, 0xC0, 0xD2, 0xF1, 0x98, 0x81, 0x79, /* 0x18-0x1B */ +- 0xC2, 0xD1, 0x99, 0xDA, 0xA0, 0x80, 0xCC, 0x6D, /* 0x1C-0x1F */ +- 0xFB, 0x5B, 0x8D, 0xB9, 0x9E, 0x45, 0xCB, 0x7B, /* 0x20-0x23 */ +- 0xD2, 0x68, 0xC0, 0xAD, 0xC5, 0x44, 0xCF, 0x9E, /* 0x24-0x27 */ +- 0xC0, 0xC8, 0xC0, 0xCA, 0xC0, 0xCB, 0xC0, 0xC7, /* 0x28-0x2B */ +- 0xFD, 0x9C, 0x81, 0xED, 0xC0, 0xE4, 0x84, 0xDA, /* 0x2C-0x2F */ +- 0x93, 0xEF, 0x99, 0xA9, 0xA0, 0x74, 0xB1, 0x52, /* 0x30-0x33 */ +- 0xC0, 0xCF, 0xCC, 0x4A, 0xCC, 0x94, 0xC2, 0xB7, /* 0x34-0x37 */ +- 0xC2, 0xB6, 0xF4, 0x94, 0xFA, 0x98, 0xC2, 0xB5, /* 0x38-0x3B */ +- 0xB5, 0x93, 0xBE, 0x47, 0xC7, 0x8A, 0xE4, 0x9B, /* 0x3C-0x3F */ +- 0xC2, 0xB9, 0xD5, 0x93, 0x89, 0xC5, 0xC5, 0xAA, /* 0x40-0x43 */ +- 0xBB, 0x5C, 0xC3, 0x40, 0xC0, 0xCE, 0xC0, 0xDA, /* 0x44-0x47 */ +- 0xD9, 0x54, 0xC0, 0xD7, 0x89, 0xBE, 0x8C, 0xD2, /* 0x48-0x4B */ +- 0x98, 0xC7, 0x9C, 0x49, 0xC2, 0xA9, 0xC0, 0xDB, /* 0x4C-0x4F */ +- 0xBF, 0x7C, 0xC2, 0xAA, 0xC0, 0xD5, 0xC0, 0xDF, /* 0x50-0x53 */ +- 0x84, 0x43, 0xC1, 0xE8, 0xB6, 0xA0, 0xBE, 0x63, /* 0x54-0x57 */ +- 0xC1, 0xE2, 0xC1, 0xEA, 0xD7, 0x78, 0x92, 0x82, /* 0x58-0x5B */ +- 0x98, 0xB7, 0xD6, 0x5A, 0xB5, 0xA4, 0x8C, 0x8E, /* 0x5C-0x5F */ +- 0xC5, 0xAD, 0xC2, 0xCA, 0xAE, 0x90, 0xB1, 0xB1, /* 0x60-0x63 */ +- 0xB4, 0x91, 0xB1, 0xE3, 0x8F, 0xCD, 0xB2, 0xBB, /* 0x64-0x67 */ +- 0xC3, 0xDA, 0x94, 0xB5, 0xCB, 0xF7, 0x85, 0xA2, /* 0x68-0x6B */ +- 0xC8, 0xFB, 0xCA, 0xA1, 0xC8, 0x7E, 0xD5, 0x66, /* 0x6C-0x6F */ +- 0x9A, 0xA2, 0xB3, 0xBD, 0xC9, 0xF2, 0xCA, 0xB0, /* 0x70-0x73 */ +- 0xC8, 0xF4, 0xC2, 0xD3, 0xC2, 0xD4, 0xC1, 0xC1, /* 0x74-0x77 */ +- 0x83, 0xC9, 0xFD, 0x9D, 0xC1, 0xBA, 0xBC, 0x5A, /* 0x78-0x7B */ +- 0xC1, 0xBC, 0xD5, 0x8F, 0xC1, 0xBF, 0x84, 0xEE, /* 0x7C-0x7F */ +- +- 0x85, 0xCE, 0xC5, 0xAE, 0x8F, 0x5D, 0xC2, 0xC3, /* 0x80-0x83 */ +- 0x9E, 0x56, 0xB5, 0x5A, 0xE9, 0x82, 0xF3, 0x50, /* 0x84-0x87 */ +- 0xFB, 0x90, 0xC0, 0xE8, 0xC1, 0xA6, 0x95, 0xD1, /* 0x88-0x8B */ +- 0x9A, 0x76, 0xDE, 0x5D, 0xC4, 0xEA, 0x91, 0x7A, /* 0x8C-0x8F */ +- 0x91, 0xD9, 0x93, 0xD3, 0x9D, 0x69, 0x9F, 0x92, /* 0x90-0x93 */ +- 0xAD, 0x49, 0xFD, 0x9E, 0xBE, 0x9A, 0xC2, 0x93, /* 0x94-0x97 */ +- 0xDD, 0x82, 0xC9, 0x8F, 0xDF, 0x42, 0xE5, 0x80, /* 0x98-0x9B */ +- 0xC1, 0xD0, 0xC1, 0xD3, 0xD1, 0xCA, 0xC1, 0xD2, /* 0x9C-0x9F */ +- 0xC1, 0xD1, 0xD5, 0x66, 0xC1, 0xAE, 0xC4, 0xEE, /* 0xA0-0xA3 */ +- 0xC4, 0xED, 0x9A, 0x9A, 0xBA, 0x9F, 0xAB, 0x43, /* 0xA4-0xA7 */ +- 0xC1, 0xEE, 0xE0, 0xF2, 0x8C, 0x8E, 0x8E, 0x58, /* 0xA8-0xAB */ +- 0xC1, 0xAF, 0xC1, 0xE1, 0xAC, 0x93, 0xC1, 0xE7, /* 0xAC-0xAF */ +- 0xF1, 0xF6, 0xE2, 0x8F, 0xC1, 0xE3, 0xEC, 0x60, /* 0xB0-0xB3 */ +- 0xEE, 0x49, 0xC0, 0xFD, 0xB6, 0x59, 0xF5, 0xB7, /* 0xB4-0xB7 */ +- 0xEB, 0x60, 0x90, 0xBA, 0xC1, 0xCB, 0xC1, 0xC5, /* 0xB8-0xBB */ +- 0xE5, 0xBC, 0xC4, 0xF2, 0xC1, 0xCF, 0x98, 0xB7, /* 0xBC-0xBF */ +- 0xC1, 0xC7, 0xAF, 0x9F, 0xDE, 0xA4, 0xDF, 0x7C, /* 0xC0-0xC3 */ +- 0xFD, 0x88, 0x95, 0x9E, 0xC8, 0xEE, 0x84, 0xA2, /* 0xC4-0xC7 */ +- 0x96, 0x83, 0xC1, 0xF8, 0xC1, 0xF7, 0xC1, 0xEF, /* 0xC8-0xCB */ +- 0xC1, 0xF0, 0xC1, 0xF4, 0xC1, 0xF2, 0xBC, 0x7E, /* 0xCC-0xCF */ +- 0xEE, 0x90, 0xC1, 0xF9, 0xC2, 0xBE, 0xEA, 0x91, /* 0xD0-0xD3 */ +- 0x82, 0x90, 0x8D, 0x91, 0x9C, 0x53, 0xDD, 0x86, /* 0xD4-0xD7 */ +- 0xC2, 0xC9, 0x90, 0xFC, 0xC0, 0xF5, 0xC2, 0xCA, /* 0xD8-0xDB */ +- 0xC2, 0xA1, 0xC0, 0xFB, 0xC0, 0xF4, 0xC2, 0xC4, /* 0xDC-0xDF */ +- 0xD2, 0xD7, 0xC0, 0xEE, 0xC0, 0xE6, 0xC4, 0xE0, /* 0xE0-0xE3 */ +- 0xC0, 0xED, 0xC1, 0xA1, 0xEE, 0xBE, 0xFD, 0x9F, /* 0xE4-0xE7 */ +- 0xD1, 0x65, 0xC0, 0xEF, 0xEB, 0x78, 0xC4, 0xE4, /* 0xE8-0xEB */ +- 0xC4, 0xE7, 0xC1, 0xDF, 0x9F, 0xFB, 0xAD, 0x55, /* 0xEC-0xEF */ +- 0xCC, 0x41, 0xFD, 0xA0, 0xF7, 0x5B, 0xF7, 0xEB, /* 0xF0-0xF3 */ +- 0xC1, 0xD6, 0xC1, 0xDC, 0xC5, 0x52, 0xC1, 0xA2, /* 0xF4-0xF7 */ +- 0xF3, 0xD2, 0xC1, 0xA3, 0xA0, 0xEE, 0xD6, 0xCB, /* 0xF8-0xFB */ +- 0xD7, 0x52, 0xCA, 0xB2, 0xB2, 0xE8, 0xB4, 0xCC, /* 0xFC-0xFF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ ++ 0xFD, 0x9C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ ++ 0x00, 0x00, 0xFD, 0x9D, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ ++ 0x00, 0x00, 0xFD, 0x9E, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD4-0xD7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0x9F, /* 0xE4-0xE7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ ++ 0x00, 0x00, 0xFD, 0xA0, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ + }; + + static unsigned char u2c_FA[512] = { +- 0xC7, 0xD0, 0xB6, 0xC8, 0xCD, 0xD8, 0xCC, 0xC7, /* 0x00-0x03 */ +- 0xD5, 0xAC, 0xB6, 0xB4, 0xB1, 0xA9, 0xDD, 0x97, /* 0x04-0x07 */ +- 0xD0, 0xD0, 0xBD, 0xB5, 0xD2, 0x8A, 0xC0, 0xAA, /* 0x08-0x0B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ + 0xFE, 0x40, 0xFE, 0x41, 0xFE, 0x42, 0xFE, 0x43, /* 0x0C-0x0F */ +- 0x89, 0x56, 0xFE, 0x44, 0xC7, 0xE7, 0xFE, 0x45, /* 0x10-0x13 */ +- 0xFE, 0x46, 0x84, 0x44, 0xD8, 0x69, 0xD2, 0xE6, /* 0x14-0x17 */ +- 0xFE, 0x47, 0xC9, 0xF1, 0xCF, 0xE9, 0xB8, 0xA3, /* 0x18-0x1B */ +- 0xBE, 0xB8, 0xBE, 0xAB, 0xD3, 0xF0, 0xFE, 0x48, /* 0x1C-0x1F */ +- 0xFE, 0x49, 0xFE, 0x4A, 0xD6, 0x54, 0xFE, 0x4B, /* 0x20-0x23 */ +- 0xFE, 0x4C, 0xD2, 0xDD, 0xB6, 0xBC, 0xFE, 0x4D, /* 0x24-0x27 */ +- 0xFE, 0x4E, 0xFE, 0x4F, 0xEF, 0x88, 0xEF, 0x95, /* 0x28-0x2B */ +- 0xF0, 0x5E, 0xFA, 0x51, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ ++ 0x00, 0x00, 0xFE, 0x44, 0x00, 0x00, 0xFE, 0x45, /* 0x10-0x13 */ ++ 0xFE, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ ++ 0xFE, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x48, /* 0x1C-0x1F */ ++ 0xFE, 0x49, 0xFE, 0x4A, 0x00, 0x00, 0xFE, 0x4B, /* 0x20-0x23 */ ++ 0xFE, 0x4C, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x4D, /* 0x24-0x27 */ ++ 0xFE, 0x4E, 0xFE, 0x4F, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ + }; + + static unsigned char u2c_FE[512] = { +@@ -10836,7 +10848,7 @@ + }; + + static unsigned char *page_uni2charset[256] = { +- NULL, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, ++ u2c_00, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +@@ -10863,11 +10875,12 @@ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +- NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +- NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, }; ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, ++}; + + static unsigned char charset2lower[256] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */ +@@ -10952,22 +10965,23 @@ + if (boundlen <= 0) + return -ENAMETOOLONG; + +- +- uni2charset = page_uni2charset[ch]; +- if (uni2charset) { +- if (boundlen <= 1) +- return -ENAMETOOLONG; +- out[0] = uni2charset[cl*2]; +- out[1] = uni2charset[cl*2+1]; +- if (out[0] == 0x00 && out[1] == 0x00) ++ if (ch==0 && cl<0x80) { ++ out[0] = cl; ++ n = 1; ++ } else { ++ ++ uni2charset = page_uni2charset[ch]; ++ if (uni2charset) { ++ if (boundlen <= 1) ++ return -ENAMETOOLONG; ++ out[0] = uni2charset[cl*2]; ++ out[1] = uni2charset[cl*2+1]; ++ if (out[0] == 0x00 && out[1] == 0x00) ++ return -EINVAL; ++ n = 2; ++ } else + return -EINVAL; +- n = 2; +- } else if (ch==0 && cl) { +- out[0] = cl; +- n = 1; +- } +- else +- return -EINVAL; ++ } + + return n; + } +@@ -10991,7 +11005,7 @@ + cl = rawstring[1]; + + charset2uni = page_charset2uni[ch]; +- if (charset2uni && cl) { ++ if (charset2uni && (rawstring[1]>=0xA1 && rawstring[1]<=0xFE) && cl) { + *uni = charset2uni[cl]; + if (*uni == 0x0000) + return -EINVAL; +@@ -11026,20 +11040,4 @@ + module_exit(exit_nls_cp936) + MODULE_LICENSE("Dual BSD/GPL"); + +-/* +- * Overrides for Emacs so that we follow Linus's tabbing style. +- * Emacs will notice this stuff at the end of the file and automatically +- * adjust the settings for this buffer only. This must remain at the end +- * of the file. +- * +---------------------------------------------------------------------------- +- * Local variables: +- * c-indent-level: 8 +- * c-brace-imaginary-offset: 0 +- * c-brace-offset: -8 +- * c-argdecl-indent: 8 +- * c-label-offset: -8 +- * c-continued-statement-offset: 8 +- * c-continued-brace-offset: 0 +- * End: +- */ ++ +--- R29/fs/nls/nls_cp949.c 2004-03-24 19:56:03.000000000 +0000 ++++ R63/fs/nls/nls_cp949.c 2005-08-09 03:33:28.000000000 +0100 +@@ -3,8 +3,10 @@ + * + * Charset cp949 translation tables. + * This translation table was generated automatically, the +- * original table can be download from the Microsoft website. +- * (http://www.microsoft.com/typography/unicode/unicodecp.htm) ++ * original table can be found at the Microsoft website. ++ * (http://www.microsoft.com/globaldev/reference/dbcs/949.htm) ++ * download CP949.TXT from MIT Edu website ++ * (http://web.mit.edu/afs/dev.mit.edu/source/src-current/third/libiconv/tests/CP949.TXT) + */ + + #include +@@ -1231,7 +1233,7 @@ + 0x25A5,0x25A8,0x25A7,0x25A6,0x25A9,0x2668,0x260F,0x260E,/* 0xC8-0xCF */ + 0x261C,0x261E,0x00B6,0x2020,0x2021,0x2195,0x2197,0x2199,/* 0xD0-0xD7 */ + 0x2196,0x2198,0x266D,0x2669,0x266A,0x266C,0x327F,0x321C,/* 0xD8-0xDF */ +- 0x2116,0x33C7,0x2122,0x33C2,0x33D8,0x2121,0x0000,0x0000,/* 0xE0-0xE7 */ ++ 0x2116,0x33C7,0x2122,0x33C2,0x33D8,0x2121,0x20AC,0x00AE,/* 0xE0-0xE7 */ + }; + + static wchar_t c2u_A3[256] = { +@@ -1292,13 +1294,13 @@ + 0xCA2E,0xCA2F,0xCA30,0xCA31,0xCA32,0xCA33,0xCA34,0xCA35,/* 0x88-0x8F */ + 0xCA36,0xCA37,0xCA38,0xCA39,0xCA3A,0xCA3B,0xCA3C,0xCA3D,/* 0x90-0x97 */ + 0xCA3E,0xCA3F,0xCA40,0xCA41,0xCA42,0xCA43,0xCA44,0xCA45,/* 0x98-0x9F */ +- 0xCA46,0xFFA1,0xFFA2,0xFFA3,0xFFA4,0xFFA5,0xFFA6,0xFFA7,/* 0xA0-0xA7 */ +- 0xFFA8,0xFFA9,0xFFAA,0xFFAB,0xFFAC,0xFFAD,0xFFAE,0xFFAF,/* 0xA8-0xAF */ +- 0xFFB0,0xFFB1,0xFFB2,0xFFB3,0xFFB4,0xFFB5,0xFFB6,0xFFB7,/* 0xB0-0xB7 */ +- 0xFFB8,0xFFB9,0xFFBA,0xFFBB,0xFFBC,0xFFBD,0xFFBE,0xFFC2,/* 0xB8-0xBF */ +- 0xFFC3,0xFFC4,0xFFC5,0xFFC6,0xFFC7,0xFFCA,0xFFCB,0xFFCC,/* 0xC0-0xC7 */ +- 0xFFCD,0xFFCE,0xFFCF,0xFFD2,0xFFD3,0xFFD4,0xFFD5,0xFFD6,/* 0xC8-0xCF */ +- 0xFFD7,0xFFDA,0xFFDB,0xFFDC,0xFFA0,0x3165,0x3166,0x3167,/* 0xD0-0xD7 */ ++ 0xCA46,0x3131,0x3132,0x3133,0x3134,0x3135,0x3136,0x3137,/* 0xA0-0xA7 */ ++ 0x3138,0x3139,0x313A,0x313B,0x313C,0x313D,0x313E,0x313F,/* 0xA8-0xAF */ ++ 0x3140,0x3141,0x3142,0x3143,0x3144,0x3145,0x3146,0x3147,/* 0xB0-0xB7 */ ++ 0x3148,0x3149,0x314A,0x314B,0x314C,0x314D,0x314E,0x314F,/* 0xB8-0xBF */ ++ 0x3150,0x3151,0x3152,0x3153,0x3154,0x3155,0x3156,0x3157,/* 0xC0-0xC7 */ ++ 0x3158,0x3159,0x315A,0x315B,0x315C,0x315D,0x315E,0x315F,/* 0xC8-0xCF */ ++ 0x3160,0x3161,0x3162,0x3163,0x3164,0x3165,0x3166,0x3167,/* 0xD0-0xD7 */ + 0x3168,0x3169,0x316A,0x316B,0x316C,0x316D,0x316E,0x316F,/* 0xD8-0xDF */ + 0x3170,0x3171,0x3172,0x3173,0x3174,0x3175,0x3176,0x3177,/* 0xE0-0xE7 */ + 0x3178,0x3179,0x317A,0x317B,0x317C,0x317D,0x317E,0x317F,/* 0xE8-0xEF */ +@@ -2730,7 +2732,7 @@ + 0x0000,0x79D1,0x83D3,0x8A87,0x8AB2,0x8DE8,0x904E,0x934B,/* 0xA0-0xA7 */ + 0x9846,0x5ED3,0x69E8,0x85FF,0x90ED,0xF905,0x51A0,0x5B98,/* 0xA8-0xAF */ + 0x5BEC,0x6163,0x68FA,0x6B3E,0x704C,0x742F,0x74D8,0x7BA1,/* 0xB0-0xB7 */ +- 0x7F50,0x83C5,0x89C0,0x8CAB,0x95DC,0xFA2C,0x522E,0x605D,/* 0xB8-0xBF */ ++ 0x7F50,0x83C5,0x89C0,0x8CAB,0x95DC,0x9928,0x522E,0x605D,/* 0xB8-0xBF */ + 0x62EC,0x9002,0x4F8A,0x5149,0x5321,0x58D9,0x5EE3,0x66E0,/* 0xC0-0xC7 */ + 0x6D38,0x709A,0x72C2,0x73D6,0x7B50,0x80F1,0x945B,0x5366,/* 0xC8-0xCF */ + 0x639B,0x7F6B,0x4E56,0x5080,0x584A,0x58DE,0x602A,0x6127,/* 0xD0-0xD7 */ +@@ -2945,7 +2947,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x68F9,0x6AC2,0x6DD8,0x6E21,0x6ED4,0x6FE4,0x71FE,/* 0xA0-0xA7 */ + 0x76DC,0x7779,0x79B1,0x7A3B,0x8404,0x89A9,0x8CED,0x8DF3,/* 0xA8-0xAF */ +- 0x8E48,0x9003,0x9014,0x9053,0xFA26,0x934D,0x9676,0x97DC,/* 0xB0-0xB7 */ ++ 0x8E48,0x9003,0x9014,0x9053,0x90FD,0x934D,0x9676,0x97DC,/* 0xB0-0xB7 */ + 0x6BD2,0x7006,0x7258,0x72A2,0x7368,0x7763,0x79BF,0x7BE4,/* 0xB8-0xBF */ + 0x7E9B,0x8B80,0x58A9,0x60C7,0x6566,0x65FD,0x66BE,0x6C8C,/* 0xC0-0xC7 */ + 0x711E,0x71C9,0x8C5A,0x9813,0x4E6D,0x7A81,0x4EDD,0x51AC,/* 0xC8-0xCF */ +@@ -3170,7 +3172,7 @@ + 0x99C1,0x4F34,0x534A,0x53CD,0x53DB,0x62CC,0x642C,0x6500,/* 0xE0-0xE7 */ + 0x6591,0x69C3,0x6CEE,0x6F58,0x73ED,0x7554,0x7622,0x76E4,/* 0xE8-0xEF */ + 0x76FC,0x78D0,0x78FB,0x792C,0x7D46,0x822C,0x87E0,0x8FD4,/* 0xF0-0xF7 */ +- 0x9812,0xFA2A,0x52C3,0x62D4,0x64A5,0x6E24,0x6F51,0x0000,/* 0xF8-0xFF */ ++ 0x9812,0x98EF,0x52C3,0x62D4,0x64A5,0x6E24,0x6F51,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_DB[256] = { +@@ -3238,7 +3240,7 @@ + 0x9A08,0x4FDD,0x5821,0x5831,0x5BF6,0x666E,0x6B65,0x6D11,/* 0xC0-0xC7 */ + 0x6E7A,0x6F7D,0x73E4,0x752B,0x83E9,0x88DC,0x8913,0x8B5C,/* 0xC8-0xCF */ + 0x8F14,0x4F0F,0x50D5,0x5310,0x535C,0x5B93,0x5FA9,0x670D,/* 0xD0-0xD7 */ +- 0xFA1B,0x8179,0x832F,0x8514,0x8907,0x8986,0x8F39,0x8F3B,/* 0xD8-0xDF */ ++ 0x798F,0x8179,0x832F,0x8514,0x8907,0x8986,0x8F39,0x8F3B,/* 0xD8-0xDF */ + 0x99A5,0x9C12,0x672C,0x4E76,0x4FF8,0x5949,0x5C01,0x5CEF,/* 0xE0-0xE7 */ + 0x5CF0,0x6367,0x68D2,0x70FD,0x71A2,0x742B,0x7E2B,0x84EC,/* 0xE8-0xEF */ + 0x8702,0x9022,0x92D2,0x9CF3,0x4E0D,0x4ED8,0x4FEF,0x5085,/* 0xF0-0xF7 */ +@@ -3314,7 +3316,7 @@ + 0x6E23,0x7009,0x7345,0x7802,0x793E,0x7940,0x7960,0x79C1,/* 0xE0-0xE7 */ + 0x7BE9,0x7D17,0x7D72,0x8086,0x820D,0x838E,0x84D1,0x86C7,/* 0xE8-0xEF */ + 0x88DF,0x8A50,0x8A5E,0x8B1D,0x8CDC,0x8D66,0x8FAD,0x90AA,/* 0xF0-0xF7 */ +- 0xFA2B,0x99DF,0x9E9D,0x524A,0xF969,0x6714,0xF96A,0x0000,/* 0xF8-0xFF */ ++ 0x98FC,0x99DF,0x9E9D,0x524A,0xF969,0x6714,0xF96A,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_DF[256] = { +@@ -3345,7 +3347,7 @@ + 0x8518,0x886B,0x63F7,0x6F81,0x9212,0x98AF,0x4E0A,0x50B7,/* 0xB8-0xBF */ + 0x50CF,0x511F,0x5546,0x55AA,0x5617,0x5B40,0x5C19,0x5CE0,/* 0xC0-0xC7 */ + 0x5E38,0x5E8A,0x5EA0,0x5EC2,0x60F3,0x6851,0x6A61,0x6E58,/* 0xC8-0xCF */ +- 0x723D,0x7240,0x72C0,0x76F8,0xFA1A,0x7BB1,0x7FD4,0x88F3,/* 0xD0-0xD7 */ ++ 0x723D,0x7240,0x72C0,0x76F8,0x7965,0x7BB1,0x7FD4,0x88F3,/* 0xD0-0xD7 */ + 0x89F4,0x8A73,0x8C61,0x8CDE,0x971C,0x585E,0x74BD,0x8CFD,/* 0xD8-0xDF */ + 0x55C7,0xF96C,0x7A61,0x7D22,0x8272,0x7272,0x751F,0x7525,/* 0xE0-0xE7 */ + 0xF96D,0x7B19,0x5885,0x58FB,0x5DBC,0x5E8F,0x5EB6,0x5F90,/* 0xE8-0xEF */ +@@ -3492,7 +3494,7 @@ + 0x57F4,0x5BD4,0x5F0F,0x606F,0x62ED,0x690D,0x6B96,0x6E5C,/* 0xD0-0xD7 */ + 0x7184,0x7BD2,0x8755,0x8B58,0x8EFE,0x98DF,0x98FE,0x4F38,/* 0xD8-0xDF */ + 0x4F81,0x4FE1,0x547B,0x5A20,0x5BB8,0x613C,0x65B0,0x6668,/* 0xE0-0xE7 */ +- 0x71FC,0x7533,0xFA19,0x7D33,0x814E,0x81E3,0x8398,0x85AA,/* 0xE8-0xEF */ ++ 0x71FC,0x7533,0x795E,0x7D33,0x814E,0x81E3,0x8398,0x85AA,/* 0xE8-0xEF */ + 0x85CE,0x8703,0x8A0A,0x8EAB,0x8F9B,0xF971,0x8FC5,0x5931,/* 0xF0-0xF7 */ + 0x5BA4,0x5BE6,0x6089,0x5BE9,0x5C0B,0x5FC3,0x6C81,0x0000,/* 0xF8-0xFF */ + }; +@@ -3665,7 +3667,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x70CF,0x71AC,0x7352,0x7B7D,0x8708,0x8AA4,0x9C32,/* 0xA0-0xA7 */ + 0x9F07,0x5C4B,0x6C83,0x7344,0x7389,0x923A,0x6EAB,0x7465,/* 0xA8-0xAF */ +- 0x761F,0x7A69,0x7E15,0x860A,0xFA0C,0x58C5,0x64C1,0x74EE,/* 0xB0-0xB7 */ ++ 0x761F,0x7A69,0x7E15,0x860A,0x5140,0x58C5,0x64C1,0x74EE,/* 0xB0-0xB7 */ + 0x7515,0x7670,0x7FC1,0x9095,0x96CD,0x9954,0x6E26,0x74E6,/* 0xB8-0xBF */ + 0x7AA9,0x7AAA,0x81E5,0x86D9,0x8778,0x8A1B,0x5A49,0x5B8C,/* 0xC0-0xC7 */ + 0x5B9B,0x68A1,0x6900,0x6D63,0x73A9,0x7413,0x742C,0x7897,/* 0xC8-0xCF */ +@@ -3707,7 +3709,7 @@ + 0x84C9,0x8E0A,0x9394,0x93DE,0xF9C4,0x4E8E,0x4F51,0x5076,/* 0xC8-0xCF */ + 0x512A,0x53C8,0x53CB,0x53F3,0x5B87,0x5BD3,0x5C24,0x611A,/* 0xD0-0xD7 */ + 0x6182,0x65F4,0x725B,0x7397,0x7440,0x76C2,0x7950,0x7991,/* 0xD8-0xDF */ +- 0x79B9,0x7D06,0xFA1E,0x828B,0x85D5,0x865E,0x8FC2,0x9047,/* 0xE0-0xE7 */ ++ 0x79B9,0x7D06,0x7FBD,0x828B,0x85D5,0x865E,0x8FC2,0x9047,/* 0xE0-0xE7 */ + 0x90F5,0x91EA,0x9685,0x96E8,0x96E9,0x52D6,0x5F67,0x65ED,/* 0xE8-0xEF */ + 0x6631,0x682F,0x715C,0x7A36,0x90C1,0x980A,0x4E91,0xF9C5,/* 0xF0-0xF7 */ + 0x6A52,0x6B9E,0x6F90,0x7189,0x8018,0x82B8,0x8553,0x0000,/* 0xF8-0xFF */ +@@ -3812,11 +3814,11 @@ + 0xF9E1,0xF9E2,0xF9E3,0x723E,0x73E5,0xF9E4,0x7570,0x75CD,/* 0xB0-0xB7 */ + 0xF9E5,0x79FB,0xF9E6,0x800C,0x8033,0x8084,0x82E1,0x8351,/* 0xB8-0xBF */ + 0xF9E7,0xF9E8,0x8CBD,0x8CB3,0x9087,0xF9E9,0xF9EA,0x98F4,/* 0xC0-0xC7 */ +- 0x990C,0xF9EB,0xF9EC,0x7037,0xFA17,0x7FCA,0x7FCC,0x7FFC,/* 0xC8-0xCF */ ++ 0x990C,0xF9EB,0xF9EC,0x7037,0x76CA,0x7FCA,0x7FCC,0x7FFC,/* 0xC8-0xCF */ + 0x8B1A,0x4EBA,0x4EC1,0x5203,0x5370,0xF9ED,0x54BD,0x56E0,/* 0xD0-0xD7 */ + 0x59FB,0x5BC5,0x5F15,0x5FCD,0x6E6E,0xF9EE,0xF9EF,0x7D6A,/* 0xD8-0xDF */ + 0x8335,0xF9F0,0x8693,0x8A8D,0xF9F1,0x976D,0x9777,0xF9F2,/* 0xE0-0xE7 */ +- 0xF9F3,0x4E00,0x4F5A,0x4F7E,0x58F9,0x65E5,0x6EA2,0xFA25,/* 0xE8-0xEF */ ++ 0xF9F3,0x4E00,0x4F5A,0x4F7E,0x58F9,0x65E5,0x6EA2,0x9038,/* 0xE8-0xEF */ + 0x93B0,0x99B9,0x4EFB,0x58EC,0x598A,0x59D9,0x6041,0xF9F4,/* 0xF0-0xF7 */ + 0xF9F5,0x7A14,0xF9F6,0x834F,0x8CC3,0x5165,0x5344,0x0000,/* 0xF8-0xFF */ + }; +@@ -3925,8 +3927,8 @@ + 0x633A,0x653F,0x6574,0x65CC,0x6676,0x6678,0x67FE,0x6968,/* 0xD8-0xDF */ + 0x6A89,0x6B63,0x6C40,0x6DC0,0x6DE8,0x6E1F,0x6E5E,0x701E,/* 0xE0-0xE7 */ + 0x70A1,0x738E,0x73FD,0x753A,0x775B,0x7887,0x798E,0x7A0B,/* 0xE8-0xEF */ +- 0x7A7D,0xFA1D,0x7D8E,0x8247,0x8A02,0x8AEA,0x8C9E,0x912D,/* 0xF0-0xF7 */ +- 0x914A,0x91D8,0x9266,0x92CC,0x9320,0x9706,0xFA1C,0x0000,/* 0xF8-0xFF */ ++ 0x7A7D,0x7CBE,0x7D8E,0x8247,0x8A02,0x8AEA,0x8C9E,0x912D,/* 0xF0-0xF7 */ ++ 0x914A,0x91D8,0x9266,0x92CC,0x9320,0x9706,0x9756,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_F0[256] = { +@@ -3953,7 +3955,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x975C,0x9802,0x9F0E,0x5236,0x5291,0x557C,0x5824,/* 0xA0-0xA7 */ + 0x5E1D,0x5F1F,0x608C,0x63D0,0x68AF,0x6FDF,0x796D,0x7B2C,/* 0xA8-0xAF */ +- 0x81CD,0x85BA,0x88FD,0xFA22,0x8E44,0x918D,0x9664,0x969B,/* 0xB0-0xB7 */ ++ 0x81CD,0x85BA,0x88FD,0x8AF8,0x8E44,0x918D,0x9664,0x969B,/* 0xB0-0xB7 */ + 0x973D,0x984C,0x9F4A,0x4FCE,0x5146,0x51CB,0x52A9,0x5632,/* 0xB8-0xBF */ + 0x5F14,0x5F6B,0x63AA,0x64CD,0x65E9,0x6641,0x66FA,0x66F9,/* 0xC0-0xC7 */ + 0x671D,0x689D,0x68D7,0x69FD,0x6F15,0x6F6E,0x7167,0x71E5,/* 0xC8-0xCF */ +@@ -4103,7 +4105,7 @@ + 0x51F8,0x54F2,0x5586,0x5FB9,0x64A4,0x6F88,0x7DB4,0x8F1F,/* 0xC8-0xCF */ + 0x8F4D,0x9435,0x50C9,0x5C16,0x6CBE,0x6DFB,0x751B,0x77BB,/* 0xD0-0xD7 */ + 0x7C3D,0x7C64,0x8A79,0x8AC2,0x581E,0x59BE,0x5E16,0x6377,/* 0xD8-0xDF */ +- 0x7252,0x758A,0x776B,0x8ADC,0x8CBC,0x8F12,0x5EF3,0xFA12,/* 0xE0-0xE7 */ ++ 0x7252,0x758A,0x776B,0x8ADC,0x8CBC,0x8F12,0x5EF3,0x6674,/* 0xE0-0xE7 */ + 0x6DF8,0x807D,0x83C1,0x8ACB,0x9751,0x9BD6,0xFA00,0x5243,/* 0xE8-0xEF */ + 0x66FF,0x6D95,0x6EEF,0x7DE0,0x8AE6,0x902E,0x905E,0x9AD4,/* 0xF0-0xF7 */ + 0x521D,0x527F,0x54E8,0x6194,0x6284,0x62DB,0x68A2,0x0000,/* 0xF8-0xFF */ +@@ -4135,7 +4137,7 @@ + 0x790E,0x79D2,0x7A0D,0x8096,0x8278,0x82D5,0x8349,0x8549,/* 0xA8-0xAF */ + 0x8C82,0x8D85,0x9162,0x918B,0x91AE,0x4FC3,0x56D1,0x71ED,/* 0xB0-0xB7 */ + 0x77D7,0x8700,0x89F8,0x5BF8,0x5FD6,0x6751,0x90A8,0x53E2,/* 0xB8-0xBF */ +- 0xFA10,0x5BF5,0x60A4,0x6181,0x6460,0x7E3D,0x8070,0x8525,/* 0xC0-0xC7 */ ++ 0x585A,0x5BF5,0x60A4,0x6181,0x6460,0x7E3D,0x8070,0x8525,/* 0xC0-0xC7 */ + 0x9283,0x64AE,0x50AC,0x5D14,0x6700,0x589C,0x62BD,0x63A8,/* 0xC8-0xCF */ + 0x690E,0x6978,0x6A1E,0x6E6B,0x76BA,0x79CB,0x82BB,0x8429,/* 0xD0-0xD7 */ + 0x8ACF,0x8DA8,0x8FFD,0x9112,0x914B,0x919C,0x9310,0x9318,/* 0xD8-0xDF */ +@@ -4280,7 +4282,7 @@ + 0x5F3C,0x5FC5,0x6CCC,0x73CC,0x7562,0x758B,0x7B46,0x82FE,/* 0xB0-0xB7 */ + 0x999D,0x4E4F,0x903C,0x4E0B,0x4F55,0x53A6,0x590F,0x5EC8,/* 0xB8-0xBF */ + 0x6630,0x6CB3,0x7455,0x8377,0x8766,0x8CC0,0x9050,0x971E,/* 0xC0-0xC7 */ +- 0x9C15,0x58D1,0x5B78,0x8650,0x8B14,0xFA2D,0x5BD2,0x6068,/* 0xC8-0xCF */ ++ 0x9C15,0x58D1,0x5B78,0x8650,0x8B14,0x9DB4,0x5BD2,0x6068,/* 0xC8-0xCF */ + 0x608D,0x65F1,0x6C57,0x6F22,0x6FA3,0x701A,0x7F55,0x7FF0,/* 0xD0-0xD7 */ + 0x9591,0x9592,0x9650,0x97D3,0x5272,0x8F44,0x51FD,0x542B,/* 0xD8-0xDF */ + 0x54B8,0x5563,0x558A,0x6ABB,0x6DB5,0x7DD8,0x8266,0x929C,/* 0xE0-0xE7 */ +@@ -4428,7 +4430,7 @@ + 0x8667,0x6064,0x8B4E,0x9DF8,0x5147,0x51F6,0x5308,0x6D36,/* 0xD0-0xD7 */ + 0x80F8,0x9ED1,0x6615,0x6B23,0x7098,0x75D5,0x5403,0x5C79,/* 0xD8-0xDF */ + 0x7D07,0x8A16,0x6B20,0x6B3D,0x6B46,0x5438,0x6070,0x6D3D,/* 0xE0-0xE7 */ +- 0x7FD5,0x8208,0x50D6,0xFA15,0x559C,0x566B,0x56CD,0x59EC,/* 0xE8-0xEF */ ++ 0x7FD5,0x8208,0x50D6,0x51DE,0x559C,0x566B,0x56CD,0x59EC,/* 0xE8-0xEF */ + 0x5B09,0x5E0C,0x6199,0x6198,0x6231,0x665E,0x66E6,0x7199,/* 0xF0-0xF7 */ + 0x71B9,0x71BA,0x72A7,0x79A7,0x7A00,0x7FB2,0x8A70,0x0000,/* 0xF8-0xFF */ + }; +@@ -4468,12 +4470,81 @@ + c2u_F8, c2u_F9, c2u_FA, c2u_FB, c2u_FC, c2u_FD, NULL, NULL, + }; + ++ ++static unsigned char u2c_00[512] = { ++ 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, /* 0x00-0x03 */ ++ 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, /* 0x04-0x07 */ ++ 0x00, 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, /* 0x08-0x0B */ ++ 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, /* 0x0C-0x0F */ ++ 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, /* 0x10-0x13 */ ++ 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, /* 0x14-0x17 */ ++ 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, /* 0x18-0x1B */ ++ 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, /* 0x1C-0x1F */ ++ 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, /* 0x20-0x23 */ ++ 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, /* 0x24-0x27 */ ++ 0x00, 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, /* 0x28-0x2B */ ++ 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2E, 0x00, 0x2F, /* 0x2C-0x2F */ ++ 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, /* 0x30-0x33 */ ++ 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, /* 0x34-0x37 */ ++ 0x00, 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, /* 0x38-0x3B */ ++ 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3F, /* 0x3C-0x3F */ ++ 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, /* 0x40-0x43 */ ++ 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, /* 0x44-0x47 */ ++ 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, /* 0x48-0x4B */ ++ 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, /* 0x4C-0x4F */ ++ 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, /* 0x50-0x53 */ ++ 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, /* 0x54-0x57 */ ++ 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, /* 0x58-0x5B */ ++ 0x00, 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00, 0x5F, /* 0x5C-0x5F */ ++ 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, /* 0x60-0x63 */ ++ 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, /* 0x64-0x67 */ ++ 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00, 0x6B, /* 0x68-0x6B */ ++ 0x00, 0x6C, 0x00, 0x6D, 0x00, 0x6E, 0x00, 0x6F, /* 0x6C-0x6F */ ++ 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, /* 0x70-0x73 */ ++ 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, /* 0x74-0x77 */ ++ 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, /* 0x78-0x7B */ ++ 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, /* 0x7C-0x7F */ ++ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ ++ 0x00, 0x00, 0xA2, 0xAE, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ ++ 0xA2, 0xB4, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD7, /* 0xA4-0xA7 */ ++ 0xA1, 0xA7, 0x00, 0x00, 0xA8, 0xA3, 0x00, 0x00, /* 0xA8-0xAB */ ++ 0x00, 0x00, 0xA1, 0xA9, 0xA2, 0xE7, 0x00, 0x00, /* 0xAC-0xAF */ ++ 0xA1, 0xC6, 0xA1, 0xBE, 0xA9, 0xF7, 0xA9, 0xF8, /* 0xB0-0xB3 */ ++ 0xA2, 0xA5, 0x00, 0x00, 0xA2, 0xD2, 0xA1, 0xA4, /* 0xB4-0xB7 */ ++ 0xA2, 0xAC, 0xA9, 0xF6, 0xA8, 0xAC, 0x00, 0x00, /* 0xB8-0xBB */ ++ 0xA8, 0xF9, 0xA8, 0xF6, 0xA8, 0xFA, 0xA2, 0xAF, /* 0xBC-0xBF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ ++ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA1, 0x00, 0x00, /* 0xC4-0xC7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ ++ 0xA8, 0xA2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xBF, /* 0xD4-0xD7 */ ++ 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ ++ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xAD, 0xA9, 0xAC, /* 0xDC-0xDF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ ++ 0x00, 0x00, 0x00, 0x00, 0xA9, 0xA1, 0x00, 0x00, /* 0xE4-0xE7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ ++ 0xA9, 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC0, /* 0xF4-0xF7 */ ++ 0xA9, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ ++ 0x00, 0x00, 0x00, 0x00, 0xA9, 0xAD, 0x00, 0x00, /* 0xFC-0xFF */ ++}; ++ + static unsigned char u2c_01[512] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ +- 0xA9, 0xA2, 0xA9, 0xA2, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ ++ 0x00, 0x00, 0xA9, 0xA2, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ +@@ -4636,72 +4707,6 @@ + 0x00, 0x00, 0xAC, 0xD7, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ + }; + +-static unsigned char u2c_11[512] = { +- 0xA4, 0xA1, 0xA4, 0xA2, 0xA4, 0xA4, 0xA4, 0xA7, /* 0x00-0x03 */ +- 0xA4, 0xA8, 0xA4, 0xA9, 0xA4, 0xB1, 0xA4, 0xB2, /* 0x04-0x07 */ +- 0xA4, 0xB3, 0xA4, 0xB5, 0xA4, 0xB6, 0xA4, 0xB7, /* 0x08-0x0B */ +- 0xA4, 0xB8, 0xA4, 0xB9, 0xA4, 0xBA, 0xA4, 0xBB, /* 0x0C-0x0F */ +- 0xA4, 0xBC, 0xA4, 0xBD, 0xA4, 0xBE, 0x00, 0x00, /* 0x10-0x13 */ +- 0xA4, 0xD5, 0xA4, 0xD6, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xDD, 0x00, 0x00, /* 0x18-0x1B */ +- 0xA4, 0xDE, 0xA4, 0xE1, 0xA4, 0xE2, 0x00, 0x00, /* 0x1C-0x1F */ +- 0xA4, 0xE3, 0xA4, 0xB4, 0xA4, 0xE4, 0xA4, 0xE5, /* 0x20-0x23 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xE6, /* 0x24-0x27 */ +- 0x00, 0x00, 0xA4, 0xE7, 0x00, 0x00, 0xA4, 0xE8, /* 0x28-0x2B */ +- 0xA4, 0xE9, 0xA4, 0xEA, 0xA4, 0xEB, 0xA4, 0xEC, /* 0x2C-0x2F */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xED, 0x00, 0x00, /* 0x30-0x33 */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xEE, 0x00, 0x00, /* 0x34-0x37 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ +- 0xA4, 0xB5, 0xA4, 0xB6, 0xA4, 0xB5, 0xA4, 0xB6, /* 0x3C-0x3F */ +- 0xA4, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ +- 0x00, 0x00, 0xA4, 0xF2, 0xA4, 0xF3, 0xA4, 0xF0, /* 0x44-0x47 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ +- 0xA4, 0xB7, 0x00, 0x00, 0xA4, 0xB8, 0xA4, 0xB9, /* 0x4C-0x4F */ +- 0xA4, 0xB8, 0xA4, 0xB9, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ +- 0xA4, 0xBA, 0xA4, 0xBA, 0x00, 0x00, 0xA4, 0xF4, /* 0x54-0x57 */ +- 0xA4, 0xF5, 0xA4, 0xF6, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xD4, /* 0x5C-0x5F */ +- 0x00, 0x00, 0xA4, 0xBF, 0xA4, 0xC0, 0xA4, 0xC1, /* 0x60-0x63 */ +- 0xA4, 0xC2, 0xA4, 0xC3, 0xA4, 0xC4, 0xA4, 0xC5, /* 0x64-0x67 */ +- 0xA4, 0xC6, 0xA4, 0xC7, 0xA4, 0xC8, 0xA4, 0xC9, /* 0x68-0x6B */ +- 0xA4, 0xCA, 0xA4, 0xCB, 0xA4, 0xCC, 0xA4, 0xCD, /* 0x6C-0x6F */ +- 0xA4, 0xCE, 0xA4, 0xCF, 0xA4, 0xD0, 0xA4, 0xD1, /* 0x70-0x73 */ +- 0xA4, 0xD2, 0xA4, 0xD3, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ +- +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ +- 0xA4, 0xF7, 0xA4, 0xF8, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ +- 0xA4, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ +- 0x00, 0x00, 0xA4, 0xFA, 0xA4, 0xFB, 0x00, 0x00, /* 0x90-0x93 */ +- 0xA4, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xFD, 0x00, 0x00, /* 0x9C-0x9F */ +- 0x00, 0x00, 0xA4, 0xFE, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ +- 0xA4, 0xA1, 0xA4, 0xA2, 0xA4, 0xA3, 0xA4, 0xA4, /* 0xA8-0xAB */ +- 0xA4, 0xA5, 0xA4, 0xA6, 0xA4, 0xA7, 0xA4, 0xA9, /* 0xAC-0xAF */ +- 0xA4, 0xAA, 0xA4, 0xAB, 0xA4, 0xAC, 0xA4, 0xAD, /* 0xB0-0xB3 */ +- 0xA4, 0xAE, 0xA4, 0xAF, 0xA4, 0xB0, 0xA4, 0xB1, /* 0xB4-0xB7 */ +- 0xA4, 0xB2, 0xA4, 0xB4, 0xA4, 0xB5, 0xA4, 0xB6, /* 0xB8-0xBB */ +- 0xA4, 0xB7, 0xA4, 0xB8, 0xA4, 0xBA, 0xA4, 0xBB, /* 0xBC-0xBF */ +- 0xA4, 0xBC, 0xA4, 0xBD, 0xA4, 0xBE, 0x00, 0x00, /* 0xC0-0xC3 */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xD6, 0xA4, 0xD7, /* 0xC4-0xC7 */ +- 0xA4, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ +- 0xA4, 0xD9, 0x00, 0x00, 0xA4, 0xDA, 0x00, 0x00, /* 0xCC-0xCF */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xDB, /* 0xD0-0xD3 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xDC, /* 0xD4-0xD7 */ +- 0x00, 0x00, 0xA4, 0xDD, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ +- 0xA4, 0xDE, 0xA4, 0xDF, 0x00, 0x00, 0xA4, 0xE0, /* 0xDC-0xDF */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xE8, 0xA4, 0xEA, /* 0xE4-0xE7 */ +- 0xA4, 0xEC, 0x00, 0x00, 0xA4, 0xED, 0xA4, 0xEF, /* 0xE8-0xEB */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xF0, 0x00, 0x00, /* 0xEC-0xEF */ +- 0xA4, 0xB7, 0xA4, 0xF2, 0xA4, 0xF3, 0x00, 0x00, /* 0xF0-0xF3 */ +- 0xA4, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF4-0xF7 */ +- 0x00, 0x00, 0xA4, 0xF6, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ +-}; + + static unsigned char u2c_20[512] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ +@@ -4747,7 +4752,8 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ +- 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ ++ 0xA2, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ + }; + + static unsigned char u2c_21[512] = { +@@ -4909,13 +4915,13 @@ + 0xA9, 0xD9, 0xA9, 0xDA, 0xA9, 0xDB, 0xA9, 0xDC, /* 0xA8-0xAB */ + 0xA9, 0xDD, 0xA9, 0xDE, 0xA9, 0xDF, 0xA9, 0xE0, /* 0xAC-0xAF */ + 0xA9, 0xE1, 0xA9, 0xE2, 0xA9, 0xE3, 0xA9, 0xE4, /* 0xB0-0xB3 */ +- 0xA9, 0xE5, 0xA9, 0xE6, 0xA8, 0xCD, 0xA8, 0xCE, /* 0xB4-0xB7 */ +- 0xA8, 0xCF, 0xA8, 0xD0, 0xA8, 0xD1, 0xA8, 0xD2, /* 0xB8-0xBB */ +- 0xA8, 0xD3, 0xA8, 0xD4, 0xA8, 0xD5, 0xA8, 0xD6, /* 0xBC-0xBF */ +- 0xA8, 0xD7, 0xA8, 0xD8, 0xA8, 0xD9, 0xA8, 0xDA, /* 0xC0-0xC3 */ +- 0xA8, 0xDB, 0xA8, 0xDC, 0xA8, 0xDD, 0xA8, 0xDE, /* 0xC4-0xC7 */ +- 0xA8, 0xDF, 0xA8, 0xE0, 0xA8, 0xE1, 0xA8, 0xE2, /* 0xC8-0xCB */ +- 0xA8, 0xE3, 0xA8, 0xE4, 0xA8, 0xE5, 0xA8, 0xE6, /* 0xCC-0xCF */ ++ 0xA9, 0xE5, 0xA9, 0xE6, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ + 0xA8, 0xCD, 0xA8, 0xCE, 0xA8, 0xCF, 0xA8, 0xD0, /* 0xD0-0xD3 */ + 0xA8, 0xD1, 0xA8, 0xD2, 0xA8, 0xD3, 0xA8, 0xD4, /* 0xD4-0xD7 */ + 0xA8, 0xD5, 0xA8, 0xD6, 0xA8, 0xD7, 0xA8, 0xD8, /* 0xD8-0xDB */ +@@ -5117,10 +5123,6 @@ + 0xA4, 0xF4, 0xA4, 0xF5, 0xA4, 0xF6, 0xA4, 0xF7, /* 0x84-0x87 */ + 0xA4, 0xF8, 0xA4, 0xF9, 0xA4, 0xFA, 0xA4, 0xFB, /* 0x88-0x8B */ + 0xA4, 0xFC, 0xA4, 0xFD, 0xA4, 0xFE, 0x00, 0x00, /* 0x8C-0x8F */ +- 0x00, 0x00, 0x00, 0x00, 0xEC, 0xE9, 0xEC, 0xA3, /* 0x90-0x93 */ +- 0xDF, 0xB2, 0xDE, 0xCC, 0xDF, 0xBE, 0xF1, 0xE9, /* 0x94-0x97 */ +- 0xF9, 0xBB, 0xCB, 0xA3, 0xEB, 0xE0, 0xDC, 0xB0, /* 0x98-0x9B */ +- 0xEF, 0xCB, 0xF4, 0xB8, 0xF2, 0xA2, 0xEC, 0xD1, /* 0x9C-0x9F */ + }; + + static unsigned char u2c_32[512] = { +@@ -5132,15 +5134,15 @@ + 0xA9, 0xC5, 0xA9, 0xC6, 0xA9, 0xC7, 0xA9, 0xC8, /* 0x14-0x17 */ + 0xA9, 0xC9, 0xA9, 0xCA, 0xA9, 0xCB, 0xA9, 0xCC, /* 0x18-0x1B */ + 0xA2, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ +- 0xEC, 0xE9, 0xEC, 0xA3, 0xDF, 0xB2, 0xDE, 0xCC, /* 0x20-0x23 */ +- 0xE7, 0xE9, 0xD7, 0xBF, 0xF6, 0xD2, 0xF8, 0xA2, /* 0x24-0x27 */ +- 0xCE, 0xFA, 0xE4, 0xA8, 0xEA, 0xC5, 0xFB, 0xFD, /* 0x28-0x2B */ +- 0xE2, 0xA9, 0xD9, 0xCA, 0xD1, 0xD1, 0xF7, 0xCF, /* 0x2C-0x2F */ +- 0xEC, 0xED, 0xF1, 0xBB, 0xEA, 0xF3, 0xDE, 0xE4, /* 0x30-0x33 */ +- 0xD9, 0xA3, 0xF7, 0xE5, 0xEE, 0xAF, 0xF5, 0xE6, /* 0x34-0x37 */ +- 0xD6, 0xCC, 0xD3, 0xDB, 0xFB, 0xBC, 0xF9, 0xCA, /* 0x38-0x3B */ +- 0xCA, 0xF8, 0xD0, 0xEA, 0xED, 0xC0, 0xFA, 0xF0, /* 0x3C-0x3F */ +- 0xF0, 0xAE, 0xFD, 0xCC, 0xED, 0xBB, 0xF2, 0xB8, /* 0x40-0x43 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ +@@ -5156,20 +5158,6 @@ + 0xA8, 0xC5, 0xA8, 0xC6, 0xA8, 0xC7, 0xA8, 0xC8, /* 0x74-0x77 */ + 0xA8, 0xC9, 0xA8, 0xCA, 0xA8, 0xCB, 0xA8, 0xCC, /* 0x78-0x7B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xDE, /* 0x7C-0x7F */ +- +- 0xEC, 0xE9, 0xEC, 0xA3, 0xDF, 0xB2, 0xDE, 0xCC, /* 0x80-0x83 */ +- 0xE7, 0xE9, 0xD7, 0xBF, 0xF6, 0xD2, 0xF8, 0xA2, /* 0x84-0x87 */ +- 0xCE, 0xFA, 0xE4, 0xA8, 0xEA, 0xC5, 0xFB, 0xFD, /* 0x88-0x8B */ +- 0xE2, 0xA9, 0xD9, 0xCA, 0xD1, 0xD1, 0xF7, 0xCF, /* 0x8C-0x8F */ +- 0xEC, 0xED, 0xF1, 0xBB, 0xEA, 0xF3, 0xDE, 0xE4, /* 0x90-0x93 */ +- 0xD9, 0xA3, 0xF7, 0xE5, 0xEE, 0xAF, 0xF5, 0xE6, /* 0x94-0x97 */ +- 0xD6, 0xCC, 0xDD, 0xFA, 0xD1, 0xFB, 0xD2, 0xB3, /* 0x98-0x9B */ +- 0xEE, 0xEA, 0xE9, 0xD0, 0xEC, 0xD4, 0xF1, 0xBC, /* 0x9C-0x9F */ +- 0xFA, 0xA3, 0xFD, 0xCC, 0xDE, 0xD0, 0xEF, 0xE1, /* 0xA0-0xA3 */ +- 0xDF, 0xBE, 0xF1, 0xE9, 0xF9, 0xBB, 0xF1, 0xA7, /* 0xA4-0xA7 */ +- 0xE9, 0xD3, 0xEC, 0xA2, 0xF0, 0xF3, 0xF9, 0xCA, /* 0xA8-0xAB */ +- 0xCA, 0xF8, 0xD0, 0xEA, 0xED, 0xC0, 0xFA, 0xF0, /* 0xAC-0xAF */ +- 0xE5, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ + }; + + static unsigned char u2c_33[512] = { +@@ -13603,10 +13591,6 @@ + 0xC6, 0x4F, 0xC6, 0x50, 0xC6, 0x51, 0xC6, 0x52, /* 0xA0-0xA3 */ + }; + +-static unsigned char u2c_DC[512] = { +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ +-}; +- + static unsigned char u2c_F9[512] = { + 0xCB, 0xD0, 0xCB, 0xD6, 0xCB, 0xE7, 0xCD, 0xCF, /* 0x00-0x03 */ + 0xCD, 0xE8, 0xCE, 0xAD, 0xCF, 0xFB, 0xD0, 0xA2, /* 0x04-0x07 */ +@@ -13679,15 +13663,6 @@ + 0xF4, 0xEE, 0xF6, 0xF4, 0xF6, 0xF6, 0xF7, 0xB8, /* 0x00-0x03 */ + 0xF7, 0xC8, 0xF7, 0xD3, 0xF8, 0xDB, 0xF8, 0xF0, /* 0x04-0x07 */ + 0xFA, 0xA1, 0xFA, 0xA2, 0xFA, 0xE6, 0xFC, 0xA9, /* 0x08-0x0B */ +- 0xE8, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ +- 0xF5, 0xC0, 0x00, 0x00, 0xF4, 0xE7, 0x00, 0x00, /* 0x10-0x13 */ +- 0x00, 0x00, 0xFD, 0xEB, 0x00, 0x00, 0xEC, 0xCC, /* 0x14-0x17 */ +- 0x00, 0x00, 0xE3, 0xEA, 0xDF, 0xD4, 0xDC, 0xD8, /* 0x18-0x1B */ +- 0xEF, 0xFE, 0xEF, 0xF1, 0xE9, 0xE2, 0x00, 0x00, /* 0x1C-0x1F */ +- 0x00, 0x00, 0x00, 0x00, 0xF0, 0xB3, 0x00, 0x00, /* 0x20-0x23 */ +- 0x00, 0x00, 0xEC, 0xEF, 0xD4, 0xB4, 0x00, 0x00, /* 0x24-0x27 */ +- 0x00, 0x00, 0x00, 0x00, 0xDA, 0xF9, 0xDE, 0xF8, /* 0x28-0x2B */ +- 0xCE, 0xBD, 0xF9, 0xCD, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ + }; + + static unsigned char u2c_FF[512] = { +@@ -13732,30 +13707,30 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ +- 0xA4, 0xD4, 0xA4, 0xA1, 0xA4, 0xA2, 0xA4, 0xA3, /* 0xA0-0xA3 */ +- 0xA4, 0xA4, 0xA4, 0xA5, 0xA4, 0xA6, 0xA4, 0xA7, /* 0xA4-0xA7 */ +- 0xA4, 0xA8, 0xA4, 0xA9, 0xA4, 0xAA, 0xA4, 0xAB, /* 0xA8-0xAB */ +- 0xA4, 0xAC, 0xA4, 0xAD, 0xA4, 0xAE, 0xA4, 0xAF, /* 0xAC-0xAF */ +- 0xA4, 0xB0, 0xA4, 0xB1, 0xA4, 0xB2, 0xA4, 0xB3, /* 0xB0-0xB3 */ +- 0xA4, 0xB4, 0xA4, 0xB5, 0xA4, 0xB6, 0xA4, 0xB7, /* 0xB4-0xB7 */ +- 0xA4, 0xB8, 0xA4, 0xB9, 0xA4, 0xBA, 0xA4, 0xBB, /* 0xB8-0xBB */ +- 0xA4, 0xBC, 0xA4, 0xBD, 0xA4, 0xBE, 0x00, 0x00, /* 0xBC-0xBF */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xBF, 0xA4, 0xC0, /* 0xC0-0xC3 */ +- 0xA4, 0xC1, 0xA4, 0xC2, 0xA4, 0xC3, 0xA4, 0xC4, /* 0xC4-0xC7 */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xC5, 0xA4, 0xC6, /* 0xC8-0xCB */ +- 0xA4, 0xC7, 0xA4, 0xC8, 0xA4, 0xC9, 0xA4, 0xCA, /* 0xCC-0xCF */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xCB, 0xA4, 0xCC, /* 0xD0-0xD3 */ +- 0xA4, 0xCD, 0xA4, 0xCE, 0xA4, 0xCF, 0xA4, 0xD0, /* 0xD4-0xD7 */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xD1, 0xA4, 0xD2, /* 0xD8-0xDB */ +- 0xA4, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD4-0xD7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ + 0xA1, 0xCB, 0xA1, 0xCC, 0xA1, 0xFE, 0xA3, 0xFE, /* 0xE0-0xE3 */ + 0x00, 0x00, 0xA1, 0xCD, 0xA3, 0xDC, 0x00, 0x00, /* 0xE4-0xE7 */ + }; + + static unsigned char *page_uni2charset[256] = { +- NULL, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, ++ u2c_00, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +- NULL, u2c_11, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + u2c_20, u2c_21, u2c_22, u2c_23, u2c_24, u2c_25, u2c_26, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +@@ -13780,11 +13755,12 @@ + u2c_C0, u2c_C1, u2c_C2, u2c_C3, u2c_C4, u2c_C5, u2c_C6, u2c_C7, + u2c_C8, u2c_C9, u2c_CA, u2c_CB, u2c_CC, u2c_CD, u2c_CE, u2c_CF, + u2c_D0, u2c_D1, u2c_D2, u2c_D3, u2c_D4, u2c_D5, u2c_D6, u2c_D7, +- NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +- NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, NULL, u2c_FF, }; ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, NULL, u2c_FF, ++}; + + static unsigned char charset2lower[256] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */ +@@ -13870,24 +13846,26 @@ + return -ENAMETOOLONG; + + +- uni2charset = page_uni2charset[ch]; +- if (uni2charset) { +- if (boundlen <= 1) +- return -ENAMETOOLONG; +- out[0] = uni2charset[cl*2]; +- out[1] = uni2charset[cl*2+1]; +- if (out[0] == 0x00 && out[1] == 0x00) ++ if (ch==0 && cl<0x80) { ++ out[0] = cl; ++ n = 1; ++ } else { ++ uni2charset = page_uni2charset[ch]; ++ if (uni2charset) { ++ if (boundlen <= 1) ++ return -ENAMETOOLONG; ++ out[0] = uni2charset[cl*2]; ++ out[1] = uni2charset[cl*2+1]; ++ if (out[0] == 0x00 && out[1] == 0x00) ++ return -EINVAL; ++ n = 2; ++ } ++ else + return -EINVAL; +- n = 2; +- } else if (ch==0 && cl) { +- out[0] = cl; +- n = 1; +- } +- else +- return -EINVAL; + + return n; +-} ++ } ++} + + static int char2uni(const unsigned char *rawstring, int boundlen, + wchar_t *uni) +@@ -13908,7 +13886,7 @@ + cl = rawstring[1]; + + charset2uni = page_charset2uni[ch]; +- if (charset2uni && cl) { ++ if (charset2uni && ((rawstring[1]>=0x41 && rawstring[1]<=0x5A) || (rawstring[1]>=0x61 && rawstring[1]<=0x7A) || (rawstring[1]>=0x81 && rawstring[1]<=0xFE)) && cl) { + *uni = charset2uni[cl]; + if (*uni == 0x0000) + return -EINVAL; +@@ -13943,20 +13921,4 @@ + module_exit(exit_nls_cp949) + MODULE_LICENSE("Dual BSD/GPL"); + +-/* +- * Overrides for Emacs so that we follow Linus's tabbing style. +- * Emacs will notice this stuff at the end of the file and automatically +- * adjust the settings for this buffer only. This must remain at the end +- * of the file. +- * +---------------------------------------------------------------------------- +- * Local variables: +- * c-indent-level: 8 +- * c-brace-imaginary-offset: 0 +- * c-brace-offset: -8 +- * c-argdecl-indent: 8 +- * c-label-offset: -8 +- * c-continued-statement-offset: 8 +- * c-continued-brace-offset: 0 +- * End: +- */ ++ +--- R29/fs/nls/nls_cp950.c 2004-03-24 19:56:03.000000000 +0000 ++++ R63/fs/nls/nls_cp950.c 2005-08-09 05:43:19.000000000 +0100 +@@ -3,8 +3,10 @@ + * + * Charset cp950 translation tables. + * This translation table was generated automatically, the +- * original table can be download from the Microsoft website. +- * (http://www.microsoft.com/typography/unicode/unicodecp.htm) ++ * original table can be found at the Microsoft website. ++ * (http://www.microsoft.com/globaldev/reference/dbcs/950.htm) ++ * download CP950.TXT from MIT Edu website ++ * (http://web.mit.edu/afs/dev.mit.edu/source/src-current/third/libiconv/tests/CP950.TXT) + */ + + #include +@@ -23,29 +25,29 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x3000,0xFF0C,0x3001,0x3002,0xFF0E,0x2027,0xFF1B,0xFF1A,/* 0x40-0x47 */ +- 0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFF64,0xFE52,/* 0x48-0x4F */ ++ 0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFE51,0xFE52,/* 0x48-0x4F */ + 0x00B7,0xFE54,0xFE55,0xFE56,0xFE57,0xFF5C,0x2013,0xFE31,/* 0x50-0x57 */ + 0x2014,0xFE33,0x2574,0xFE34,0xFE4F,0xFF08,0xFF09,0xFE35,/* 0x58-0x5F */ +- 0xFE36,0xFF5B,0xFF5D,0xFE37,0xFE38,0xFF3B,0xFF3D,0xFE39,/* 0x60-0x67 */ ++ 0xFE36,0xFF5B,0xFF5D,0xFE37,0xFE38,0x3014,0x3015,0xFE39,/* 0x60-0x67 */ + 0xFE3A,0x3010,0x3011,0xFE3B,0xFE3C,0x300A,0x300B,0xFE3D,/* 0x68-0x6F */ +- 0xFE3E,0x3008,0x3009,0xFF3E,0xFE40,0x300C,0x300D,0xFE41,/* 0x70-0x77 */ ++ 0xFE3E,0x3008,0x3009,0xFE3F,0xFE40,0x300C,0x300D,0xFE41,/* 0x70-0x77 */ + 0xFE42,0x300E,0x300F,0xFE43,0xFE44,0xFE59,0xFE5A,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0xFE5B,0xFE5C,0xFE5D,0xFE5E,0xFF40,0xFF07,0x201C,/* 0xA0-0xA7 */ +- 0xFF02,0x301D,0x301E,0x2035,0x2032,0xFF03,0xFF06,0xFF0A,/* 0xA8-0xAF */ ++ 0x0000,0xFE5B,0xFE5C,0xFE5D,0xFE5E,0x2018,0x2019,0x201C,/* 0xA0-0xA7 */ ++ 0x201D,0x301D,0x301E,0x2035,0x2032,0xFF03,0xFF06,0xFF0A,/* 0xA8-0xAF */ + 0x203B,0x00A7,0x3003,0x25CB,0x25CF,0x25B3,0x25B2,0x25CE,/* 0xB0-0xB7 */ + 0x2606,0x2605,0x25C7,0x25C6,0x25A1,0x25A0,0x25BD,0x25BC,/* 0xB8-0xBF */ +- 0x32A3,0x2105,0x0305,0xFFE3,0xFF3F,0x02CD,0xFE49,0xFE4A,/* 0xC0-0xC7 */ ++ 0x32A3,0x2105,0x00AF,0xFFE3,0xFF3F,0x02CD,0xFE49,0xFE4A,/* 0xC0-0xC7 */ + 0xFE4D,0xFE4E,0xFE4B,0xFE4C,0xFE5F,0xFE60,0xFE61,0xFF0B,/* 0xC8-0xCF */ + 0xFF0D,0x00D7,0x00F7,0x00B1,0x221A,0xFF1C,0xFF1E,0xFF1D,/* 0xD0-0xD7 */ +- 0x2266,0x2267,0x2260,0x221E,0x2252,0x2263,0xFE62,0xFE63,/* 0xD8-0xDF */ ++ 0x2266,0x2267,0x2260,0x221E,0x2252,0x2261,0xFE62,0xFE63,/* 0xD8-0xDF */ + 0xFE64,0xFE65,0xFE66,0xFF5E,0x2229,0x222A,0x22A5,0x2220,/* 0xE0-0xE7 */ + 0x221F,0x22BF,0x33D2,0x33D1,0x222B,0x222E,0x2235,0x2234,/* 0xE8-0xEF */ +- 0x2640,0x2642,0x2641,0x2609,0x2191,0x2193,0x2190,0x2192,/* 0xF0-0xF7 */ ++ 0x2640,0x2642,0x2295,0x2299,0x2191,0x2193,0x2190,0x2192,/* 0xF0-0xF7 */ + 0x2196,0x2197,0x2199,0x2198,0x2225,0x2223,0xFF0F,0x0000,/* 0xF8-0xFF */ + }; + +@@ -61,7 +63,7 @@ + 0xFF3C,0x2215,0xFE68,0xFF04,0xFFE5,0x3012,0xFFE0,0xFFE1,/* 0x40-0x47 */ + 0xFF05,0xFF20,0x2103,0x2109,0xFE69,0xFE6A,0xFE6B,0x33D5,/* 0x48-0x4F */ + 0x339C,0x339D,0x339E,0x33CE,0x33A1,0x338E,0x338F,0x33C4,/* 0x50-0x57 */ +- 0x2218,0x5159,0x515B,0x515E,0x515D,0x5161,0x5163,0x55E7,/* 0x58-0x5F */ ++ 0x00B0,0x5159,0x515B,0x515E,0x515D,0x5161,0x5163,0x55E7,/* 0x58-0x5F */ + 0x74E9,0x7CCE,0x2581,0x2582,0x2583,0x2584,0x2585,0x2586,/* 0x60-0x67 */ + 0x2587,0x2588,0x258F,0x258E,0x258D,0x258C,0x258B,0x258A,/* 0x68-0x6F */ + 0x2589,0x253C,0x2534,0x252C,0x2524,0x251C,0x2594,0x2500,/* 0x70-0x77 */ +@@ -71,12 +73,12 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x256E,0x2570,0x256F,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ ++ 0x0000,0x256E,0x2570,0x256F,0x2550,0x255E,0x256A,0x2561,/* 0xA0-0xA7 */ + 0x25E2,0x25E3,0x25E5,0x25E4,0x2571,0x2572,0x2573,0xFF10,/* 0xA8-0xAF */ + 0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17,0xFF18,/* 0xB0-0xB7 */ + 0xFF19,0x2160,0x2161,0x2162,0x2163,0x2164,0x2165,0x2166,/* 0xB8-0xBF */ + 0x2167,0x2168,0x2169,0x3021,0x3022,0x3023,0x3024,0x3025,/* 0xC0-0xC7 */ +- 0x3026,0x3027,0x3028,0x3029,0x0000,0x5344,0x0000,0xFF21,/* 0xC8-0xCF */ ++ 0x3026,0x3027,0x3028,0x3029,0x5341,0x5344,0x5345,0xFF21,/* 0xC8-0xCF */ + 0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,0xFF28,0xFF29,/* 0xD0-0xD7 */ + 0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,0xFF30,0xFF31,/* 0xD8-0xDF */ + 0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,0xFF38,0xFF39,/* 0xE0-0xE7 */ +@@ -110,15 +112,7 @@ + 0x0000,0x3110,0x3111,0x3112,0x3113,0x3114,0x3115,0x3116,/* 0xA0-0xA7 */ + 0x3117,0x3118,0x3119,0x311A,0x311B,0x311C,0x311D,0x311E,/* 0xA8-0xAF */ + 0x311F,0x3120,0x3121,0x3122,0x3123,0x3124,0x3125,0x3126,/* 0xB0-0xB7 */ +- 0x3127,0x3128,0x3129,0x2024,0x02C9,0x02CA,0x02C7,0x02CB,/* 0xB8-0xBF */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC0-0xC7 */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC8-0xCF */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD0-0xD7 */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD8-0xDF */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE0-0xE7 */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE8-0xEF */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF0-0xF7 */ +- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF8-0xFF */ ++ 0x3127,0x3128,0x3129,0x02D9,0x02C9,0x02CA,0x02C7,0x02CB,/* 0xB8-0xBF */ + }; + + static wchar_t c2u_A4[256] = { +@@ -130,12 +124,12 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x4E00,0x4E59,0x4E01,0x4E03,0x4E43,0x4E5D,0xF9BA,0x4E8C,/* 0x40-0x47 */ +- 0x4EBA,0x513F,0x5165,0x516B,0x51E0,0x5200,0x5201,0xF98A,/* 0x48-0x4F */ ++ 0x4E00,0x4E59,0x4E01,0x4E03,0x4E43,0x4E5D,0x4E86,0x4E8C,/* 0x40-0x47 */ ++ 0x4EBA,0x513F,0x5165,0x516B,0x51E0,0x5200,0x5201,0x529B,/* 0x48-0x4F */ + 0x5315,0x5341,0x535C,0x53C8,0x4E09,0x4E0B,0x4E08,0x4E0A,/* 0x50-0x57 */ + 0x4E2B,0x4E38,0x51E1,0x4E45,0x4E48,0x4E5F,0x4E5E,0x4E8E,/* 0x58-0x5F */ + 0x4EA1,0x5140,0x5203,0x52FA,0x5343,0x53C9,0x53E3,0x571F,/* 0x60-0x67 */ +- 0x58EB,0x5915,0x5927,0xF981,0x5B50,0x5B51,0x5B53,0x5BF8,/* 0x68-0x6F */ ++ 0x58EB,0x5915,0x5927,0x5973,0x5B50,0x5B51,0x5B53,0x5BF8,/* 0x68-0x6F */ + 0x5C0F,0x5C22,0x5C38,0x5C71,0x5DDD,0x5DE5,0x5DF1,0x5DF2,/* 0x70-0x77 */ + 0x5DF3,0x5DFE,0x5E72,0x5EFE,0x5F0B,0x5F13,0x624D,0x0000,/* 0x78-0x7F */ + +@@ -143,11 +137,11 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x4E11,0x4E10,0xF967,0x4E2D,0x4E30,0xF95E,0x4E4B,/* 0xA0-0xA7 */ ++ 0x0000,0x4E11,0x4E10,0x4E0D,0x4E2D,0x4E30,0x4E39,0x4E4B,/* 0xA0-0xA7 */ + 0x5C39,0x4E88,0x4E91,0x4E95,0x4E92,0x4E94,0x4EA2,0x4EC1,/* 0xA8-0xAF */ +- 0xF9FD,0x4EC3,0x4EC6,0x4EC7,0x4ECD,0x4ECA,0x4ECB,0x4EC4,/* 0xB0-0xB7 */ +- 0x5143,0x5141,0x5167,0xF9D1,0x516E,0x516C,0x5197,0x51F6,/* 0xB8-0xBF */ +- 0x5206,0xFA00,0x5208,0x52FB,0x52FE,0x52FF,0x5316,0x5339,/* 0xC0-0xC7 */ ++ 0x4EC0,0x4EC3,0x4EC6,0x4EC7,0x4ECD,0x4ECA,0x4ECB,0x4EC4,/* 0xB0-0xB7 */ ++ 0x5143,0x5141,0x5167,0x516D,0x516E,0x516C,0x5197,0x51F6,/* 0xB8-0xBF */ ++ 0x5206,0x5207,0x5208,0x52FB,0x52FE,0x52FF,0x5316,0x5339,/* 0xC0-0xC7 */ + 0x5348,0x5347,0x5345,0x535E,0x5384,0x53CB,0x53CA,0x53CD,/* 0xC8-0xCF */ + 0x58EC,0x5929,0x592B,0x592A,0x592D,0x5B54,0x5C11,0x5C24,/* 0xD0-0xD7 */ + 0x5C3A,0x5C6F,0x5DF4,0x5E7B,0x5EFF,0x5F14,0x5F15,0x5FC3,/* 0xD8-0xDF */ +@@ -167,13 +161,13 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x4E16,0x4E15,0x4E14,0x4E18,0x4E3B,0x4E4D,0x4E4F,0x4E4E,/* 0x40-0x47 */ +- 0x4EE5,0x4ED8,0x4ED4,0x4ED5,0x4ED6,0x4ED7,0x4EE3,0xF9A8,/* 0x48-0x4F */ ++ 0x4EE5,0x4ED8,0x4ED4,0x4ED5,0x4ED6,0x4ED7,0x4EE3,0x4EE4,/* 0x48-0x4F */ + 0x4ED9,0x4EDE,0x5145,0x5144,0x5189,0x518A,0x51AC,0x51F9,/* 0x50-0x57 */ +- 0x51FA,0x51F8,0x520A,0x52A0,0x529F,0x5305,0x5306,0xF963,/* 0x58-0x5F */ ++ 0x51FA,0x51F8,0x520A,0x52A0,0x529F,0x5305,0x5306,0x5317,/* 0x58-0x5F */ + 0x531D,0x4EDF,0x534A,0x5349,0x5361,0x5360,0x536F,0x536E,/* 0x60-0x67 */ + 0x53BB,0x53EF,0x53E4,0x53F3,0x53EC,0x53EE,0x53E9,0x53E8,/* 0x68-0x6F */ + 0x53FC,0x53F8,0x53F5,0x53EB,0x53E6,0x53EA,0x53F2,0x53F1,/* 0x70-0x77 */ +- 0x53F0,0xF906,0x53ED,0x53FB,0x56DB,0x56DA,0x5916,0x0000,/* 0x78-0x7F */ ++ 0x53F0,0x53E5,0x53ED,0x53FB,0x56DB,0x56DA,0x5916,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ +@@ -186,7 +180,7 @@ + 0x6BCD,0x6C11,0x6C10,0x6C38,0x6C41,0x6C40,0x6C3E,0x72AF,/* 0xC0-0xC7 */ + 0x7384,0x7389,0x74DC,0x74E6,0x7518,0x751F,0x7528,0x7529,/* 0xC8-0xCF */ + 0x7530,0x7531,0x7532,0x7533,0x758B,0x767D,0x76AE,0x76BF,/* 0xD0-0xD7 */ +- 0x76EE,0x77DB,0x77E2,0x77F3,0x793A,0x79BE,0x7A74,0xF9F7,/* 0xD8-0xDF */ ++ 0x76EE,0x77DB,0x77E2,0x77F3,0x793A,0x79BE,0x7A74,0x7ACB,/* 0xD8-0xDF */ + 0x4E1E,0x4E1F,0x4E52,0x4E53,0x4E69,0x4E99,0x4EA4,0x4EA6,/* 0xE0-0xE7 */ + 0x4EA5,0x4EFF,0x4F09,0x4F19,0x4F0A,0x4F15,0x4F0D,0x4F10,/* 0xE8-0xEF */ + 0x4F11,0x4F0F,0x4EF2,0x4EF6,0x4EFB,0x4EF0,0x4EF3,0x4EFD,/* 0xF0-0xF7 */ +@@ -202,14 +196,14 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x5171,0x518D,0x51B0,0xF99C,0x5211,0x5212,0x520E,0x5216,/* 0x40-0x47 */ +- 0xF99D,0x5308,0x5321,0x5320,0x5370,0x5371,0x5409,0xF9DE,/* 0x48-0x4F */ ++ 0x5171,0x518D,0x51B0,0x5217,0x5211,0x5212,0x520E,0x5216,/* 0x40-0x47 */ ++ 0x52A3,0x5308,0x5321,0x5320,0x5370,0x5371,0x5409,0x540F,/* 0x48-0x4F */ + 0x540C,0x540A,0x5410,0x5401,0x540B,0x5404,0x5411,0x540D,/* 0x50-0x57 */ + 0x5408,0x5403,0x540E,0x5406,0x5412,0x56E0,0x56DE,0x56DD,/* 0x58-0x5F */ + 0x5733,0x5730,0x5728,0x572D,0x572C,0x572F,0x5729,0x5919,/* 0x60-0x67 */ + 0x591A,0x5937,0x5938,0x5984,0x5978,0x5983,0x597D,0x5979,/* 0x68-0x6F */ +- 0x5982,0x5981,0x5B57,0x5B58,0x5B87,0x5B88,0xFA04,0x5B89,/* 0x70-0x77 */ +- 0x5BFA,0x5C16,0x5C79,0x5DDE,0x5E06,0x5E76,0xF98E,0x0000,/* 0x78-0x7F */ ++ 0x5982,0x5981,0x5B57,0x5B58,0x5B87,0x5B88,0x5B85,0x5B89,/* 0x70-0x77 */ ++ 0x5BFA,0x5C16,0x5C79,0x5DDE,0x5E06,0x5E76,0x5E74,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ +@@ -221,10 +215,10 @@ + 0x6B21,0x6B64,0x6B7B,0x6C16,0x6C5D,0x6C57,0x6C59,0x6C5F,/* 0xB8-0xBF */ + 0x6C60,0x6C50,0x6C55,0x6C61,0x6C5B,0x6C4D,0x6C4E,0x7070,/* 0xC0-0xC7 */ + 0x725F,0x725D,0x767E,0x7AF9,0x7C73,0x7CF8,0x7F36,0x7F8A,/* 0xC8-0xCF */ +- 0xFA1E,0xF934,0x8003,0x800C,0x8012,0x8033,0x807F,0x8089,/* 0xD0-0xD7 */ +- 0xF953,0x808C,0x81E3,0x81EA,0x81F3,0x81FC,0x820C,0x821B,/* 0xD8-0xDF */ +- 0x821F,0x826E,0x8272,0x827E,0x866B,0x8840,0xFA08,0x8863,/* 0xE0-0xE7 */ +- 0x897F,0x9621,0xF905,0x4EA8,0x4F4D,0x4F4F,0x4F47,0x4F57,/* 0xE8-0xEF */ ++ 0x7FBD,0x8001,0x8003,0x800C,0x8012,0x8033,0x807F,0x8089,/* 0xD0-0xD7 */ ++ 0x808B,0x808C,0x81E3,0x81EA,0x81F3,0x81FC,0x820C,0x821B,/* 0xD8-0xDF */ ++ 0x821F,0x826E,0x8272,0x827E,0x866B,0x8840,0x884C,0x8863,/* 0xE0-0xE7 */ ++ 0x897F,0x9621,0x4E32,0x4EA8,0x4F4D,0x4F4F,0x4F47,0x4F57,/* 0xE8-0xEF */ + 0x4F5E,0x4F34,0x4F5B,0x4F55,0x4F30,0x4F50,0x4F51,0x4F3D,/* 0xF0-0xF7 */ + 0x4F3A,0x4F38,0x4F43,0x4F54,0x4F3C,0x4F46,0x4F63,0x0000,/* 0xF8-0xFF */ + }; +@@ -239,10 +233,10 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x4F5C,0x4F60,0x4F2F,0x4F4E,0x4F36,0x4F59,0x4F5D,0x4F48,/* 0x40-0x47 */ +- 0x4F5A,0x514C,0x514B,0x514D,0x5175,0x51B6,0xF92E,0x5225,/* 0x48-0x4F */ +- 0x5224,0xF9DD,0x522A,0x5228,0x52AB,0x52A9,0x52AA,0x52AC,/* 0x50-0x57 */ +- 0x5323,0x5373,0xF91C,0xF9ED,0x542D,0x541E,0x543E,0x5426,/* 0x58-0x5F */ +- 0x544E,0x5427,0x5446,0x5443,0x5433,0x5448,0xF980,0x541B,/* 0x60-0x67 */ ++ 0x4F5A,0x514C,0x514B,0x514D,0x5175,0x51B6,0x51B7,0x5225,/* 0x48-0x4F */ ++ 0x5224,0x5229,0x522A,0x5228,0x52AB,0x52A9,0x52AA,0x52AC,/* 0x50-0x57 */ ++ 0x5323,0x5373,0x5375,0x541D,0x542D,0x541E,0x543E,0x5426,/* 0x58-0x5F */ ++ 0x544E,0x5427,0x5446,0x5443,0x5433,0x5448,0x5442,0x541B,/* 0x60-0x67 */ + 0x5429,0x544A,0x5439,0x543B,0x5438,0x542E,0x5435,0x5436,/* 0x68-0x6F */ + 0x5420,0x543C,0x5440,0x5431,0x542B,0x541F,0x542C,0x56EA,/* 0x70-0x77 */ + 0x56F0,0x56E4,0x56EB,0x574A,0x5751,0x5740,0x574D,0x0000,/* 0x78-0x7F */ +@@ -254,14 +248,14 @@ + 0x0000,0x5747,0x574E,0x573E,0x5750,0x574F,0x573B,0x58EF,/* 0xA0-0xA7 */ + 0x593E,0x599D,0x5992,0x59A8,0x599E,0x59A3,0x5999,0x5996,/* 0xA8-0xAF */ + 0x598D,0x59A4,0x5993,0x598A,0x59A5,0x5B5D,0x5B5C,0x5B5A,/* 0xB0-0xB7 */ +- 0x5B5B,0x5B8C,0x5B8B,0x5B8F,0x5C2C,0x5C40,0x5C41,0xF9BD,/* 0xB8-0xBF */ ++ 0x5B5B,0x5B8C,0x5B8B,0x5B8F,0x5C2C,0x5C40,0x5C41,0x5C3F,/* 0xB8-0xBF */ + 0x5C3E,0x5C90,0x5C91,0x5C94,0x5C8C,0x5DEB,0x5E0C,0x5E8F,/* 0xC0-0xC7 */ +- 0x5E87,0x5E8A,0x5EF7,0xF943,0x5F1F,0x5F64,0x5F62,0x5F77,/* 0xC8-0xCF */ ++ 0x5E87,0x5E8A,0x5EF7,0x5F04,0x5F1F,0x5F64,0x5F62,0x5F77,/* 0xC8-0xCF */ + 0x5F79,0x5FD8,0x5FCC,0x5FD7,0x5FCD,0x5FF1,0x5FEB,0x5FF8,/* 0xD0-0xD7 */ + 0x5FEA,0x6212,0x6211,0x6284,0x6297,0x6296,0x6280,0x6276,/* 0xD8-0xDF */ + 0x6289,0x626D,0x628A,0x627C,0x627E,0x6279,0x6273,0x6292,/* 0xE0-0xE7 */ + 0x626F,0x6298,0x626E,0x6295,0x6293,0x6291,0x6286,0x6539,/* 0xE8-0xEF */ +- 0x653B,0x6538,0x65F1,0xF901,0x675F,0xF9E1,0x674F,0x6750,/* 0xF0-0xF7 */ ++ 0x653B,0x6538,0x65F1,0x66F4,0x675F,0x674E,0x674F,0x6750,/* 0xF0-0xF7 */ + 0x6751,0x675C,0x6756,0x675E,0x6749,0x6746,0x6760,0x0000,/* 0xF8-0xFF */ + }; + +@@ -275,28 +269,28 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x6753,0x6757,0x6B65,0x6BCF,0x6C42,0x6C5E,0x6C99,0x6C81,/* 0x40-0x47 */ +- 0xF972,0x6C89,0x6C85,0x6C9B,0x6C6A,0x6C7A,0x6C90,0x6C70,/* 0x48-0x4F */ ++ 0x6C88,0x6C89,0x6C85,0x6C9B,0x6C6A,0x6C7A,0x6C90,0x6C70,/* 0x48-0x4F */ + 0x6C8C,0x6C68,0x6C96,0x6C92,0x6C7D,0x6C83,0x6C72,0x6C7E,/* 0x50-0x57 */ + 0x6C74,0x6C86,0x6C76,0x6C8D,0x6C94,0x6C98,0x6C82,0x7076,/* 0x58-0x5F */ +- 0x707C,0x707D,0x7078,0xF946,0x7261,0x7260,0x72C4,0x72C2,/* 0x60-0x67 */ ++ 0x707C,0x707D,0x7078,0x7262,0x7261,0x7260,0x72C4,0x72C2,/* 0x60-0x67 */ + 0x7396,0x752C,0x752B,0x7537,0x7538,0x7682,0x76EF,0x77E3,/* 0x68-0x6F */ + 0x79C1,0x79C0,0x79BF,0x7A76,0x7CFB,0x7F55,0x8096,0x8093,/* 0x70-0x77 */ +- 0x809D,0x8098,0x809B,0x809A,0x80B2,0xF97C,0x8292,0x0000,/* 0x78-0x7F */ ++ 0x809D,0x8098,0x809B,0x809A,0x80B2,0x826F,0x8292,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x828B,0x828D,0xFA0A,0x89D2,0x8A00,0x8C37,0x8C46,/* 0xA0-0xA7 */ +- 0x8C55,0x8C9D,0x8D64,0x8D70,0x8DB3,0x8EAB,0xF902,0x8F9B,/* 0xA8-0xAF */ +- 0xF971,0x8FC2,0x8FC6,0x8FC5,0x8FC4,0x5DE1,0x9091,0x90A2,/* 0xB0-0xB7 */ +- 0x90AA,0x90A6,0x90A3,0x9149,0x91C6,0xF9E9,0x9632,0xF9C6,/* 0xB8-0xBF */ ++ 0x0000,0x828B,0x828D,0x898B,0x89D2,0x8A00,0x8C37,0x8C46,/* 0xA0-0xA7 */ ++ 0x8C55,0x8C9D,0x8D64,0x8D70,0x8DB3,0x8EAB,0x8ECA,0x8F9B,/* 0xA8-0xAF */ ++ 0x8FB0,0x8FC2,0x8FC6,0x8FC5,0x8FC4,0x5DE1,0x9091,0x90A2,/* 0xB0-0xB7 */ ++ 0x90AA,0x90A6,0x90A3,0x9149,0x91C6,0x91CC,0x9632,0x962E,/* 0xB8-0xBF */ + 0x9631,0x962A,0x962C,0x4E26,0x4E56,0x4E73,0x4E8B,0x4E9B,/* 0xC0-0xC7 */ + 0x4E9E,0x4EAB,0x4EAC,0x4F6F,0x4F9D,0x4F8D,0x4F73,0x4F7F,/* 0xC8-0xCF */ +- 0x4F6C,0x4F9B,0xF9B5,0xF92D,0x4F83,0x4F70,0x4F75,0x4F88,/* 0xD0-0xD7 */ ++ 0x4F6C,0x4F9B,0x4F8B,0x4F86,0x4F83,0x4F70,0x4F75,0x4F88,/* 0xD0-0xD7 */ + 0x4F69,0x4F7B,0x4F96,0x4F7E,0x4F8F,0x4F91,0x4F7A,0x5154,/* 0xD8-0xDF */ +- 0x5152,0x5155,0xF978,0x5177,0x5176,0x5178,0x51BD,0x51FD,/* 0xE0-0xE7 */ +- 0x523B,0x5238,0x5237,0xF9FF,0x5230,0x522E,0x5236,0x5241,/* 0xE8-0xEF */ ++ 0x5152,0x5155,0x5169,0x5177,0x5176,0x5178,0x51BD,0x51FD,/* 0xE0-0xE7 */ ++ 0x523B,0x5238,0x5237,0x523A,0x5230,0x522E,0x5236,0x5241,/* 0xE8-0xEF */ + 0x52BE,0x52BB,0x5352,0x5354,0x5353,0x5351,0x5366,0x5377,/* 0xF0-0xF7 */ + 0x5378,0x5379,0x53D6,0x53D4,0x53D7,0x5473,0x5475,0x0000,/* 0xF8-0xFF */ + }; +@@ -314,7 +308,7 @@ + 0x5486,0x547C,0x5490,0x5471,0x5476,0x548C,0x549A,0x5462,/* 0x48-0x4F */ + 0x5468,0x548B,0x547D,0x548E,0x56FA,0x5783,0x5777,0x576A,/* 0x50-0x57 */ + 0x5769,0x5761,0x5766,0x5764,0x577C,0x591C,0x5949,0x5947,/* 0x58-0x5F */ +- 0xF90C,0x5944,0x5954,0x59BE,0x59BB,0x59D4,0x59B9,0x59AE,/* 0x60-0x67 */ ++ 0x5948,0x5944,0x5954,0x59BE,0x59BB,0x59D4,0x59B9,0x59AE,/* 0x60-0x67 */ + 0x59D1,0x59C6,0x59D0,0x59CD,0x59CB,0x59D3,0x59CA,0x59AF,/* 0x68-0x6F */ + 0x59B3,0x59D2,0x59C5,0x5B5F,0x5B64,0x5B63,0x5B97,0x5B9A,/* 0x70-0x77 */ + 0x5B98,0x5B9C,0x5B99,0x5B9B,0x5C1A,0x5C48,0x5C45,0x0000,/* 0x78-0x7F */ +@@ -327,13 +321,13 @@ + 0x5CB3,0x5E18,0x5E1A,0x5E16,0x5E15,0x5E1B,0x5E11,0x5E78,/* 0xA8-0xAF */ + 0x5E9A,0x5E97,0x5E9C,0x5E95,0x5E96,0x5EF6,0x5F26,0x5F27,/* 0xB0-0xB7 */ + 0x5F29,0x5F80,0x5F81,0x5F7F,0x5F7C,0x5FDD,0x5FE0,0x5FFD,/* 0xB8-0xBF */ +- 0xF9A3,0x5FFF,0x600F,0x6014,0x602F,0x6035,0x6016,0x602A,/* 0xC0-0xC7 */ ++ 0x5FF5,0x5FFF,0x600F,0x6014,0x602F,0x6035,0x6016,0x602A,/* 0xC0-0xC7 */ + 0x6015,0x6021,0x6027,0x6029,0x602B,0x601B,0x6216,0x6215,/* 0xC8-0xCF */ +- 0x623F,0x623E,0x6240,0x627F,0xF925,0x62CC,0x62C4,0x62BF,/* 0xD0-0xD7 */ +- 0x62C2,0x62B9,0x62D2,0x62DB,0x62AB,0xFA02,0x62D4,0x62CB,/* 0xD8-0xDF */ ++ 0x623F,0x623E,0x6240,0x627F,0x62C9,0x62CC,0x62C4,0x62BF,/* 0xD0-0xD7 */ ++ 0x62C2,0x62B9,0x62D2,0x62DB,0x62AB,0x62D3,0x62D4,0x62CB,/* 0xD8-0xDF */ + 0x62C8,0x62A8,0x62BD,0x62BC,0x62D0,0x62D9,0x62C7,0x62CD,/* 0xE0-0xE7 */ + 0x62B5,0x62DA,0x62B1,0x62D8,0x62D6,0x62D7,0x62C6,0x62AC,/* 0xE8-0xEF */ +- 0x62CE,0x653E,0x65A7,0x65BC,0x65FA,0x6614,0xF9E0,0x660C,/* 0xF0-0xF7 */ ++ 0x62CE,0x653E,0x65A7,0x65BC,0x65FA,0x6614,0x6613,0x660C,/* 0xF0-0xF7 */ + 0x6606,0x6602,0x660E,0x6600,0x660F,0x6615,0x660A,0x0000,/* 0xF8-0xFF */ + }; + +@@ -347,10 +341,10 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x6607,0x670D,0x670B,0x676D,0x678B,0x6795,0x6771,0x679C,/* 0x40-0x47 */ +- 0x6773,0x6777,0x6787,0x679D,0xF9F4,0x676F,0x6770,0x677F,/* 0x48-0x4F */ ++ 0x6773,0x6777,0x6787,0x679D,0x6797,0x676F,0x6770,0x677F,/* 0x48-0x4F */ + 0x6789,0x677E,0x6790,0x6775,0x679A,0x6793,0x677C,0x676A,/* 0x50-0x57 */ + 0x6772,0x6B23,0x6B66,0x6B67,0x6B7F,0x6C13,0x6C1B,0x6CE3,/* 0x58-0x5F */ +- 0x6CE8,0x6CF3,0x6CB1,0xF968,0xF9E3,0x6CB3,0x6CBD,0x6CBE,/* 0x60-0x67 */ ++ 0x6CE8,0x6CF3,0x6CB1,0x6CCC,0x6CE5,0x6CB3,0x6CBD,0x6CBE,/* 0x60-0x67 */ + 0x6CBC,0x6CE2,0x6CAB,0x6CD5,0x6CD3,0x6CB8,0x6CC4,0x6CB9,/* 0x68-0x6F */ + 0x6CC1,0x6CAE,0x6CD7,0x6CC5,0x6CF1,0x6CBF,0x6CBB,0x6CE1,/* 0x70-0x77 */ + 0x6CDB,0x6CCA,0x6CAC,0x6CEF,0x6CDC,0x6CD6,0x6CE0,0x0000,/* 0x78-0x7F */ +@@ -359,8 +353,8 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x7095,0x708E,0x7092,0x708A,0xF9FB,0x722C,0x722D,/* 0xA0-0xA7 */ +- 0x7238,0x7248,0x7267,0x7269,0xF9FA,0x72CE,0x72D9,0x72D7,/* 0xA8-0xAF */ ++ 0x0000,0x7095,0x708E,0x7092,0x708A,0x7099,0x722C,0x722D,/* 0xA0-0xA7 */ ++ 0x7238,0x7248,0x7267,0x7269,0x72C0,0x72CE,0x72D9,0x72D7,/* 0xA8-0xAF */ + 0x72D0,0x73A9,0x73A8,0x739F,0x73AB,0x73A5,0x753D,0x759D,/* 0xB0-0xB7 */ + 0x7599,0x759A,0x7684,0x76C2,0x76F2,0x76F4,0x77E5,0x77FD,/* 0xB8-0xBF */ + 0x793E,0x7940,0x7941,0x79C9,0x79C8,0x7A7A,0x7A79,0x7AFA,/* 0xC0-0xC7 */ +@@ -369,7 +363,7 @@ + 0x81FE,0x820D,0x82B3,0x829D,0x8299,0x82AD,0x82BD,0x829F,/* 0xD8-0xDF */ + 0x82B9,0x82B1,0x82AC,0x82A5,0x82AF,0x82B8,0x82A3,0x82B0,/* 0xE0-0xE7 */ + 0x82BE,0x82B7,0x864E,0x8671,0x521D,0x8868,0x8ECB,0x8FCE,/* 0xE8-0xEF */ +- 0x8FD4,0x8FD1,0x90B5,0x90B8,0x90B1,0x90B6,0x91C7,0xF90A,/* 0xF0-0xF7 */ ++ 0x8FD4,0x8FD1,0x90B5,0x90B8,0x90B1,0x90B6,0x91C7,0x91D1,/* 0xF0-0xF7 */ + 0x9577,0x9580,0x961C,0x9640,0x963F,0x963B,0x9644,0x0000,/* 0xF8-0xFF */ + }; + +@@ -382,14 +376,14 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x9642,0x96B9,0x96E8,0x9752,0x975E,0x4E9F,0x4EAD,0xF977,/* 0x40-0x47 */ +- 0x4FE1,0x4FB5,0x4FAF,0xF965,0x4FE0,0x4FD1,0x4FCF,0x4FDD,/* 0x48-0x4F */ ++ 0x9642,0x96B9,0x96E8,0x9752,0x975E,0x4E9F,0x4EAD,0x4EAE,/* 0x40-0x47 */ ++ 0x4FE1,0x4FB5,0x4FAF,0x4FBF,0x4FE0,0x4FD1,0x4FCF,0x4FDD,/* 0x48-0x4F */ + 0x4FC3,0x4FB6,0x4FD8,0x4FDF,0x4FCA,0x4FD7,0x4FAE,0x4FD0,/* 0x50-0x57 */ + 0x4FC4,0x4FC2,0x4FDA,0x4FCE,0x4FDE,0x4FB7,0x5157,0x5192,/* 0x58-0x5F */ + 0x5191,0x51A0,0x524E,0x5243,0x524A,0x524D,0x524C,0x524B,/* 0x60-0x67 */ + 0x5247,0x52C7,0x52C9,0x52C3,0x52C1,0x530D,0x5357,0x537B,/* 0x68-0x6F */ + 0x539A,0x53DB,0x54AC,0x54C0,0x54A8,0x54CE,0x54C9,0x54B8,/* 0x70-0x77 */ +- 0x54A6,0x54B3,0x54C7,0x54C2,0xF99E,0x54AA,0x54C1,0x0000,/* 0x78-0x7F */ ++ 0x54A6,0x54B3,0x54C7,0x54C2,0x54BD,0x54AA,0x54C1,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ +@@ -397,13 +391,13 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x54C4,0x54C8,0x54AF,0x54AB,0x54B1,0x54BB,0x54A9,/* 0xA0-0xA7 */ + 0x54A7,0x54BF,0x56FF,0x5782,0x578B,0x57A0,0x57A3,0x57A2,/* 0xA8-0xAF */ +- 0x57CE,0x57AE,0x5793,0x5955,0xF909,0x594F,0x594E,0x5950,/* 0xB0-0xB7 */ ++ 0x57CE,0x57AE,0x5793,0x5955,0x5951,0x594F,0x594E,0x5950,/* 0xB0-0xB7 */ + 0x59DC,0x59D8,0x59FF,0x59E3,0x59E8,0x5A03,0x59E5,0x59EA,/* 0xB8-0xBF */ + 0x59DA,0x59E6,0x5A01,0x59FB,0x5B69,0x5BA3,0x5BA6,0x5BA4,/* 0xC0-0xC7 */ + 0x5BA2,0x5BA5,0x5C01,0x5C4E,0x5C4F,0x5C4D,0x5C4B,0x5CD9,/* 0xC8-0xCF */ +- 0x5CD2,0x5DF7,0x5E1D,0x5E25,0x5E1F,0x5E7D,0x5EA0,0xFA01,/* 0xD0-0xD7 */ +- 0x5EFA,0x5F08,0x5F2D,0x5F65,0x5F88,0x5F85,0x5F8A,0xF9D8,/* 0xD8-0xDF */ +- 0x5F87,0x5F8C,0x5F89,0xF960,0x601D,0x6020,0x6025,0x600E,/* 0xE0-0xE7 */ ++ 0x5CD2,0x5DF7,0x5E1D,0x5E25,0x5E1F,0x5E7D,0x5EA0,0x5EA6,/* 0xD0-0xD7 */ ++ 0x5EFA,0x5F08,0x5F2D,0x5F65,0x5F88,0x5F85,0x5F8A,0x5F8B,/* 0xD8-0xDF */ ++ 0x5F87,0x5F8C,0x5F89,0x6012,0x601D,0x6020,0x6025,0x600E,/* 0xE0-0xE7 */ + 0x6028,0x604D,0x6070,0x6068,0x6062,0x6046,0x6043,0x606C,/* 0xE8-0xEF */ + 0x606B,0x606A,0x6064,0x6241,0x62DC,0x6316,0x6309,0x62FC,/* 0xF0-0xF7 */ + 0x62ED,0x6301,0x62EE,0x62FD,0x6307,0x62F1,0x62F7,0x0000,/* 0xF8-0xFF */ +@@ -418,27 +412,27 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x62EF,0x62EC,0xF973,0x62F4,0x6311,0x6302,0x653F,0x6545,/* 0x40-0x47 */ ++ 0x62EF,0x62EC,0x62FE,0x62F4,0x6311,0x6302,0x653F,0x6545,/* 0x40-0x47 */ + 0x65AB,0x65BD,0x65E2,0x6625,0x662D,0x6620,0x6627,0x662F,/* 0x48-0x4F */ + 0x661F,0x6628,0x6631,0x6624,0x66F7,0x67FF,0x67D3,0x67F1,/* 0x50-0x57 */ + 0x67D4,0x67D0,0x67EC,0x67B6,0x67AF,0x67F5,0x67E9,0x67EF,/* 0x58-0x5F */ + 0x67C4,0x67D1,0x67B4,0x67DA,0x67E5,0x67B8,0x67CF,0x67DE,/* 0x60-0x67 */ +- 0xF9C9,0x67B0,0x67D9,0x67E2,0x67DD,0x67D2,0x6B6A,0x6B83,/* 0x68-0x6F */ ++ 0x67F3,0x67B0,0x67D9,0x67E2,0x67DD,0x67D2,0x6B6A,0x6B83,/* 0x68-0x6F */ + 0x6B86,0x6BB5,0x6BD2,0x6BD7,0x6C1F,0x6CC9,0x6D0B,0x6D32,/* 0x70-0x77 */ +- 0x6D2A,0xF9CA,0x6D25,0x6D0C,0x6D31,0xFA05,0x6D17,0x0000,/* 0x78-0x7F */ ++ 0x6D2A,0x6D41,0x6D25,0x6D0C,0x6D31,0x6D1E,0x6D17,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x6D3B,0x6D3D,0x6D3E,0x6D36,0xF915,0x6CF5,0x6D39,/* 0xA0-0xA7 */ ++ 0x0000,0x6D3B,0x6D3D,0x6D3E,0x6D36,0x6D1B,0x6CF5,0x6D39,/* 0xA0-0xA7 */ + 0x6D27,0x6D38,0x6D29,0x6D2E,0x6D35,0x6D0E,0x6D2B,0x70AB,/* 0xA8-0xAF */ + 0x70BA,0x70B3,0x70AC,0x70AF,0x70AD,0x70B8,0x70AE,0x70A4,/* 0xB0-0xB7 */ + 0x7230,0x7272,0x726F,0x7274,0x72E9,0x72E0,0x72E1,0x73B7,/* 0xB8-0xBF */ +- 0x73CA,0x73BB,0xF9AD,0x73CD,0x73C0,0x73B3,0x751A,0x752D,/* 0xC0-0xC7 */ ++ 0x73CA,0x73BB,0x73B2,0x73CD,0x73C0,0x73B3,0x751A,0x752D,/* 0xC0-0xC7 */ + 0x754F,0x754C,0x754E,0x754B,0x75AB,0x75A4,0x75A5,0x75A2,/* 0xC8-0xCF */ + 0x75A3,0x7678,0x7686,0x7687,0x7688,0x76C8,0x76C6,0x76C3,/* 0xD0-0xD7 */ +- 0x76C5,0xF96D,0x76F9,0x76F8,0x7709,0x770B,0x76FE,0x76FC,/* 0xD8-0xDF */ ++ 0x76C5,0x7701,0x76F9,0x76F8,0x7709,0x770B,0x76FE,0x76FC,/* 0xD8-0xDF */ + 0x7707,0x77DC,0x7802,0x7814,0x780C,0x780D,0x7946,0x7949,/* 0xE0-0xE7 */ + 0x7948,0x7947,0x79B9,0x79BA,0x79D1,0x79D2,0x79CB,0x7A7F,/* 0xE8-0xEF */ + 0x7A81,0x7AFF,0x7AFD,0x7C7D,0x7D02,0x7D05,0x7D00,0x7D09,/* 0xF0-0xF7 */ +@@ -457,7 +451,7 @@ + 0x8010,0x800D,0x8011,0x8036,0x80D6,0x80E5,0x80DA,0x80C3,/* 0x40-0x47 */ + 0x80C4,0x80CC,0x80E1,0x80DB,0x80CE,0x80DE,0x80E4,0x80DD,/* 0x48-0x4F */ + 0x81F4,0x8222,0x82E7,0x8303,0x8305,0x82E3,0x82DB,0x82E6,/* 0x50-0x57 */ +- 0x8304,0xF974,0x8302,0x8309,0x82D2,0x82D7,0x82F1,0x8301,/* 0x58-0x5F */ ++ 0x8304,0x82E5,0x8302,0x8309,0x82D2,0x82D7,0x82F1,0x8301,/* 0x58-0x5F */ + 0x82DC,0x82D4,0x82D1,0x82DE,0x82D3,0x82DF,0x82EF,0x8306,/* 0x60-0x67 */ + 0x8650,0x8679,0x867B,0x867A,0x884D,0x886B,0x8981,0x89D4,/* 0x68-0x6F */ + 0x8A08,0x8A02,0x8A03,0x8C9E,0x8CA0,0x8D74,0x8D73,0x8DB4,/* 0x70-0x77 */ +@@ -468,14 +462,14 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x8FED,0x8FEB,0x8FE4,0x8FE8,0x90CA,0x90CE,0x90C1,/* 0xA0-0xA7 */ +- 0x90C3,0x914B,0x914A,0x91CD,0x9582,0x9650,0xF951,0x964C,/* 0xA8-0xAF */ +- 0xFA09,0x9762,0x9769,0x97CB,0x97ED,0x97F3,0x9801,0x98A8,/* 0xB0-0xB7 */ ++ 0x90C3,0x914B,0x914A,0x91CD,0x9582,0x9650,0x964B,0x964C,/* 0xA8-0xAF */ ++ 0x964D,0x9762,0x9769,0x97CB,0x97ED,0x97F3,0x9801,0x98A8,/* 0xB0-0xB7 */ + 0x98DB,0x98DF,0x9996,0x9999,0x4E58,0x4EB3,0x500C,0x500D,/* 0xB8-0xBF */ + 0x5023,0x4FEF,0x5026,0x5025,0x4FF8,0x5029,0x5016,0x5006,/* 0xC0-0xC7 */ + 0x503C,0x501F,0x501A,0x5012,0x5011,0x4FFA,0x5000,0x5014,/* 0xC8-0xCF */ + 0x5028,0x4FF1,0x5021,0x500B,0x5019,0x5018,0x4FF3,0x4FEE,/* 0xD0-0xD7 */ +- 0x502D,0x502A,0x4FFE,0xF9D4,0x5009,0x517C,0x51A4,0x51A5,/* 0xD8-0xDF */ +- 0x51A2,0x51CD,0xF955,0x51C6,0x51CB,0x5256,0x525C,0x5254,/* 0xE0-0xE7 */ ++ 0x502D,0x502A,0x4FFE,0x502B,0x5009,0x517C,0x51A4,0x51A5,/* 0xD8-0xDF */ ++ 0x51A2,0x51CD,0x51CC,0x51C6,0x51CB,0x5256,0x525C,0x5254,/* 0xE0-0xE7 */ + 0x525B,0x525D,0x532A,0x537F,0x539F,0x539D,0x53DF,0x54E8,/* 0xE8-0xEF */ + 0x5510,0x5501,0x5537,0x54FC,0x54E5,0x54F2,0x5506,0x54FA,/* 0xF0-0xF7 */ + 0x5514,0x54E9,0x54ED,0x54E1,0x5509,0x54EE,0x54EA,0x0000,/* 0xF8-0xFF */ +@@ -507,13 +501,13 @@ + 0x6084,0x609F,0x609A,0x608D,0x6094,0x608C,0x6085,0x6096,/* 0xA8-0xAF */ + 0x6247,0x62F3,0x6308,0x62FF,0x634E,0x633E,0x632F,0x6355,/* 0xB0-0xB7 */ + 0x6342,0x6346,0x634F,0x6349,0x633A,0x6350,0x633D,0x632A,/* 0xB8-0xBF */ +- 0x632B,0x6328,0x634D,0x634C,0x6548,0x6549,0xF9BE,0x65C1,/* 0xC0-0xC7 */ +- 0xF983,0x6642,0x6649,0x664F,0x6643,0x6652,0x664C,0x6645,/* 0xC8-0xCF */ +- 0x6641,0x66F8,0x6714,0x6715,0xF929,0x6821,0x6838,0x6848,/* 0xD0-0xD7 */ +- 0x6846,0x6853,0x6839,0x6842,0x6854,0x6829,0x68B3,0xF9DA,/* 0xD8-0xDF */ ++ 0x632B,0x6328,0x634D,0x634C,0x6548,0x6549,0x6599,0x65C1,/* 0xC0-0xC7 */ ++ 0x65C5,0x6642,0x6649,0x664F,0x6643,0x6652,0x664C,0x6645,/* 0xC8-0xCF */ ++ 0x6641,0x66F8,0x6714,0x6715,0x6717,0x6821,0x6838,0x6848,/* 0xD0-0xD7 */ ++ 0x6846,0x6853,0x6839,0x6842,0x6854,0x6829,0x68B3,0x6817,/* 0xD8-0xDF */ + 0x684C,0x6851,0x683D,0x67F4,0x6850,0x6840,0x683C,0x6843,/* 0xE0-0xE7 */ + 0x682A,0x6845,0x6813,0x6818,0x6841,0x6B8A,0x6B89,0x6BB7,/* 0xE8-0xEF */ +- 0x6C23,0x6C27,0x6C28,0x6C26,0x6C24,0x6CF0,0xF92A,0x6D95,/* 0xF0-0xF7 */ ++ 0x6C23,0x6C27,0x6C28,0x6C26,0x6C24,0x6CF0,0x6D6A,0x6D95,/* 0xF0-0xF7 */ + 0x6D88,0x6D87,0x6D66,0x6D78,0x6D77,0x6D59,0x6D93,0x0000,/* 0xF8-0xFF */ + }; + +@@ -527,12 +521,12 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x6D6C,0x6D89,0x6D6E,0x6D5A,0x6D74,0x6D69,0x6D8C,0x6D8A,/* 0x40-0x47 */ +- 0x6D79,0x6D85,0x6D65,0x6D94,0x70CA,0x70D8,0x70E4,0xF916,/* 0x48-0x4F */ +- 0xF99F,0x70CF,0x7239,0x7279,0xF92B,0x72F9,0x72FD,0x72F8,/* 0x50-0x57 */ +- 0x72F7,0x7386,0x73ED,0xF9CC,0x73EE,0x73E0,0x73EA,0xF917,/* 0x58-0x5F */ +- 0x7554,0x755D,0x755C,0x755A,0xF9CD,0x75BE,0x75C5,0x75C7,/* 0x60-0x67 */ ++ 0x6D79,0x6D85,0x6D65,0x6D94,0x70CA,0x70D8,0x70E4,0x70D9,/* 0x48-0x4F */ ++ 0x70C8,0x70CF,0x7239,0x7279,0x72FC,0x72F9,0x72FD,0x72F8,/* 0x50-0x57 */ ++ 0x72F7,0x7386,0x73ED,0x7409,0x73EE,0x73E0,0x73EA,0x73DE,/* 0x58-0x5F */ ++ 0x7554,0x755D,0x755C,0x755A,0x7559,0x75BE,0x75C5,0x75C7,/* 0x60-0x67 */ + 0x75B2,0x75B3,0x75BD,0x75BC,0x75B9,0x75C2,0x75B8,0x768B,/* 0x68-0x6F */ +- 0x76B0,0xFA17,0x76CD,0x76CE,0x7729,0x771F,0x7720,0x7728,/* 0x70-0x77 */ ++ 0x76B0,0x76CA,0x76CD,0x76CE,0x7729,0x771F,0x7720,0x7728,/* 0x70-0x77 */ + 0x77E9,0x7830,0x7827,0x7838,0x781D,0x7834,0x7837,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ +@@ -540,17 +534,17 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x7825,0x782D,0x7820,0x781F,0x7832,0x7955,0x7950,/* 0xA0-0xA7 */ +- 0x7960,0x795F,0x7956,0xFA19,0x795D,0x7957,0x795A,0x79E4,/* 0xA8-0xAF */ ++ 0x7960,0x795F,0x7956,0x795E,0x795D,0x7957,0x795A,0x79E4,/* 0xA8-0xAF */ + 0x79E3,0x79E7,0x79DF,0x79E6,0x79E9,0x79D8,0x7A84,0x7A88,/* 0xB0-0xB7 */ + 0x7AD9,0x7B06,0x7B11,0x7C89,0x7D21,0x7D17,0x7D0B,0x7D0A,/* 0xB8-0xBF */ +- 0x7D20,0xF96A,0x7D14,0xF9CF,0x7D15,0x7D1A,0x7D1C,0x7D0D,/* 0xC0-0xC7 */ ++ 0x7D20,0x7D22,0x7D14,0x7D10,0x7D15,0x7D1A,0x7D1C,0x7D0D,/* 0xC0-0xC7 */ + 0x7D19,0x7D1B,0x7F3A,0x7F5F,0x7F94,0x7FC5,0x7FC1,0x8006,/* 0xC8-0xCF */ + 0x8018,0x8015,0x8019,0x8017,0x803D,0x803F,0x80F1,0x8102,/* 0xD0-0xD7 */ + 0x80F0,0x8105,0x80ED,0x80F4,0x8106,0x80F8,0x80F3,0x8108,/* 0xD8-0xDF */ + 0x80FD,0x810A,0x80FC,0x80EF,0x81ED,0x81EC,0x8200,0x8210,/* 0xE0-0xE7 */ + 0x822A,0x822B,0x8228,0x822C,0x82BB,0x832B,0x8352,0x8354,/* 0xE8-0xEF */ + 0x834A,0x8338,0x8350,0x8349,0x8335,0x8334,0x834F,0x8332,/* 0xF0-0xF7 */ +- 0x8339,0xF9FE,0x8317,0x8340,0x8331,0x8328,0x8343,0x0000,/* 0xF8-0xFF */ ++ 0x8339,0x8336,0x8317,0x8340,0x8331,0x8328,0x8343,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_B0[256] = { +@@ -565,7 +559,7 @@ + 0x8654,0x868A,0x86AA,0x8693,0x86A4,0x86A9,0x868C,0x86A3,/* 0x40-0x47 */ + 0x869C,0x8870,0x8877,0x8881,0x8882,0x887D,0x8879,0x8A18,/* 0x48-0x4F */ + 0x8A10,0x8A0E,0x8A0C,0x8A15,0x8A0A,0x8A17,0x8A13,0x8A16,/* 0x50-0x57 */ +- 0x8A0F,0x8A11,0xF900,0x8C7A,0x8C79,0x8CA1,0x8CA2,0x8D77,/* 0x58-0x5F */ ++ 0x8A0F,0x8A11,0x8C48,0x8C7A,0x8C79,0x8CA1,0x8CA2,0x8D77,/* 0x58-0x5F */ + 0x8EAC,0x8ED2,0x8ED4,0x8ECF,0x8FB1,0x9001,0x9006,0x8FF7,/* 0x60-0x67 */ + 0x9000,0x8FFA,0x8FF4,0x9003,0x8FFD,0x9005,0x8FF8,0x9095,/* 0x68-0x6F */ + 0x90E1,0x90DD,0x90E2,0x9152,0x914D,0x914C,0x91D8,0x91DD,/* 0x70-0x77 */ +@@ -579,9 +573,9 @@ + 0x99AC,0x9AA8,0x9AD8,0x9B25,0x9B32,0x9B3C,0x4E7E,0x507A,/* 0xA8-0xAF */ + 0x507D,0x505C,0x5047,0x5043,0x504C,0x505A,0x5049,0x5065,/* 0xB0-0xB7 */ + 0x5076,0x504E,0x5055,0x5075,0x5074,0x5077,0x504F,0x500F,/* 0xB8-0xBF */ +- 0x506F,0x506D,0x515C,0x5195,0x51F0,0x526A,0x526F,0xF952,/* 0xC0-0xC7 */ +- 0x52D9,0x52D8,0x52D5,0x5310,0x530F,0x5319,0xF9EB,0x5340,/* 0xC8-0xCF */ +- 0x533E,0xF96B,0x66FC,0x5546,0x556A,0x5566,0x5544,0x555E,/* 0xD0-0xD7 */ ++ 0x506F,0x506D,0x515C,0x5195,0x51F0,0x526A,0x526F,0x52D2,/* 0xC0-0xC7 */ ++ 0x52D9,0x52D8,0x52D5,0x5310,0x530F,0x5319,0x533F,0x5340,/* 0xC8-0xCF */ ++ 0x533E,0x53C3,0x66FC,0x5546,0x556A,0x5566,0x5544,0x555E,/* 0xD0-0xD7 */ + 0x5561,0x5543,0x554A,0x5531,0x5556,0x554F,0x5555,0x552F,/* 0xD8-0xDF */ + 0x5564,0x5538,0x552E,0x555C,0x552C,0x5563,0x5533,0x5541,/* 0xE0-0xE7 */ + 0x5557,0x5708,0x570B,0x5709,0x57DF,0x5805,0x580A,0x5806,/* 0xE8-0xEF */ +@@ -601,7 +595,7 @@ + 0x5A3C,0x5A62,0x5A5A,0x5A46,0x5A4A,0x5B70,0x5BC7,0x5BC5,/* 0x40-0x47 */ + 0x5BC4,0x5BC2,0x5BBF,0x5BC6,0x5C09,0x5C08,0x5C07,0x5C60,/* 0x48-0x4F */ + 0x5C5C,0x5C5D,0x5D07,0x5D06,0x5D0E,0x5D1B,0x5D16,0x5D22,/* 0x50-0x57 */ +- 0x5D11,0x5D29,0x5D14,0xF9D5,0x5D24,0x5D27,0x5D17,0x5DE2,/* 0x58-0x5F */ ++ 0x5D11,0x5D29,0x5D14,0x5D19,0x5D24,0x5D27,0x5D17,0x5DE2,/* 0x58-0x5F */ + 0x5E38,0x5E36,0x5E33,0x5E37,0x5EB7,0x5EB8,0x5EB6,0x5EB5,/* 0x60-0x67 */ + 0x5EBE,0x5F35,0x5F37,0x5F57,0x5F6C,0x5F69,0x5F6B,0x5F97,/* 0x68-0x6F */ + 0x5F99,0x5F9E,0x5F98,0x5FA1,0x5FA0,0x5F9C,0x607F,0x60A3,/* 0x70-0x77 */ +@@ -613,16 +607,16 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x60C5,0x60BB,0x60B5,0x60DC,0x60BC,0x60D8,0x60D5,/* 0xA0-0xA7 */ + 0x60C6,0x60DF,0x60B8,0x60DA,0x60C7,0x621A,0x621B,0x6248,/* 0xA8-0xAF */ +- 0xF975,0x63A7,0x6372,0x6396,0x63A2,0x63A5,0x6377,0x6367,/* 0xB0-0xB7 */ ++ 0x63A0,0x63A7,0x6372,0x6396,0x63A2,0x63A5,0x6377,0x6367,/* 0xB0-0xB7 */ + 0x6398,0x63AA,0x6371,0x63A9,0x6389,0x6383,0x639B,0x636B,/* 0xB8-0xBF */ + 0x63A8,0x6384,0x6388,0x6399,0x63A1,0x63AC,0x6392,0x638F,/* 0xC0-0xC7 */ +- 0x6380,0xF9A4,0x6369,0x6368,0x637A,0x655D,0x6556,0x6551,/* 0xC8-0xCF */ ++ 0x6380,0x637B,0x6369,0x6368,0x637A,0x655D,0x6556,0x6551,/* 0xC8-0xCF */ + 0x6559,0x6557,0x555F,0x654F,0x6558,0x6555,0x6554,0x659C,/* 0xD0-0xD7 */ + 0x659B,0x65AC,0x65CF,0x65CB,0x65CC,0x65CE,0x665D,0x665A,/* 0xD8-0xDF */ +- 0x6664,0x6668,0x6666,0x665E,0x66F9,0x52D7,0x671B,0xF97A,/* 0xE0-0xE7 */ ++ 0x6664,0x6668,0x6666,0x665E,0x66F9,0x52D7,0x671B,0x6881,/* 0xE0-0xE7 */ + 0x68AF,0x68A2,0x6893,0x68B5,0x687F,0x6876,0x68B1,0x68A7,/* 0xE8-0xEF */ + 0x6897,0x68B0,0x6883,0x68C4,0x68AD,0x6886,0x6885,0x6894,/* 0xF0-0xF7 */ +- 0x689D,0xF9E2,0x689F,0x68A1,0x6882,0x6B32,0xF970,0x0000,/* 0xF8-0xFF */ ++ 0x689D,0x68A8,0x689F,0x68A1,0x6882,0x6B32,0x6BBA,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_B2[256] = { +@@ -635,27 +629,27 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x6BEB,0x6BEC,0x6C2B,0x6D8E,0x6DBC,0x6DF3,0x6DD9,0x6DB2,/* 0x40-0x47 */ +- 0x6DE1,0x6DCC,0x6DE4,0x6DFB,0x6DFA,0x6E05,0x6DC7,0xF9F5,/* 0x48-0x4F */ ++ 0x6DE1,0x6DCC,0x6DE4,0x6DFB,0x6DFA,0x6E05,0x6DC7,0x6DCB,/* 0x48-0x4F */ + 0x6DAF,0x6DD1,0x6DAE,0x6DDE,0x6DF9,0x6DB8,0x6DF7,0x6DF5,/* 0x50-0x57 */ +- 0x6DC5,0x6DD2,0x6E1A,0x6DB5,0xF94D,0x6DEB,0x6DD8,0xF9D6,/* 0x58-0x5F */ ++ 0x6DC5,0x6DD2,0x6E1A,0x6DB5,0x6DDA,0x6DEB,0x6DD8,0x6DEA,/* 0x58-0x5F */ + 0x6DF1,0x6DEE,0x6DE8,0x6DC6,0x6DC4,0x6DAA,0x6DEC,0x6DBF,/* 0x60-0x67 */ + 0x6DE6,0x70F9,0x7109,0x710A,0x70FD,0x70EF,0x723D,0x727D,/* 0x68-0x6F */ +- 0x7281,0x731C,0x731B,0x7316,0x7313,0x7319,0xF9DB,0x7405,/* 0x70-0x77 */ +- 0x740A,0x7403,0xF9E4,0x73FE,0x740D,0x74E0,0x74F6,0x0000,/* 0x78-0x7F */ ++ 0x7281,0x731C,0x731B,0x7316,0x7313,0x7319,0x7387,0x7405,/* 0x70-0x77 */ ++ 0x740A,0x7403,0x7406,0x73FE,0x740D,0x74E0,0x74F6,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x74F7,0x751C,0x7522,0xF976,0x7566,0x7562,0xF962,/* 0xA0-0xA7 */ ++ 0x0000,0x74F7,0x751C,0x7522,0x7565,0x7566,0x7562,0x7570,/* 0xA0-0xA7 */ + 0x758F,0x75D4,0x75D5,0x75B5,0x75CA,0x75CD,0x768E,0x76D4,/* 0xA8-0xAF */ + 0x76D2,0x76DB,0x7737,0x773E,0x773C,0x7736,0x7738,0x773A,/* 0xB0-0xB7 */ +- 0xF9CE,0x7843,0x784E,0xFA1A,0x7968,0x796D,0x79FB,0x7A92,/* 0xB8-0xBF */ +- 0x7A95,0xF9F8,0x7B28,0x7B1B,0x7B2C,0x7B26,0x7B19,0x7B1E,/* 0xC0-0xC7 */ +- 0x7B2E,0xF9F9,0x7C97,0x7C95,0x7D46,0x7D43,0x7D71,0x7D2E,/* 0xC8-0xCF */ +- 0x7D39,0x7D3C,0x7D40,0x7D30,0x7D33,0x7D44,0xF94F,0x7D42,/* 0xD0-0xD7 */ +- 0x7D32,0x7D31,0x7F3D,0x7F9E,0xF9AF,0x7FCC,0x7FCE,0x7FD2,/* 0xD8-0xDF */ +- 0x801C,0x804A,0xF9B0,0x812F,0x8116,0x8123,0x812B,0x8129,/* 0xE0-0xE7 */ ++ 0x786B,0x7843,0x784E,0x7965,0x7968,0x796D,0x79FB,0x7A92,/* 0xB8-0xBF */ ++ 0x7A95,0x7B20,0x7B28,0x7B1B,0x7B2C,0x7B26,0x7B19,0x7B1E,/* 0xC0-0xC7 */ ++ 0x7B2E,0x7C92,0x7C97,0x7C95,0x7D46,0x7D43,0x7D71,0x7D2E,/* 0xC8-0xCF */ ++ 0x7D39,0x7D3C,0x7D40,0x7D30,0x7D33,0x7D44,0x7D2F,0x7D42,/* 0xD0-0xD7 */ ++ 0x7D32,0x7D31,0x7F3D,0x7F9E,0x7F9A,0x7FCC,0x7FCE,0x7FD2,/* 0xD8-0xDF */ ++ 0x801C,0x804A,0x8046,0x812F,0x8116,0x8123,0x812B,0x8129,/* 0xE0-0xE7 */ + 0x8130,0x8124,0x8202,0x8235,0x8237,0x8236,0x8239,0x838E,/* 0xE8-0xEF */ + 0x839E,0x8398,0x8378,0x83A2,0x8396,0x83BD,0x83AB,0x8392,/* 0xF0-0xF7 */ + 0x838A,0x8393,0x8389,0x83A0,0x8377,0x837B,0x837C,0x0000,/* 0xF8-0xFF */ +@@ -676,22 +670,22 @@ + 0x8A2A,0x8A1D,0x8A23,0x8A25,0x8A31,0x8A2D,0x8A1F,0x8A1B,/* 0x58-0x5F */ + 0x8A22,0x8C49,0x8C5A,0x8CA9,0x8CAC,0x8CAB,0x8CA8,0x8CAA,/* 0x60-0x67 */ + 0x8CA7,0x8D67,0x8D66,0x8DBE,0x8DBA,0x8EDB,0x8EDF,0x9019,/* 0x68-0x6F */ +- 0x900D,0x901A,0x9017,0xF99A,0x901F,0x901D,0x9010,0x9015,/* 0x70-0x77 */ ++ 0x900D,0x901A,0x9017,0x9023,0x901F,0x901D,0x9010,0x9015,/* 0x70-0x77 */ + 0x901E,0x9020,0x900F,0x9022,0x9016,0x901B,0x9014,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x90E8,0x90ED,0xFA26,0x9157,0x91CE,0x91F5,0x91E6,/* 0xA0-0xA7 */ +- 0x91E3,0x91E7,0x91ED,0x91E9,0x9589,0x966A,0xF959,0x9673,/* 0xA8-0xAF */ +- 0xF9D3,0x9670,0x9674,0x9676,0x9677,0x966C,0x96C0,0x96EA,/* 0xB0-0xB7 */ ++ 0x0000,0x90E8,0x90ED,0x90FD,0x9157,0x91CE,0x91F5,0x91E6,/* 0xA0-0xA7 */ ++ 0x91E3,0x91E7,0x91ED,0x91E9,0x9589,0x966A,0x9675,0x9673,/* 0xA8-0xAF */ ++ 0x9678,0x9670,0x9674,0x9676,0x9677,0x966C,0x96C0,0x96EA,/* 0xB0-0xB7 */ + 0x96E9,0x7AE0,0x7ADF,0x9802,0x9803,0x9B5A,0x9CE5,0x9E75,/* 0xB8-0xBF */ +- 0xF940,0x9EA5,0x9EBB,0x50A2,0x508D,0x5085,0x5099,0x5091,/* 0xC0-0xC7 */ ++ 0x9E7F,0x9EA5,0x9EBB,0x50A2,0x508D,0x5085,0x5099,0x5091,/* 0xC0-0xC7 */ + 0x5080,0x5096,0x5098,0x509A,0x6700,0x51F1,0x5272,0x5274,/* 0xC8-0xCF */ +- 0x5275,0x5269,0xF92F,0x52DD,0x52DB,0x535A,0x53A5,0x557B,/* 0xD0-0xD7 */ ++ 0x5275,0x5269,0x52DE,0x52DD,0x52DB,0x535A,0x53A5,0x557B,/* 0xD0-0xD7 */ + 0x5580,0x55A7,0x557C,0x558A,0x559D,0x5598,0x5582,0x559C,/* 0xD8-0xDF */ +- 0x55AA,0x5594,0xF90B,0x558B,0x5583,0x55B3,0x55AE,0x559F,/* 0xE0-0xE7 */ ++ 0x55AA,0x5594,0x5587,0x558B,0x5583,0x55B3,0x55AE,0x559F,/* 0xE0-0xE7 */ + 0x553E,0x55B2,0x559A,0x55BB,0x55AC,0x55B1,0x557E,0x5589,/* 0xE8-0xEF */ + 0x55AB,0x5599,0x570D,0x582F,0x582A,0x5834,0x5824,0x5830,/* 0xF0-0xF7 */ + 0x5831,0x5821,0x581D,0x5820,0x58F9,0x58FA,0x5960,0x0000,/* 0xF8-0xFF */ +@@ -708,9 +702,9 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x5A77,0x5A9A,0x5A7F,0x5A92,0x5A9B,0x5AA7,0x5B73,0x5B71,/* 0x40-0x47 */ + 0x5BD2,0x5BCC,0x5BD3,0x5BD0,0x5C0A,0x5C0B,0x5C31,0x5D4C,/* 0x48-0x4F */ +- 0xF921,0x5D34,0x5D47,0x5DFD,0x5E45,0x5E3D,0x5E40,0x5E43,/* 0x50-0x57 */ +- 0x5E7E,0xF928,0x5EC1,0x5EC2,0x5EC4,0x5F3C,0x5F6D,0xF966,/* 0x58-0x5F */ +- 0x5FAA,0x5FA8,0x60D1,0xF9B9,0x60B2,0x60B6,0x60E0,0x611C,/* 0x60-0x67 */ ++ 0x5D50,0x5D34,0x5D47,0x5DFD,0x5E45,0x5E3D,0x5E40,0x5E43,/* 0x50-0x57 */ ++ 0x5E7E,0x5ECA,0x5EC1,0x5EC2,0x5EC4,0x5F3C,0x5F6D,0x5FA9,/* 0x58-0x5F */ ++ 0x5FAA,0x5FA8,0x60D1,0x60E1,0x60B2,0x60B6,0x60E0,0x611C,/* 0x60-0x67 */ + 0x6123,0x60FA,0x6115,0x60F0,0x60FB,0x60F4,0x6168,0x60F1,/* 0x68-0x6F */ + 0x610E,0x60F6,0x6109,0x6100,0x6112,0x621F,0x6249,0x63A3,/* 0x70-0x77 */ + 0x638C,0x63CF,0x63C0,0x63E9,0x63C9,0x63C6,0x63CD,0x0000,/* 0x78-0x7F */ +@@ -722,7 +716,7 @@ + 0x0000,0x63D2,0x63E3,0x63D0,0x63E1,0x63D6,0x63ED,0x63EE,/* 0xA0-0xA7 */ + 0x6376,0x63F4,0x63EA,0x63DB,0x6452,0x63DA,0x63F9,0x655E,/* 0xA8-0xAF */ + 0x6566,0x6562,0x6563,0x6591,0x6590,0x65AF,0x666E,0x6670,/* 0xB0-0xB7 */ +- 0xFA12,0x6676,0x666F,0x6691,0x667A,0x667E,0x6677,0x66FE,/* 0xB8-0xBF */ ++ 0x6674,0x6676,0x666F,0x6691,0x667A,0x667E,0x6677,0x66FE,/* 0xB8-0xBF */ + 0x66FF,0x671F,0x671D,0x68FA,0x68D5,0x68E0,0x68D8,0x68D7,/* 0xC0-0xC7 */ + 0x6905,0x68DF,0x68F5,0x68EE,0x68E7,0x68F9,0x68D2,0x68F2,/* 0xC8-0xCF */ + 0x68E3,0x68CB,0x68CD,0x690D,0x6912,0x690E,0x68C9,0x68DA,/* 0xD0-0xD7 */ +@@ -746,7 +740,7 @@ + 0x7119,0x711A,0x7126,0x7130,0x7121,0x7136,0x716E,0x711C,/* 0x48-0x4F */ + 0x724C,0x7284,0x7280,0x7336,0x7325,0x7334,0x7329,0x743A,/* 0x50-0x57 */ + 0x742A,0x7433,0x7422,0x7425,0x7435,0x7436,0x7434,0x742F,/* 0x58-0x5F */ +- 0x741B,0x7426,0x7428,0x7525,0x7526,0x756B,0x756A,0xF9E5,/* 0x60-0x67 */ ++ 0x741B,0x7426,0x7428,0x7525,0x7526,0x756B,0x756A,0x75E2,/* 0x60-0x67 */ + 0x75DB,0x75E3,0x75D9,0x75D8,0x75DE,0x75E0,0x767B,0x767C,/* 0x68-0x6F */ + 0x7696,0x7693,0x76B4,0x76DC,0x774F,0x77ED,0x785D,0x786C,/* 0x70-0x77 */ + 0x786F,0x7A0D,0x7A08,0x7A0B,0x7A05,0x7A00,0x7A98,0x0000,/* 0x78-0x7F */ +@@ -762,10 +756,10 @@ + 0x800B,0x8052,0x8085,0x8155,0x8154,0x814B,0x8151,0x814E,/* 0xC0-0xC7 */ + 0x8139,0x8146,0x813E,0x814C,0x8153,0x8174,0x8212,0x821C,/* 0xC8-0xCF */ + 0x83E9,0x8403,0x83F8,0x840D,0x83E0,0x83C5,0x840B,0x83C1,/* 0xD0-0xD7 */ +- 0x83EF,0xF958,0x83F4,0x8457,0x840A,0x83F0,0x840C,0x83CC,/* 0xD8-0xDF */ ++ 0x83EF,0x83F1,0x83F4,0x8457,0x840A,0x83F0,0x840C,0x83CC,/* 0xD8-0xDF */ + 0x83FD,0x83F2,0x83CA,0x8438,0x840E,0x8404,0x83DC,0x8407,/* 0xE0-0xE7 */ + 0x83D4,0x83DF,0x865B,0x86DF,0x86D9,0x86ED,0x86D4,0x86DB,/* 0xE8-0xEF */ +- 0x86E4,0x86D0,0x86DE,0x8857,0x88C1,0xF9A0,0x88B1,0x8983,/* 0xF0-0xF7 */ ++ 0x86E4,0x86D0,0x86DE,0x8857,0x88C1,0x88C2,0x88B1,0x8983,/* 0xF0-0xF7 */ + 0x8996,0x8A3B,0x8A60,0x8A55,0x8A5E,0x8A3C,0x8A41,0x0000,/* 0xF8-0xFF */ + }; + +@@ -783,8 +777,8 @@ + 0x8CC0,0x8CB4,0x8CB7,0x8CB6,0x8CBF,0x8CB8,0x8D8A,0x8D85,/* 0x50-0x57 */ + 0x8D81,0x8DCE,0x8DDD,0x8DCB,0x8DDA,0x8DD1,0x8DCC,0x8DDB,/* 0x58-0x5F */ + 0x8DC6,0x8EFB,0x8EF8,0x8EFC,0x8F9C,0x902E,0x9035,0x9031,/* 0x60-0x67 */ +- 0xFA25,0x9032,0x9036,0x9102,0x90F5,0x9109,0x90FE,0x9163,/* 0x68-0x6F */ +- 0x9165,0xF97E,0x9214,0x9215,0x9223,0x9209,0x921E,0x920D,/* 0x70-0x77 */ ++ 0x9038,0x9032,0x9036,0x9102,0x90F5,0x9109,0x90FE,0x9163,/* 0x68-0x6F */ ++ 0x9165,0x91CF,0x9214,0x9215,0x9223,0x9209,0x921E,0x920D,/* 0x70-0x77 */ + 0x9210,0x9207,0x9211,0x9594,0x958F,0x958B,0x9591,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ +@@ -792,15 +786,15 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x9593,0x9592,0x958E,0x968A,0x968E,0x968B,0x967D,/* 0xA0-0xA7 */ +- 0x9685,0xF9DC,0x968D,0x9672,0x9684,0x96C1,0x96C5,0x96C4,/* 0xA8-0xAF */ ++ 0x9685,0x9686,0x968D,0x9672,0x9684,0x96C1,0x96C5,0x96C4,/* 0xA8-0xAF */ + 0x96C6,0x96C7,0x96EF,0x96F2,0x97CC,0x9805,0x9806,0x9808,/* 0xB0-0xB7 */ +- 0x98E7,0x98EA,0xFA2A,0x98E9,0x98F2,0x98ED,0x99AE,0x99AD,/* 0xB8-0xBF */ +- 0x9EC3,0x9ECD,0x9ED1,0xF91B,0x50AD,0x50B5,0x50B2,0x50B3,/* 0xC0-0xC7 */ ++ 0x98E7,0x98EA,0x98EF,0x98E9,0x98F2,0x98ED,0x99AE,0x99AD,/* 0xB8-0xBF */ ++ 0x9EC3,0x9ECD,0x9ED1,0x4E82,0x50AD,0x50B5,0x50B2,0x50B3,/* 0xC0-0xC7 */ + 0x50C5,0x50BE,0x50AC,0x50B7,0x50BB,0x50AF,0x50C7,0x527F,/* 0xC8-0xCF */ + 0x5277,0x527D,0x52DF,0x52E6,0x52E4,0x52E2,0x52E3,0x532F,/* 0xD0-0xD7 */ + 0x55DF,0x55E8,0x55D3,0x55E6,0x55CE,0x55DC,0x55C7,0x55D1,/* 0xD8-0xDF */ + 0x55E3,0x55E4,0x55EF,0x55DA,0x55E1,0x55C5,0x55C6,0x55E5,/* 0xE0-0xE7 */ +- 0x55C9,0x5712,0x5713,0xF96C,0x5851,0x5858,0x5857,0xFA10,/* 0xE8-0xEF */ ++ 0x55C9,0x5712,0x5713,0x585E,0x5851,0x5858,0x5857,0x585A,/* 0xE8-0xEF */ + 0x5854,0x586B,0x584C,0x586D,0x584A,0x5862,0x5852,0x584B,/* 0xF0-0xF7 */ + 0x5967,0x5AC1,0x5AC9,0x5ACC,0x5ABE,0x5ABD,0x5ABC,0x0000,/* 0xF8-0xFF */ + }; +@@ -814,13 +808,13 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x5AB3,0x5AC2,0x5AB2,0x5D69,0x5D6F,0x5E4C,0x5E79,0xF9A2,/* 0x40-0x47 */ ++ 0x5AB3,0x5AC2,0x5AB2,0x5D69,0x5D6F,0x5E4C,0x5E79,0x5EC9,/* 0x40-0x47 */ + 0x5EC8,0x5F12,0x5F59,0x5FAC,0x5FAE,0x611A,0x610F,0x6148,/* 0x48-0x4F */ + 0x611F,0x60F3,0x611B,0x60F9,0x6101,0x6108,0x614E,0x614C,/* 0x50-0x57 */ +- 0xF9D9,0x614D,0x613E,0x6134,0x6127,0x610D,0x6106,0x6137,/* 0x58-0x5F */ ++ 0x6144,0x614D,0x613E,0x6134,0x6127,0x610D,0x6106,0x6137,/* 0x58-0x5F */ + 0x6221,0x6222,0x6413,0x643E,0x641E,0x642A,0x642D,0x643D,/* 0x60-0x67 */ + 0x642C,0x640F,0x641C,0x6414,0x640D,0x6436,0x6416,0x6417,/* 0x68-0x6F */ +- 0x6406,0x656C,0x659F,0x65B0,0x6697,0x6689,0x6687,0xF9C5,/* 0x70-0x77 */ ++ 0x6406,0x656C,0x659F,0x65B0,0x6697,0x6689,0x6687,0x6688,/* 0x70-0x77 */ + 0x6696,0x6684,0x6698,0x668D,0x6703,0x6994,0x696D,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ +@@ -831,9 +825,9 @@ + 0x694A,0x6968,0x696B,0x695E,0x6953,0x6979,0x6986,0x695D,/* 0xA8-0xAF */ + 0x6963,0x695B,0x6B47,0x6B72,0x6BC0,0x6BBF,0x6BD3,0x6BFD,/* 0xB0-0xB7 */ + 0x6EA2,0x6EAF,0x6ED3,0x6EB6,0x6EC2,0x6E90,0x6E9D,0x6EC7,/* 0xB8-0xBF */ +- 0x6EC5,0x6EA5,0x6E98,0x6EBC,0xF9EC,0x6EAB,0xF904,0x6E96,/* 0xC0-0xC7 */ +- 0xF9CB,0x6EC4,0x6ED4,0x6EAA,0x6EA7,0x6EB4,0x714E,0x7159,/* 0xC8-0xCF */ +- 0x7169,0x7164,0xF993,0x7167,0x715C,0x716C,0x7166,0x714C,/* 0xD0-0xD7 */ ++ 0x6EC5,0x6EA5,0x6E98,0x6EBC,0x6EBA,0x6EAB,0x6ED1,0x6E96,/* 0xC0-0xC7 */ ++ 0x6E9C,0x6EC4,0x6ED4,0x6EAA,0x6EA7,0x6EB4,0x714E,0x7159,/* 0xC8-0xCF */ ++ 0x7169,0x7164,0x7149,0x7167,0x715C,0x716C,0x7166,0x714C,/* 0xD0-0xD7 */ + 0x7165,0x715E,0x7146,0x7168,0x7156,0x723A,0x7252,0x7337,/* 0xD8-0xDF */ + 0x7345,0x733F,0x733E,0x746F,0x745A,0x7455,0x745F,0x745E,/* 0xE0-0xE7 */ + 0x7441,0x743F,0x7459,0x745B,0x745C,0x7576,0x7578,0x7600,/* 0xE8-0xEF */ +@@ -851,8 +845,8 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x7779,0x776A,0x776C,0x775C,0x7765,0x7768,0x7762,0x77EE,/* 0x40-0x47 */ +- 0x788E,0x78B0,0x7897,0x7898,0xF93B,0x7889,0x787C,0x7891,/* 0x48-0x4F */ +- 0x7893,0x787F,0x797A,0xF93C,0x7981,0x842C,0x79BD,0xF956,/* 0x50-0x57 */ ++ 0x788E,0x78B0,0x7897,0x7898,0x788C,0x7889,0x787C,0x7891,/* 0x48-0x4F */ ++ 0x7893,0x787F,0x797A,0x797F,0x7981,0x842C,0x79BD,0x7A1C,/* 0x50-0x57 */ + 0x7A1A,0x7A20,0x7A14,0x7A1F,0x7A1E,0x7A9F,0x7AA0,0x7B77,/* 0x58-0x5F */ + 0x7BC0,0x7B60,0x7B6E,0x7B67,0x7CB1,0x7CB3,0x7CB5,0x7D93,/* 0x60-0x67 */ + 0x7D79,0x7D91,0x7D81,0x7D8F,0x7D5B,0x7F6E,0x7F69,0x7F6A,/* 0x68-0x6F */ +@@ -864,16 +858,16 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x8179,0x817A,0x8166,0x8205,0x8247,0x8482,0x8477,/* 0xA0-0xA7 */ +- 0xF918,0x8431,0x8475,0x8466,0x846B,0xF96E,0x846C,0x845B,/* 0xA8-0xAF */ ++ 0x843D,0x8431,0x8475,0x8466,0x846B,0x8449,0x846C,0x845B,/* 0xA8-0xAF */ + 0x843C,0x8435,0x8461,0x8463,0x8469,0x846D,0x8446,0x865E,/* 0xB0-0xB7 */ +- 0xF936,0x865F,0x86F9,0x8713,0x8708,0x8707,0x8700,0x86FE,/* 0xB8-0xBF */ ++ 0x865C,0x865F,0x86F9,0x8713,0x8708,0x8707,0x8700,0x86FE,/* 0xB8-0xBF */ + 0x86FB,0x8702,0x8703,0x8706,0x870A,0x8859,0x88DF,0x88D4,/* 0xC0-0xC7 */ +- 0x88D9,0x88DC,0x88D8,0x88DD,0xF9E8,0x88CA,0x88D5,0x88D2,/* 0xC8-0xCF */ ++ 0x88D9,0x88DC,0x88D8,0x88DD,0x88E1,0x88CA,0x88D5,0x88D2,/* 0xC8-0xCF */ + 0x899C,0x89E3,0x8A6B,0x8A72,0x8A73,0x8A66,0x8A69,0x8A70,/* 0xD0-0xD7 */ + 0x8A87,0x8A7C,0x8A63,0x8AA0,0x8A71,0x8A85,0x8A6D,0x8A62,/* 0xD8-0xDF */ + 0x8A6E,0x8A6C,0x8A79,0x8A7B,0x8A3E,0x8A68,0x8C62,0x8C8A,/* 0xE0-0xE7 */ +- 0x8C89,0x8CCA,0x8CC7,0xF903,0x8CC4,0x8CB2,0x8CC3,0xF948,/* 0xE8-0xEF */ +- 0x8CC5,0x8DE1,0x8DDF,0x8DE8,0xF937,0x8DF3,0x8DFA,0x8DEA,/* 0xF0-0xF7 */ ++ 0x8C89,0x8CCA,0x8CC7,0x8CC8,0x8CC4,0x8CB2,0x8CC3,0x8CC2,/* 0xE8-0xEF */ ++ 0x8CC5,0x8DE1,0x8DDF,0x8DE8,0x8DEF,0x8DF3,0x8DFA,0x8DEA,/* 0xF0-0xF7 */ + 0x8DE4,0x8DE6,0x8EB2,0x8F03,0x8F09,0x8EFE,0x8F0A,0x0000,/* 0xF8-0xFF */ + }; + +@@ -888,12 +882,12 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x8F9F,0x8FB2,0x904B,0x904A,0x9053,0x9042,0x9054,0x903C,/* 0x40-0x47 */ + 0x9055,0x9050,0x9047,0x904F,0x904E,0x904D,0x9051,0x903E,/* 0x48-0x4F */ +- 0x9041,0x9112,0x9117,0x916C,0xF919,0x9169,0x91C9,0x9237,/* 0x50-0x57 */ ++ 0x9041,0x9112,0x9117,0x916C,0x916A,0x9169,0x91C9,0x9237,/* 0x50-0x57 */ + 0x9257,0x9238,0x923D,0x9240,0x923E,0x925B,0x924B,0x9264,/* 0x58-0x5F */ +- 0x9251,0xF9B1,0x9249,0x924D,0x9245,0x9239,0x923F,0x925A,/* 0x60-0x67 */ ++ 0x9251,0x9234,0x9249,0x924D,0x9245,0x9239,0x923F,0x925A,/* 0x60-0x67 */ + 0x9598,0x9698,0x9694,0x9695,0x96CD,0x96CB,0x96C9,0x96CA,/* 0x68-0x6F */ +- 0xF949,0x96FB,0x96F9,0xF9B2,0xFA1C,0x9774,0x9776,0x9810,/* 0x70-0x77 */ +- 0x9811,0x9813,0x980A,0x9812,0x980C,0xFA2B,0x98F4,0x0000,/* 0x78-0x7F */ ++ 0x96F7,0x96FB,0x96F9,0x96F6,0x9756,0x9774,0x9776,0x9810,/* 0x70-0x77 */ ++ 0x9811,0x9813,0x980A,0x9812,0x980C,0x98FC,0x98F4,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ +@@ -901,16 +895,16 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x98FD,0x98FE,0x99B3,0x99B1,0x99B4,0x9AE1,0x9CE9,/* 0xA0-0xA7 */ + 0x9E82,0x9F0E,0x9F13,0x9F20,0x50E7,0x50EE,0x50E5,0x50D6,/* 0xA8-0xAF */ +- 0x50ED,0xF9BB,0x50D5,0x50CF,0x50D1,0x50F1,0x50CE,0x50E9,/* 0xB0-0xB7 */ ++ 0x50ED,0x50DA,0x50D5,0x50CF,0x50D1,0x50F1,0x50CE,0x50E9,/* 0xB0-0xB7 */ + 0x5162,0x51F3,0x5283,0x5282,0x5331,0x53AD,0x55FE,0x5600,/* 0xB8-0xBF */ + 0x561B,0x5617,0x55FD,0x5614,0x5606,0x5609,0x560D,0x560E,/* 0xC0-0xC7 */ + 0x55F7,0x5616,0x561F,0x5608,0x5610,0x55F6,0x5718,0x5716,/* 0xC8-0xCF */ + 0x5875,0x587E,0x5883,0x5893,0x588A,0x5879,0x5885,0x587D,/* 0xD0-0xD7 */ + 0x58FD,0x5925,0x5922,0x5924,0x596A,0x5969,0x5AE1,0x5AE6,/* 0xD8-0xDF */ +- 0x5AE9,0x5AD7,0x5AD6,0x5AD8,0x5AE3,0x5B75,0x5BDE,0xF9AA,/* 0xE0-0xE7 */ ++ 0x5AE9,0x5AD7,0x5AD6,0x5AD8,0x5AE3,0x5B75,0x5BDE,0x5BE7,/* 0xE0-0xE7 */ + 0x5BE1,0x5BE5,0x5BE6,0x5BE8,0x5BE2,0x5BE4,0x5BDF,0x5C0D,/* 0xE8-0xEF */ +- 0xF94B,0x5D84,0x5D87,0x5E5B,0x5E63,0x5E55,0x5E57,0x5E54,/* 0xF0-0xF7 */ +- 0xFA0B,0x5ED6,0x5F0A,0x5F46,0x5F70,0x5FB9,0x6147,0x0000,/* 0xF8-0xFF */ ++ 0x5C62,0x5D84,0x5D87,0x5E5B,0x5E63,0x5E55,0x5E57,0x5E54,/* 0xF0-0xF7 */ ++ 0x5ED3,0x5ED6,0x5F0A,0x5F46,0x5F70,0x5FB9,0x6147,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_BA[256] = { +@@ -929,23 +923,23 @@ + 0x69C1,0x69AE,0x69D3,0x69CB,0x699B,0x69B7,0x69BB,0x69AB,/* 0x60-0x67 */ + 0x69B4,0x69D0,0x69CD,0x69AD,0x69CC,0x69A6,0x69C3,0x69A3,/* 0x68-0x6F */ + 0x6B49,0x6B4C,0x6C33,0x6F33,0x6F14,0x6EFE,0x6F13,0x6EF4,/* 0x70-0x77 */ +- 0x6F29,0x6F3E,0x6F20,0x6F2C,0xF94E,0x6F02,0x6F22,0x0000,/* 0x78-0x7F */ ++ 0x6F29,0x6F3E,0x6F20,0x6F2C,0x6F0F,0x6F02,0x6F22,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x6EFF,0x6EEF,0x6F06,0x6F31,0x6F38,0x6F32,0xF992,/* 0xA0-0xA7 */ ++ 0x0000,0x6EFF,0x6EEF,0x6F06,0x6F31,0x6F38,0x6F32,0x6F23,/* 0xA0-0xA7 */ + 0x6F15,0x6F2B,0x6F2F,0x6F88,0x6F2A,0x6EEC,0x6F01,0x6EF2,/* 0xA8-0xAF */ + 0x6ECC,0x6EF7,0x7194,0x7199,0x717D,0x718A,0x7184,0x7192,/* 0xB0-0xB7 */ + 0x723E,0x7292,0x7296,0x7344,0x7350,0x7464,0x7463,0x746A,/* 0xB8-0xBF */ + 0x7470,0x746D,0x7504,0x7591,0x7627,0x760D,0x760B,0x7609,/* 0xC0-0xC7 */ + 0x7613,0x76E1,0x76E3,0x7784,0x777D,0x777F,0x7761,0x78C1,/* 0xC8-0xCF */ +- 0x789F,0x78A7,0x78B3,0x78A9,0x78A3,0x798E,0xFA1B,0x798D,/* 0xD0-0xD7 */ ++ 0x789F,0x78A7,0x78B3,0x78A9,0x78A3,0x798E,0x798F,0x798D,/* 0xD0-0xD7 */ + 0x7A2E,0x7A31,0x7AAA,0x7AA9,0x7AED,0x7AEF,0x7BA1,0x7B95,/* 0xD8-0xDF */ + 0x7B8B,0x7B75,0x7B97,0x7B9D,0x7B94,0x7B8F,0x7BB8,0x7B87,/* 0xE0-0xE7 */ +- 0x7B84,0x7CB9,0x7CBD,0xFA1D,0x7DBB,0x7DB0,0x7D9C,0x7DBD,/* 0xE8-0xEF */ +- 0xF957,0xF93D,0x7DCA,0x7DB4,0x7DB2,0x7DB1,0x7DBA,0x7DA2,/* 0xF0-0xF7 */ ++ 0x7B84,0x7CB9,0x7CBD,0x7CBE,0x7DBB,0x7DB0,0x7D9C,0x7DBD,/* 0xE8-0xEF */ ++ 0x7DBE,0x7DA0,0x7DCA,0x7DB4,0x7DB2,0x7DB1,0x7DBA,0x7DA2,/* 0xF0-0xF7 */ + 0x7DBF,0x7DB5,0x7DB8,0x7DAD,0x7DD2,0x7DC7,0x7DAC,0x0000,/* 0xF8-0xFF */ + }; + +@@ -964,14 +958,14 @@ + 0x8499,0x849E,0x84B2,0x849C,0x84CB,0x84B8,0x84C0,0x84D3,/* 0x58-0x5F */ + 0x8490,0x84BC,0x84D1,0x84CA,0x873F,0x871C,0x873B,0x8722,/* 0x60-0x67 */ + 0x8725,0x8734,0x8718,0x8755,0x8737,0x8729,0x88F3,0x8902,/* 0x68-0x6F */ +- 0x88F4,0x88F9,0xF912,0x88FD,0x88E8,0x891A,0x88EF,0x8AA6,/* 0x70-0x77 */ ++ 0x88F4,0x88F9,0x88F8,0x88FD,0x88E8,0x891A,0x88EF,0x8AA6,/* 0x70-0x77 */ + 0x8A8C,0x8A9E,0x8AA3,0x8A8D,0x8AA1,0x8A93,0x8AA4,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0xF9A1,0x8AA5,0x8AA8,0x8A98,0x8A91,0x8A9A,0x8AA7,/* 0xA0-0xA7 */ ++ 0x0000,0x8AAA,0x8AA5,0x8AA8,0x8A98,0x8A91,0x8A9A,0x8AA7,/* 0xA0-0xA7 */ + 0x8C6A,0x8C8D,0x8C8C,0x8CD3,0x8CD1,0x8CD2,0x8D6B,0x8D99,/* 0xA8-0xAF */ + 0x8D95,0x8DFC,0x8F14,0x8F12,0x8F15,0x8F13,0x8FA3,0x9060,/* 0xB0-0xB7 */ + 0x9058,0x905C,0x9063,0x9059,0x905E,0x9062,0x905D,0x905B,/* 0xB8-0xBF */ +@@ -979,10 +973,10 @@ + 0x9280,0x9285,0x9298,0x9296,0x927B,0x9293,0x929C,0x92A8,/* 0xC8-0xCF */ + 0x927C,0x9291,0x95A1,0x95A8,0x95A9,0x95A3,0x95A5,0x95A4,/* 0xD0-0xD7 */ + 0x9699,0x969C,0x969B,0x96CC,0x96D2,0x9700,0x977C,0x9785,/* 0xD8-0xDF */ +- 0x97F6,0x9817,0xF9B4,0x98AF,0x98B1,0x9903,0x9905,0x990C,/* 0xE0-0xE7 */ ++ 0x97F6,0x9817,0x9818,0x98AF,0x98B1,0x9903,0x9905,0x990C,/* 0xE0-0xE7 */ + 0x9909,0x99C1,0x9AAF,0x9AB0,0x9AE6,0x9B41,0x9B42,0x9CF4,/* 0xE8-0xEF */ + 0x9CF6,0x9CF3,0x9EBC,0x9F3B,0x9F4A,0x5104,0x5100,0x50FB,/* 0xF0-0xF7 */ +- 0x50F5,0x50F9,0x5102,0x5108,0x5109,0x5105,0xF954,0x0000,/* 0xF8-0xFF */ ++ 0x50F5,0x50F9,0x5102,0x5108,0x5109,0x5105,0x51DC,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_BC[256] = { +@@ -994,12 +988,12 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x5287,0x5288,0xF9C7,0x528D,0x528A,0x52F0,0x53B2,0x562E,/* 0x40-0x47 */ ++ 0x5287,0x5288,0x5289,0x528D,0x528A,0x52F0,0x53B2,0x562E,/* 0x40-0x47 */ + 0x563B,0x5639,0x5632,0x563F,0x5634,0x5629,0x5653,0x564E,/* 0x48-0x4F */ + 0x5657,0x5674,0x5636,0x562F,0x5630,0x5880,0x589F,0x589E,/* 0x50-0x57 */ + 0x58B3,0x589C,0x58AE,0x58A9,0x58A6,0x596D,0x5B09,0x5AFB,/* 0x58-0x5F */ +- 0x5B0B,0x5AF5,0x5B0C,0x5B08,0xF9BC,0x5BEC,0x5BE9,0x5BEB,/* 0x60-0x67 */ +- 0x5C64,0xF9DF,0x5D9D,0x5D94,0x5E62,0x5E5F,0x5E61,0x5EE2,/* 0x68-0x6F */ ++ 0x5B0B,0x5AF5,0x5B0C,0x5B08,0x5BEE,0x5BEC,0x5BE9,0x5BEB,/* 0x60-0x67 */ ++ 0x5C64,0x5C65,0x5D9D,0x5D94,0x5E62,0x5E5F,0x5E61,0x5EE2,/* 0x68-0x6F */ + 0x5EDA,0x5EDF,0x5EDD,0x5EE3,0x5EE0,0x5F48,0x5F71,0x5FB7,/* 0x70-0x77 */ + 0x5FB5,0x6176,0x6167,0x616E,0x615D,0x6155,0x6182,0x0000,/* 0x78-0x7F */ + +@@ -1007,18 +1001,18 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x617C,0x6170,0x616B,0x617E,0x61A7,0xF98F,0x61AB,/* 0xA0-0xA7 */ +- 0x618E,0x61AC,0x619A,0x61A4,0x6194,0x61AE,0xF9D2,0x6469,/* 0xA8-0xAF */ ++ 0x0000,0x617C,0x6170,0x616B,0x617E,0x61A7,0x6190,0x61AB,/* 0xA0-0xA7 */ ++ 0x618E,0x61AC,0x619A,0x61A4,0x6194,0x61AE,0x622E,0x6469,/* 0xA8-0xAF */ + 0x646F,0x6479,0x649E,0x64B2,0x6488,0x6490,0x64B0,0x64A5,/* 0xB0-0xB7 */ +- 0x6493,0x6495,0x64A9,0x6492,0x64AE,0x64AD,0x64AB,0xF991,/* 0xB8-0xBF */ +- 0x64AC,0x6499,0x64A2,0x64B3,0x6575,0x6577,0xF969,0x66AE,/* 0xC0-0xC7 */ +- 0x66AB,0xFA06,0x66B1,0x6A23,0x6A1F,0x69E8,0x6A01,0x6A1E,/* 0xC8-0xCF */ +- 0x6A19,0x69FD,0x6A21,0xF94C,0x6A0A,0x69F3,0xF9BF,0x6A05,/* 0xD0-0xD7 */ ++ 0x6493,0x6495,0x64A9,0x6492,0x64AE,0x64AD,0x64AB,0x649A,/* 0xB8-0xBF */ ++ 0x64AC,0x6499,0x64A2,0x64B3,0x6575,0x6577,0x6578,0x66AE,/* 0xC0-0xC7 */ ++ 0x66AB,0x66B4,0x66B1,0x6A23,0x6A1F,0x69E8,0x6A01,0x6A1E,/* 0xC8-0xCF */ ++ 0x6A19,0x69FD,0x6A21,0x6A13,0x6A0A,0x69F3,0x6A02,0x6A05,/* 0xD0-0xD7 */ + 0x69ED,0x6A11,0x6B50,0x6B4E,0x6BA4,0x6BC5,0x6BC6,0x6F3F,/* 0xD8-0xDF */ + 0x6F7C,0x6F84,0x6F51,0x6F66,0x6F54,0x6F86,0x6F6D,0x6F5B,/* 0xE0-0xE7 */ + 0x6F78,0x6F6E,0x6F8E,0x6F7A,0x6F70,0x6F64,0x6F97,0x6F58,/* 0xE8-0xEF */ + 0x6ED5,0x6F6F,0x6F60,0x6F5F,0x719F,0x71AC,0x71B1,0x71A8,/* 0xF0-0xF7 */ +- 0x7256,0x729B,0x734E,0x7357,0xF9AE,0x748B,0x7483,0x0000,/* 0xF8-0xFF */ ++ 0x7256,0x729B,0x734E,0x7357,0x7469,0x748B,0x7483,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_BD[256] = { +@@ -1032,10 +1026,10 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x747E,0x7480,0x757F,0x7620,0x7629,0x761F,0x7624,0x7626,/* 0x40-0x47 */ + 0x7621,0x7622,0x769A,0x76BA,0x76E4,0x778E,0x7787,0x778C,/* 0x48-0x4F */ +- 0x7791,0x778B,0x78CB,0x78C5,0x78BA,0xF947,0x78BE,0x78D5,/* 0x50-0x57 */ ++ 0x7791,0x778B,0x78CB,0x78C5,0x78BA,0x78CA,0x78BE,0x78D5,/* 0x50-0x57 */ + 0x78BC,0x78D0,0x7A3F,0x7A3C,0x7A40,0x7A3D,0x7A37,0x7A3B,/* 0x58-0x5F */ + 0x7AAF,0x7AAE,0x7BAD,0x7BB1,0x7BC4,0x7BB4,0x7BC6,0x7BC7,/* 0x60-0x67 */ +- 0x7BC1,0x7BA0,0x7BCC,0x7CCA,0x7DE0,0xF996,0x7DEF,0x7DFB,/* 0x68-0x6F */ ++ 0x7BC1,0x7BA0,0x7BCC,0x7CCA,0x7DE0,0x7DF4,0x7DEF,0x7DFB,/* 0x68-0x6F */ + 0x7DD8,0x7DEC,0x7DDD,0x7DE8,0x7DE3,0x7DDA,0x7DDE,0x7DE9,/* 0x70-0x77 */ + 0x7D9E,0x7DD9,0x7DF2,0x7DF9,0x7F75,0x7F77,0x7FAF,0x0000,/* 0x78-0x7F */ + +@@ -1044,17 +1038,17 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x7FE9,0x8026,0x819B,0x819C,0x819D,0x81A0,0x819A,/* 0xA0-0xA7 */ +- 0x8198,0x8517,0x853D,0x851A,0xF999,0x852C,0x852D,0x8513,/* 0xA8-0xAF */ ++ 0x8198,0x8517,0x853D,0x851A,0x84EE,0x852C,0x852D,0x8513,/* 0xA8-0xAF */ + 0x8511,0x8523,0x8521,0x8514,0x84EC,0x8525,0x84FF,0x8506,/* 0xB0-0xB7 */ + 0x8782,0x8774,0x8776,0x8760,0x8766,0x8778,0x8768,0x8759,/* 0xB8-0xBF */ + 0x8757,0x874C,0x8753,0x885B,0x885D,0x8910,0x8907,0x8912,/* 0xC0-0xC7 */ +- 0x8913,0x8915,0x890A,0x8ABC,0xF97D,0x8AC7,0x8AC4,0x8A95,/* 0xC8-0xCF */ +- 0x8ACB,0xFA22,0x8AB2,0x8AC9,0x8AC2,0x8ABF,0x8AB0,0xF941,/* 0xD0-0xD7 */ +- 0x8ACD,0x8AB6,0x8AB9,0x8ADB,0x8C4C,0x8C4E,0xFA16,0x8CE0,/* 0xD8-0xDF */ ++ 0x8913,0x8915,0x890A,0x8ABC,0x8AD2,0x8AC7,0x8AC4,0x8A95,/* 0xC8-0xCF */ ++ 0x8ACB,0x8AF8,0x8AB2,0x8AC9,0x8AC2,0x8ABF,0x8AB0,0x8AD6,/* 0xD0-0xD7 */ ++ 0x8ACD,0x8AB6,0x8AB9,0x8ADB,0x8C4C,0x8C4E,0x8C6C,0x8CE0,/* 0xD8-0xDF */ + 0x8CDE,0x8CE6,0x8CE4,0x8CEC,0x8CED,0x8CE2,0x8CE3,0x8CDC,/* 0xE0-0xE7 */ + 0x8CEA,0x8CE1,0x8D6D,0x8D9F,0x8DA3,0x8E2B,0x8E10,0x8E1D,/* 0xE8-0xEF */ + 0x8E22,0x8E0F,0x8E29,0x8E1F,0x8E21,0x8E1E,0x8EBA,0x8F1D,/* 0xF0-0xF7 */ +- 0x8F1B,0x8F1F,0x8F29,0xF998,0xF9D7,0x8F1C,0x8F1E,0x0000,/* 0xF8-0xFF */ ++ 0x8F1B,0x8F1F,0x8F29,0x8F26,0x8F2A,0x8F1C,0x8F1E,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_BE[256] = { +@@ -1069,28 +1063,28 @@ + 0x8F25,0x9069,0x906E,0x9068,0x906D,0x9077,0x9130,0x912D,/* 0x40-0x47 */ + 0x9127,0x9131,0x9187,0x9189,0x918B,0x9183,0x92C5,0x92BB,/* 0x48-0x4F */ + 0x92B7,0x92EA,0x92AC,0x92E4,0x92C1,0x92B3,0x92BC,0x92D2,/* 0x50-0x57 */ +- 0x92C7,0x92F0,0x92B2,0xF986,0x95B1,0x9704,0x9706,0x9707,/* 0x58-0x5F */ ++ 0x92C7,0x92F0,0x92B2,0x95AD,0x95B1,0x9704,0x9706,0x9707,/* 0x58-0x5F */ + 0x9709,0x9760,0x978D,0x978B,0x978F,0x9821,0x982B,0x981C,/* 0x60-0x67 */ + 0x98B3,0x990A,0x9913,0x9912,0x9918,0x99DD,0x99D0,0x99DF,/* 0x68-0x6F */ + 0x99DB,0x99D1,0x99D5,0x99D2,0x99D9,0x9AB7,0x9AEE,0x9AEF,/* 0x70-0x77 */ +- 0x9B27,0x9B45,0x9B44,0x9B77,0xF939,0x9D06,0x9D09,0x0000,/* 0x78-0x7F */ ++ 0x9B27,0x9B45,0x9B44,0x9B77,0x9B6F,0x9D06,0x9D09,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x9D03,0x9EA9,0x9EBE,0xF989,0x58A8,0x9F52,0x5112,/* 0xA0-0xA7 */ ++ 0x0000,0x9D03,0x9EA9,0x9EBE,0x9ECE,0x58A8,0x9F52,0x5112,/* 0xA0-0xA7 */ + 0x5118,0x5114,0x5110,0x5115,0x5180,0x51AA,0x51DD,0x5291,/* 0xA8-0xAF */ + 0x5293,0x52F3,0x5659,0x566B,0x5679,0x5669,0x5664,0x5678,/* 0xB0-0xB7 */ + 0x566A,0x5668,0x5665,0x5671,0x566F,0x566C,0x5662,0x5676,/* 0xB8-0xBF */ + 0x58C1,0x58BE,0x58C7,0x58C5,0x596E,0x5B1D,0x5B34,0x5B78,/* 0xC0-0xC7 */ + 0x5BF0,0x5C0E,0x5F4A,0x61B2,0x6191,0x61A9,0x618A,0x61CD,/* 0xC8-0xCF */ + 0x61B6,0x61BE,0x61CA,0x61C8,0x6230,0x64C5,0x64C1,0x64CB,/* 0xD0-0xD7 */ +- 0x64BB,0x64BC,0x64DA,0xF930,0x64C7,0x64C2,0x64CD,0x64BF,/* 0xD8-0xDF */ +- 0x64D2,0x64D4,0x64BE,0x6574,0xF98B,0x66C9,0x66B9,0x66C4,/* 0xE0-0xE7 */ ++ 0x64BB,0x64BC,0x64DA,0x64C4,0x64C7,0x64C2,0x64CD,0x64BF,/* 0xD8-0xDF */ ++ 0x64D2,0x64D4,0x64BE,0x6574,0x66C6,0x66C9,0x66B9,0x66C4,/* 0xE0-0xE7 */ + 0x66C7,0x66B8,0x6A3D,0x6A38,0x6A3A,0x6A59,0x6A6B,0x6A58,/* 0xE8-0xEF */ + 0x6A39,0x6A44,0x6A62,0x6A61,0x6A4B,0x6A47,0x6A35,0x6A5F,/* 0xF0-0xF7 */ +- 0x6A48,0x6B59,0xF98C,0x6C05,0x6FC2,0x6FB1,0x6FA1,0x0000,/* 0xF8-0xFF */ ++ 0x6A48,0x6B59,0x6B77,0x6C05,0x6FC2,0x6FB1,0x6FA1,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_BF[256] = { +@@ -1103,30 +1097,30 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x6FC3,0x6FA4,0x6FC1,0x6FA7,0x6FB3,0x6FC0,0x6FB9,0x6FB6,/* 0x40-0x47 */ +- 0x6FA6,0x6FA0,0x6FB4,0x71BE,0x71C9,0xF9EE,0x71D2,0x71C8,/* 0x48-0x4F */ +- 0x71D5,0x71B9,0xF9C0,0x71D9,0x71DC,0x71C3,0x71C4,0x7368,/* 0x50-0x57 */ +- 0x749C,0x74A3,0xF9EF,0x749F,0x749E,0x74E2,0x750C,0x750D,/* 0x58-0x5F */ +- 0x7634,0x7638,0x763A,0xF933,0x76E5,0x77A0,0x779E,0x779F,/* 0x60-0x67 */ ++ 0x6FA6,0x6FA0,0x6FB4,0x71BE,0x71C9,0x71D0,0x71D2,0x71C8,/* 0x48-0x4F */ ++ 0x71D5,0x71B9,0x71CE,0x71D9,0x71DC,0x71C3,0x71C4,0x7368,/* 0x50-0x57 */ ++ 0x749C,0x74A3,0x7498,0x749F,0x749E,0x74E2,0x750C,0x750D,/* 0x58-0x5F */ ++ 0x7634,0x7638,0x763A,0x76E7,0x76E5,0x77A0,0x779E,0x779F,/* 0x60-0x67 */ + 0x77A5,0x78E8,0x78DA,0x78EC,0x78E7,0x79A6,0x7A4D,0x7A4E,/* 0x68-0x6F */ + 0x7A46,0x7A4C,0x7A4B,0x7ABA,0x7BD9,0x7C11,0x7BC9,0x7BE4,/* 0x70-0x77 */ +- 0x7BDB,0x7BE1,0x7BE9,0x7BE6,0x7CD5,0xFA03,0x7E0A,0x0000,/* 0x78-0x7F */ ++ 0x7BDB,0x7BE1,0x7BE9,0x7BE6,0x7CD5,0x7CD6,0x7E0A,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x7E11,0x7E08,0x7E1B,0x7E23,0x7E1E,0x7E1D,0x7E09,/* 0xA0-0xA7 */ +- 0x7E10,0xF9E6,0x7FB2,0x7FF0,0x7FF1,0x7FEE,0x8028,0x81B3,/* 0xA8-0xAF */ ++ 0x7E10,0x7F79,0x7FB2,0x7FF0,0x7FF1,0x7FEE,0x8028,0x81B3,/* 0xA8-0xAF */ + 0x81A9,0x81A8,0x81FB,0x8208,0x8258,0x8259,0x854A,0x8559,/* 0xB0-0xB7 */ + 0x8548,0x8568,0x8569,0x8543,0x8549,0x856D,0x856A,0x855E,/* 0xB8-0xBF */ + 0x8783,0x879F,0x879E,0x87A2,0x878D,0x8861,0x892A,0x8932,/* 0xC0-0xC7 */ + 0x8925,0x892B,0x8921,0x89AA,0x89A6,0x8AE6,0x8AFA,0x8AEB,/* 0xC8-0xCF */ +- 0x8AF1,0x8B00,0x8ADC,0x8AE7,0x8AEE,0xF95D,0x8B01,0x8B02,/* 0xD0-0xD7 */ ++ 0x8AF1,0x8B00,0x8ADC,0x8AE7,0x8AEE,0x8AFE,0x8B01,0x8B02,/* 0xD0-0xD7 */ + 0x8AF7,0x8AED,0x8AF3,0x8AF6,0x8AFC,0x8C6B,0x8C6D,0x8C93,/* 0xD8-0xDF */ +- 0x8CF4,0x8E44,0x8E31,0x8E34,0x8E42,0x8E39,0x8E35,0xFA07,/* 0xE0-0xE7 */ ++ 0x8CF4,0x8E44,0x8E31,0x8E34,0x8E42,0x8E39,0x8E35,0x8F3B,/* 0xE0-0xE7 */ + 0x8F2F,0x8F38,0x8F33,0x8FA8,0x8FA6,0x9075,0x9074,0x9078,/* 0xE8-0xEF */ +- 0x9072,0xF9C3,0x907A,0x9134,0x9192,0x9320,0x9336,0x92F8,/* 0xF0-0xF7 */ +- 0x9333,0x932F,0x9322,0x92FC,0x932B,0xF93F,0x931A,0x0000,/* 0xF8-0xFF */ ++ 0x9072,0x907C,0x907A,0x9134,0x9192,0x9320,0x9336,0x92F8,/* 0xF0-0xF7 */ ++ 0x9333,0x932F,0x9322,0x92FC,0x932B,0x9304,0x931A,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_C0[256] = { +@@ -1141,28 +1135,28 @@ + 0x9310,0x9326,0x9321,0x9315,0x932E,0x9319,0x95BB,0x96A7,/* 0x40-0x47 */ + 0x96A8,0x96AA,0x96D5,0x970E,0x9711,0x9716,0x970D,0x9713,/* 0x48-0x4F */ + 0x970F,0x975B,0x975C,0x9766,0x9798,0x9830,0x9838,0x983B,/* 0x50-0x57 */ +- 0x9837,0x982D,0x9839,0x9824,0x9910,0xFA2C,0x991E,0x991B,/* 0x58-0x5F */ +- 0x9921,0x991A,0x99ED,0x99E2,0xF91A,0x9AB8,0x9ABC,0x9AFB,/* 0x60-0x67 */ ++ 0x9837,0x982D,0x9839,0x9824,0x9910,0x9928,0x991E,0x991B,/* 0x58-0x5F */ ++ 0x9921,0x991A,0x99ED,0x99E2,0x99F1,0x9AB8,0x9ABC,0x9AFB,/* 0x60-0x67 */ + 0x9AED,0x9B28,0x9B91,0x9D15,0x9D23,0x9D26,0x9D28,0x9D12,/* 0x68-0x6F */ +- 0x9D1B,0x9ED8,0x9ED4,0xF9C4,0xF908,0x512A,0x511F,0x5121,/* 0x70-0x77 */ +- 0x5132,0xF97F,0x568E,0x5680,0x5690,0x5685,0x5687,0x0000,/* 0x78-0x7F */ ++ 0x9D1B,0x9ED8,0x9ED4,0x9F8D,0x9F9C,0x512A,0x511F,0x5121,/* 0x70-0x77 */ ++ 0x5132,0x52F5,0x568E,0x5680,0x5690,0x5685,0x5687,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x568F,0x58D5,0x58D3,0x58D1,0x58CE,0x5B30,0x5B2A,/* 0xA0-0xA7 */ +- 0x5B24,0x5B7A,0x5C37,0x5C68,0x5DBC,0xF9AB,0x5DBD,0x5DB8,/* 0xA8-0xAF */ ++ 0x5B24,0x5B7A,0x5C37,0x5C68,0x5DBC,0x5DBA,0x5DBD,0x5DB8,/* 0xA8-0xAF */ + 0x5E6B,0x5F4C,0x5FBD,0x61C9,0x61C2,0x61C7,0x61E6,0x61CB,/* 0xB0-0xB7 */ + 0x6232,0x6234,0x64CE,0x64CA,0x64D8,0x64E0,0x64F0,0x64E6,/* 0xB8-0xBF */ + 0x64EC,0x64F1,0x64E2,0x64ED,0x6582,0x6583,0x66D9,0x66D6,/* 0xC0-0xC7 */ + 0x6A80,0x6A94,0x6A84,0x6AA2,0x6A9C,0x6ADB,0x6AA3,0x6A7E,/* 0xC8-0xCF */ +- 0x6A97,0x6A90,0x6AA0,0x6B5C,0xF9A5,0x6BDA,0x6C08,0x6FD8,/* 0xD0-0xD7 */ +- 0x6FF1,0x6FDF,0x6FE0,0x6FDB,0x6FE4,0xF922,0x6FEF,0x6F80,/* 0xD8-0xDF */ ++ 0x6A97,0x6A90,0x6AA0,0x6B5C,0x6BAE,0x6BDA,0x6C08,0x6FD8,/* 0xD0-0xD7 */ ++ 0x6FF1,0x6FDF,0x6FE0,0x6FDB,0x6FE4,0x6FEB,0x6FEF,0x6F80,/* 0xD8-0xDF */ + 0x6FEC,0x6FE1,0x6FE9,0x6FD5,0x6FEE,0x6FF0,0x71E7,0x71DF,/* 0xE0-0xE7 */ + 0x71EE,0x71E6,0x71E5,0x71ED,0x71EC,0x71F4,0x71E0,0x7235,/* 0xE8-0xEF */ + 0x7246,0x7370,0x7372,0x74A9,0x74B0,0x74A6,0x74A8,0x7646,/* 0xF0-0xF7 */ +- 0xF9C1,0x764C,0x76EA,0x77B3,0x77AA,0x77B0,0x77AC,0x0000,/* 0xF8-0xFF */ ++ 0x7642,0x764C,0x76EA,0x77B3,0x77AA,0x77B0,0x77AC,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_C1[256] = { +@@ -1177,11 +1171,11 @@ + 0x77A7,0x77AD,0x77EF,0x78F7,0x78FA,0x78F4,0x78EF,0x7901,/* 0x40-0x47 */ + 0x79A7,0x79AA,0x7A57,0x7ABF,0x7C07,0x7C0D,0x7BFE,0x7BF7,/* 0x48-0x4F */ + 0x7C0C,0x7BE0,0x7CE0,0x7CDC,0x7CDE,0x7CE2,0x7CDF,0x7CD9,/* 0x50-0x57 */ +- 0x7CDD,0x7E2E,0x7E3E,0x7E46,0xF950,0x7E32,0x7E43,0x7E2B,/* 0x58-0x5F */ ++ 0x7CDD,0x7E2E,0x7E3E,0x7E46,0x7E37,0x7E32,0x7E43,0x7E2B,/* 0x58-0x5F */ + 0x7E3D,0x7E31,0x7E45,0x7E41,0x7E34,0x7E39,0x7E48,0x7E35,/* 0x60-0x67 */ + 0x7E3F,0x7E2F,0x7F44,0x7FF3,0x7FFC,0x8071,0x8072,0x8070,/* 0x68-0x6F */ +- 0xF997,0x8073,0x81C6,0x81C3,0x81BA,0x81C2,0x81C0,0x81BF,/* 0x70-0x77 */ +- 0x81BD,0x81C9,0x81BE,0xF9F6,0x8209,0x8271,0x85AA,0x0000,/* 0x78-0x7F */ ++ 0x806F,0x8073,0x81C6,0x81C3,0x81BA,0x81C2,0x81C0,0x81BF,/* 0x70-0x77 */ ++ 0x81BD,0x81C9,0x81BE,0x81E8,0x8209,0x8271,0x85AA,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ +@@ -1189,15 +1183,15 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x8584,0x857E,0x859C,0x8591,0x8594,0x85AF,0x859B,/* 0xA0-0xA7 */ + 0x8587,0x85A8,0x858A,0x8667,0x87C0,0x87D1,0x87B3,0x87D2,/* 0xA8-0xAF */ +- 0x87C6,0x87AB,0x87BB,0xF911,0x87C8,0x87CB,0x893B,0x8936,/* 0xB0-0xB7 */ ++ 0x87C6,0x87AB,0x87BB,0x87BA,0x87C8,0x87CB,0x893B,0x8936,/* 0xB0-0xB7 */ + 0x8944,0x8938,0x893D,0x89AC,0x8B0E,0x8B17,0x8B19,0x8B1B,/* 0xB8-0xBF */ + 0x8B0A,0x8B20,0x8B1D,0x8B04,0x8B10,0x8C41,0x8C3F,0x8C73,/* 0xC0-0xC7 */ + 0x8CFA,0x8CFD,0x8CFC,0x8CF8,0x8CFB,0x8DA8,0x8E49,0x8E4B,/* 0xC8-0xCF */ + 0x8E48,0x8E4A,0x8F44,0x8F3E,0x8F42,0x8F45,0x8F3F,0x907F,/* 0xD0-0xD7 */ + 0x907D,0x9084,0x9081,0x9082,0x9080,0x9139,0x91A3,0x919E,/* 0xD8-0xDF */ +- 0x919C,0x934D,0x9382,0x9328,0x9375,0xF99B,0x9365,0x934B,/* 0xE0-0xE7 */ ++ 0x919C,0x934D,0x9382,0x9328,0x9375,0x934A,0x9365,0x934B,/* 0xE0-0xE7 */ + 0x9318,0x937E,0x936C,0x935B,0x9370,0x935A,0x9354,0x95CA,/* 0xE8-0xEF */ +- 0x95CB,0x95CC,0x95C8,0x95C6,0x96B1,0xF9B8,0x96D6,0x971C,/* 0xF0-0xF7 */ ++ 0x95CB,0x95CC,0x95C8,0x95C6,0x96B1,0x96B8,0x96D6,0x971C,/* 0xF0-0xF7 */ + 0x971E,0x97A0,0x97D3,0x9846,0x98B6,0x9935,0x9A01,0x0000,/* 0xF8-0xFF */ + }; + +@@ -1212,28 +1206,28 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x99FF,0x9BAE,0x9BAB,0x9BAA,0x9BAD,0x9D3B,0x9D3F,0x9E8B,/* 0x40-0x47 */ + 0x9ECF,0x9EDE,0x9EDC,0x9EDD,0x9EDB,0x9F3E,0x9F4B,0x53E2,/* 0x48-0x4F */ +- 0x5695,0x56AE,0x58D9,0xF94A,0x5B38,0x5F5D,0x61E3,0x6233,/* 0x50-0x57 */ ++ 0x5695,0x56AE,0x58D9,0x58D8,0x5B38,0x5F5D,0x61E3,0x6233,/* 0x50-0x57 */ + 0x64F4,0x64F2,0x64FE,0x6506,0x64FA,0x64FB,0x64F7,0x65B7,/* 0x58-0x5F */ + 0x66DC,0x6726,0x6AB3,0x6AAC,0x6AC3,0x6ABB,0x6AB8,0x6AC2,/* 0x60-0x67 */ +- 0x6AAE,0x6AAF,0x6B5F,0x6B78,0x6BAF,0x7009,0x700B,0xF984,/* 0x68-0x6F */ ++ 0x6AAE,0x6AAF,0x6B5F,0x6B78,0x6BAF,0x7009,0x700B,0x6FFE,/* 0x68-0x6F */ + 0x7006,0x6FFA,0x7011,0x700F,0x71FB,0x71FC,0x71FE,0x71F8,/* 0x70-0x77 */ +- 0x7377,0xF9A7,0x74A7,0x74BF,0x7515,0x7656,0x7658,0x0000,/* 0x78-0x7F */ ++ 0x7377,0x7375,0x74A7,0x74BF,0x7515,0x7656,0x7658,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x7652,0x77BD,0x77BF,0x77BB,0x77BC,0x790E,0xF9B6,/* 0xA0-0xA7 */ ++ 0x0000,0x7652,0x77BD,0x77BF,0x77BB,0x77BC,0x790E,0x79AE,/* 0xA0-0xA7 */ + 0x7A61,0x7A62,0x7A60,0x7AC4,0x7AC5,0x7C2B,0x7C27,0x7C2A,/* 0xA8-0xAF */ +- 0x7C1E,0x7C23,0x7C21,0xF97B,0x7E54,0x7E55,0x7E5E,0x7E5A,/* 0xB0-0xB7 */ ++ 0x7C1E,0x7C23,0x7C21,0x7CE7,0x7E54,0x7E55,0x7E5E,0x7E5A,/* 0xB0-0xB7 */ + 0x7E61,0x7E52,0x7E59,0x7F48,0x7FF9,0x7FFB,0x8077,0x8076,/* 0xB8-0xBF */ +- 0x81CD,0x81CF,0x820A,0x85CF,0x85A9,0xF923,0x85D0,0x85C9,/* 0xC0-0xC7 */ ++ 0x81CD,0x81CF,0x820A,0x85CF,0x85A9,0x85CD,0x85D0,0x85C9,/* 0xC0-0xC7 */ + 0x85B0,0x85BA,0x85B9,0x85A6,0x87EF,0x87EC,0x87F2,0x87E0,/* 0xC8-0xCF */ + 0x8986,0x89B2,0x89F4,0x8B28,0x8B39,0x8B2C,0x8B2B,0x8C50,/* 0xD0-0xD7 */ + 0x8D05,0x8E59,0x8E63,0x8E66,0x8E64,0x8E5F,0x8E55,0x8EC0,/* 0xD8-0xDF */ + 0x8F49,0x8F4D,0x9087,0x9083,0x9088,0x91AB,0x91AC,0x91D0,/* 0xE0-0xE7 */ + 0x9394,0x938A,0x9396,0x93A2,0x93B3,0x93AE,0x93AC,0x93B0,/* 0xE8-0xEF */ +- 0x9398,0x939A,0x9397,0x95D4,0x95D6,0x95D0,0x95D5,0xF9EA,/* 0xF0-0xF7 */ ++ 0x9398,0x939A,0x9397,0x95D4,0x95D6,0x95D0,0x95D5,0x96E2,/* 0xF0-0xF7 */ + 0x96DC,0x96D9,0x96DB,0x96DE,0x9724,0x97A3,0x97A6,0x0000,/* 0xF8-0xFF */ + }; + +@@ -1250,9 +1244,9 @@ + 0x993E,0x993F,0x993D,0x992E,0x99A5,0x9A0E,0x9AC1,0x9B03,/* 0x48-0x4F */ + 0x9B06,0x9B4F,0x9B4E,0x9B4D,0x9BCA,0x9BC9,0x9BFD,0x9BC8,/* 0x50-0x57 */ + 0x9BC0,0x9D51,0x9D5D,0x9D60,0x9EE0,0x9F15,0x9F2C,0x5133,/* 0x58-0x5F */ +- 0x56A5,0x58DE,0xF942,0x58E2,0x5BF5,0x9F90,0xF982,0x61F2,/* 0x60-0x67 */ +- 0x61F7,0xF90D,0x61F5,0x6500,0x650F,0x66E0,0x66DD,0x6AE5,/* 0x68-0x6F */ +- 0x6ADD,0x6ADA,0xF931,0x701B,0x701F,0x7028,0x701A,0x701D,/* 0x70-0x77 */ ++ 0x56A5,0x58DE,0x58DF,0x58E2,0x5BF5,0x9F90,0x5EEC,0x61F2,/* 0x60-0x67 */ ++ 0x61F7,0x61F6,0x61F5,0x6500,0x650F,0x66E0,0x66DD,0x6AE5,/* 0x68-0x6F */ ++ 0x6ADD,0x6ADA,0x6AD3,0x701B,0x701F,0x7028,0x701A,0x701D,/* 0x70-0x77 */ + 0x7015,0x7018,0x7206,0x720D,0x7258,0x72A2,0x7378,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ +@@ -1260,17 +1254,17 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x737A,0x74BD,0x74CA,0x74E3,0x7587,0x7586,0x765F,/* 0xA0-0xA7 */ +- 0x7661,0x77C7,0x7919,0x79B1,0x7A6B,0x7A69,0xF9A6,0x7C3F,/* 0xA8-0xAF */ ++ 0x7661,0x77C7,0x7919,0x79B1,0x7A6B,0x7A69,0x7C3E,0x7C3F,/* 0xA8-0xAF */ + 0x7C38,0x7C3D,0x7C37,0x7C40,0x7E6B,0x7E6D,0x7E79,0x7E69,/* 0xB0-0xB7 */ +- 0x7E6A,0xF90F,0x7E73,0x7FB6,0x7FB9,0x7FB8,0xF926,0x85E9,/* 0xB8-0xBF */ ++ 0x7E6A,0x7F85,0x7E73,0x7FB6,0x7FB9,0x7FB8,0x81D8,0x85E9,/* 0xB8-0xBF */ + 0x85DD,0x85EA,0x85D5,0x85E4,0x85E5,0x85F7,0x87FB,0x8805,/* 0xC0-0xC7 */ + 0x880D,0x87F9,0x87FE,0x8960,0x895F,0x8956,0x895E,0x8B41,/* 0xC8-0xCF */ +- 0x8B5C,0xF9FC,0x8B49,0x8B5A,0x8B4E,0x8B4F,0x8B46,0x8B59,/* 0xD0-0xD7 */ ++ 0x8B5C,0x8B58,0x8B49,0x8B5A,0x8B4E,0x8B4F,0x8B46,0x8B59,/* 0xD0-0xD7 */ + 0x8D08,0x8D0A,0x8E7C,0x8E72,0x8E87,0x8E76,0x8E6C,0x8E7A,/* 0xD8-0xDF */ + 0x8E74,0x8F54,0x8F4E,0x8FAD,0x908A,0x908B,0x91B1,0x91AE,/* 0xE0-0xE7 */ + 0x93E1,0x93D1,0x93DF,0x93C3,0x93C8,0x93DC,0x93DD,0x93D6,/* 0xE8-0xEF */ + 0x93E2,0x93CD,0x93D8,0x93E4,0x93D7,0x93E8,0x95DC,0x96B4,/* 0xF0-0xF7 */ +- 0x96E3,0x972A,0x9727,0x9761,0x97DC,0x97FB,0xF9D0,0x0000,/* 0xF8-0xFF */ ++ 0x96E3,0x972A,0x9727,0x9761,0x97DC,0x97FB,0x985E,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_C4[256] = { +@@ -1284,11 +1278,11 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x9858,0x985B,0x98BC,0x9945,0x9949,0x9A16,0x9A19,0x9B0D,/* 0x40-0x47 */ + 0x9BE8,0x9BE7,0x9BD6,0x9BDB,0x9D89,0x9D61,0x9D72,0x9D6A,/* 0x48-0x4F */ +- 0x9D6C,0x9E92,0xF988,0x9E93,0x9EB4,0x52F8,0x56A8,0x56B7,/* 0x50-0x57 */ ++ 0x9D6C,0x9E92,0x9E97,0x9E93,0x9EB4,0x52F8,0x56A8,0x56B7,/* 0x50-0x57 */ + 0x56B6,0x56B4,0x56BC,0x58E4,0x5B40,0x5B43,0x5B7D,0x5BF6,/* 0x58-0x5F */ + 0x5DC9,0x61F8,0x61FA,0x6518,0x6514,0x6519,0x66E6,0x6727,/* 0x60-0x67 */ +- 0x6AEC,0x703E,0x7030,0x7032,0xF932,0x737B,0x74CF,0x7662,/* 0x68-0x6F */ +- 0x7665,0x7926,0xF985,0x792C,0x792B,0x7AC7,0x7AF6,0x7C4C,/* 0x70-0x77 */ ++ 0x6AEC,0x703E,0x7030,0x7032,0x7210,0x737B,0x74CF,0x7662,/* 0x68-0x6F */ ++ 0x7665,0x7926,0x792A,0x792C,0x792B,0x7AC7,0x7AF6,0x7C4C,/* 0x70-0x77 */ + 0x7C43,0x7C4D,0x7CEF,0x7CF0,0x8FAE,0x7E7D,0x7E7C,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ +@@ -1296,17 +1290,17 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x7E82,0x7F4C,0x8000,0x81DA,0x8266,0x85FB,0x85F9,/* 0xA0-0xA7 */ +- 0x8611,0xF9F0,0xF935,0x860B,0x8607,0x860A,0x8814,0x8815,/* 0xA8-0xAF */ +- 0xF924,0x89BA,0x89F8,0x8B70,0x8B6C,0x8B66,0x8B6F,0x8B5F,/* 0xB0-0xB7 */ +- 0x8B6B,0x8D0F,0x8D0D,0x8E89,0x8E81,0x8E85,0x8E82,0xF9B7,/* 0xB8-0xBF */ ++ 0x8611,0x85FA,0x8606,0x860B,0x8607,0x860A,0x8814,0x8815,/* 0xA8-0xAF */ ++ 0x8964,0x89BA,0x89F8,0x8B70,0x8B6C,0x8B66,0x8B6F,0x8B5F,/* 0xB0-0xB7 */ ++ 0x8B6B,0x8D0F,0x8D0D,0x8E89,0x8E81,0x8E85,0x8E82,0x91B4,/* 0xB8-0xBF */ + 0x91CB,0x9418,0x9403,0x93FD,0x95E1,0x9730,0x98C4,0x9952,/* 0xC0-0xC7 */ + 0x9951,0x99A8,0x9A2B,0x9A30,0x9A37,0x9A35,0x9C13,0x9C0D,/* 0xC8-0xCF */ + 0x9E79,0x9EB5,0x9EE8,0x9F2F,0x9F5F,0x9F63,0x9F61,0x5137,/* 0xD0-0xD7 */ + 0x5138,0x56C1,0x56C0,0x56C2,0x5914,0x5C6C,0x5DCD,0x61FC,/* 0xD8-0xDF */ +- 0x61FE,0x651D,0x651C,0x6595,0x66E9,0x6AFB,0xF91D,0x6AFA,/* 0xE0-0xE7 */ +- 0x6BB2,0x704C,0xF91E,0x72A7,0x74D6,0x74D4,0xF90E,0x77D3,/* 0xE8-0xEF */ +- 0x7C50,0x7E8F,0x7E8C,0x7FBC,0x8617,0xF91F,0x861A,0x8823,/* 0xF0-0xF7 */ +- 0x8822,0x8821,0xF927,0x896A,0x896C,0x89BD,0x8B74,0x0000,/* 0xF8-0xFF */ ++ 0x61FE,0x651D,0x651C,0x6595,0x66E9,0x6AFB,0x6B04,0x6AFA,/* 0xE0-0xE7 */ ++ 0x6BB2,0x704C,0x721B,0x72A7,0x74D6,0x74D4,0x7669,0x77D3,/* 0xE8-0xEF */ ++ 0x7C50,0x7E8F,0x7E8C,0x7FBC,0x8617,0x862D,0x861A,0x8823,/* 0xF0-0xF7 */ ++ 0x8822,0x8821,0x881F,0x896A,0x896C,0x89BD,0x8B74,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_C5[256] = { +@@ -1320,9 +1314,9 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ + 0x8B77,0x8B7D,0x8D13,0x8E8A,0x8E8D,0x8E8B,0x8F5F,0x8FAF,/* 0x40-0x47 */ + 0x91BA,0x942E,0x9433,0x9435,0x943A,0x9438,0x9432,0x942B,/* 0x48-0x4F */ +- 0x95E2,0x9738,0x9739,0xF938,0x97FF,0x9867,0x9865,0x9957,/* 0x50-0x57 */ ++ 0x95E2,0x9738,0x9739,0x9732,0x97FF,0x9867,0x9865,0x9957,/* 0x50-0x57 */ + 0x9A45,0x9A43,0x9A40,0x9A3E,0x9ACF,0x9B54,0x9B51,0x9C2D,/* 0x58-0x5F */ +- 0x9C25,0x9DAF,0xFA2D,0x9DC2,0x9DB8,0x9E9D,0x9EEF,0x9F19,/* 0x60-0x67 */ ++ 0x9C25,0x9DAF,0x9DB4,0x9DC2,0x9DB8,0x9E9D,0x9EEF,0x9F19,/* 0x60-0x67 */ + 0x9F5C,0x9F66,0x9F67,0x513C,0x513B,0x56C8,0x56CA,0x56C9,/* 0x68-0x6F */ + 0x5B7F,0x5DD4,0x5DD2,0x5F4E,0x61FF,0x6524,0x6B0A,0x6B61,/* 0x70-0x77 */ + 0x7051,0x7058,0x7380,0x74E4,0x758A,0x766E,0x766C,0x0000,/* 0x78-0x7F */ +@@ -1331,16 +1325,16 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x79B3,0xF944,0x7C5F,0xF945,0x807D,0x81DF,0x8972,/* 0xA0-0xA7 */ +- 0x896F,0x89FC,0xF95A,0x8D16,0x8D17,0x8E91,0x8E93,0x8F61,/* 0xA8-0xAF */ ++ 0x0000,0x79B3,0x7C60,0x7C5F,0x807E,0x807D,0x81DF,0x8972,/* 0xA0-0xA7 */ ++ 0x896F,0x89FC,0x8B80,0x8D16,0x8D17,0x8E91,0x8E93,0x8F61,/* 0xA8-0xAF */ + 0x9148,0x9444,0x9451,0x9452,0x973D,0x973E,0x97C3,0x97C1,/* 0xB0-0xB7 */ + 0x986B,0x9955,0x9A55,0x9A4D,0x9AD2,0x9B1A,0x9C49,0x9C31,/* 0xB8-0xBF */ + 0x9C3E,0x9C3B,0x9DD3,0x9DD7,0x9F34,0x9F6C,0x9F6A,0x9F94,/* 0xC0-0xC7 */ +- 0x56CC,0x5DD6,0xF990,0x6523,0x652B,0x652A,0x66EC,0x6B10,/* 0xC8-0xCF */ ++ 0x56CC,0x5DD6,0x6200,0x6523,0x652B,0x652A,0x66EC,0x6B10,/* 0xC8-0xCF */ + 0x74DA,0x7ACA,0x7C64,0x7C63,0x7C65,0x7E93,0x7E96,0x7E94,/* 0xD0-0xD7 */ +- 0x81E2,0x8638,0xF910,0x8831,0x8B8A,0x9090,0xF913,0x9463,/* 0xD8-0xDF */ ++ 0x81E2,0x8638,0x863F,0x8831,0x8B8A,0x9090,0x908F,0x9463,/* 0xD8-0xDF */ + 0x9460,0x9464,0x9768,0x986F,0x995C,0x9A5A,0x9A5B,0x9A57,/* 0xE0-0xE7 */ +- 0x9AD3,0x9AD4,0x9AD1,0x9C54,0xF9F2,0x9C56,0x9DE5,0xF9F3,/* 0xE8-0xEF */ ++ 0x9AD3,0x9AD4,0x9AD1,0x9C54,0x9C57,0x9C56,0x9DE5,0x9E9F,/* 0xE8-0xEF */ + 0x9EF4,0x56D1,0x58E9,0x652C,0x705E,0x7671,0x7672,0x77D7,/* 0xF0-0xF7 */ + 0x7F50,0x7F88,0x8836,0x8839,0x8862,0x8B93,0x8B92,0x0000,/* 0xF8-0xFF */ + }; +@@ -1354,14 +1348,14 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ +- 0x8B96,0x8277,0x8D1B,0x91C0,0x946A,0x9742,0xF9B3,0x9744,/* 0x40-0x47 */ +- 0x97C6,0x9870,0x9A5F,0x9B22,0x9B58,0x9C5F,0x9DF9,0xF93A,/* 0x48-0x4F */ ++ 0x8B96,0x8277,0x8D1B,0x91C0,0x946A,0x9742,0x9748,0x9744,/* 0x40-0x47 */ ++ 0x97C6,0x9870,0x9A5F,0x9B22,0x9B58,0x9C5F,0x9DF9,0x9DFA,/* 0x48-0x4F */ + 0x9E7C,0x9E7D,0x9F07,0x9F77,0x9F72,0x5EF3,0x6B16,0x7063,/* 0x50-0x57 */ + 0x7C6C,0x7C6E,0x883B,0x89C0,0x8EA1,0x91C1,0x9472,0x9470,/* 0x58-0x5F */ + 0x9871,0x995E,0x9AD6,0x9B23,0x9ECC,0x7064,0x77DA,0x8B9A,/* 0x60-0x67 */ + 0x9477,0x97C9,0x9A62,0x9A65,0x7E9C,0x8B9C,0x8EAA,0x91C5,/* 0x68-0x6F */ + 0x947D,0x947E,0x947C,0x9C77,0x9C78,0x9EF7,0x8C54,0x947F,/* 0x70-0x77 */ +- 0x9E1A,0x7228,0xF987,0x9B31,0x9E1B,0xF920,0x7C72,0x0000,/* 0x78-0x7F */ ++ 0x9E1A,0x7228,0x9A6A,0x9B31,0x9E1B,0x9E1E,0x7C72,0x0000,/* 0x78-0x7F */ + }; + + static wchar_t c2u_C9[256] = { +@@ -1468,7 +1462,7 @@ + 0x533C,0x5392,0x5394,0x5487,0x547F,0x5481,0x5491,0x5482,/* 0xD8-0xDF */ + 0x5488,0x546B,0x547A,0x547E,0x5465,0x546C,0x5474,0x5466,/* 0xE0-0xE7 */ + 0x548D,0x546F,0x5461,0x5460,0x5498,0x5463,0x5467,0x5464,/* 0xE8-0xEF */ +- 0x56F7,0xF9A9,0x576F,0x5772,0x576D,0x576B,0x5771,0x5770,/* 0xF0-0xF7 */ ++ 0x56F7,0x56F9,0x576F,0x5772,0x576D,0x576B,0x5771,0x5770,/* 0xF0-0xF7 */ + 0x5776,0x5780,0x5775,0x577B,0x5773,0x5774,0x5762,0x0000,/* 0xF8-0xFF */ + }; + +@@ -1496,12 +1490,12 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x6034,0x600A,0x6017,0x6033,0x601A,0x601E,0x602C,/* 0xA0-0xA7 */ + 0x6022,0x600D,0x6010,0x602E,0x6013,0x6011,0x600C,0x6009,/* 0xA8-0xAF */ +- 0xF9AC,0x6214,0x623D,0x62AD,0x62B4,0x62D1,0x62BE,0x62AA,/* 0xB0-0xB7 */ ++ 0x601C,0x6214,0x623D,0x62AD,0x62B4,0x62D1,0x62BE,0x62AA,/* 0xB0-0xB7 */ + 0x62B6,0x62CA,0x62AE,0x62B3,0x62AF,0x62BB,0x62A9,0x62B0,/* 0xB8-0xBF */ + 0x62B8,0x653D,0x65A8,0x65BB,0x6609,0x65FC,0x6604,0x6612,/* 0xC0-0xC7 */ + 0x6608,0x65FB,0x6603,0x660B,0x660D,0x6605,0x65FD,0x6611,/* 0xC8-0xCF */ + 0x6610,0x66F6,0x670A,0x6785,0x676C,0x678E,0x6792,0x6776,/* 0xD0-0xD7 */ +- 0xF9C8,0x6798,0x6786,0x6784,0x6774,0x678D,0x678C,0x677A,/* 0xD8-0xDF */ ++ 0x677B,0x6798,0x6786,0x6784,0x6774,0x678D,0x678C,0x677A,/* 0xD8-0xDF */ + 0x679F,0x6791,0x6799,0x6783,0x677D,0x6781,0x6778,0x6779,/* 0xE0-0xE7 */ + 0x6794,0x6B25,0x6B80,0x6B7E,0x6BDE,0x6C1D,0x6C93,0x6CEC,/* 0xE8-0xEF */ + 0x6CEB,0x6CEE,0x6CD9,0x6CB6,0x6CD4,0x6CAD,0x6CE7,0x6CB7,/* 0xF0-0xF7 */ +@@ -1572,7 +1566,7 @@ + 0x5E9B,0x5EA3,0x5EA5,0x5F07,0x5F2E,0x5F56,0x5F86,0x6037,/* 0xB8-0xBF */ + 0x6039,0x6054,0x6072,0x605E,0x6045,0x6053,0x6047,0x6049,/* 0xC0-0xC7 */ + 0x605B,0x604C,0x6040,0x6042,0x605F,0x6024,0x6044,0x6058,/* 0xC8-0xCF */ +- 0x6066,0x606E,0x6242,0x6243,0xF95B,0x630D,0x630B,0x62F5,/* 0xD0-0xD7 */ ++ 0x6066,0x606E,0x6242,0x6243,0x62CF,0x630D,0x630B,0x62F5,/* 0xD0-0xD7 */ + 0x630E,0x6303,0x62EB,0x62F9,0x630F,0x630C,0x62F8,0x62F6,/* 0xD8-0xDF */ + 0x6300,0x6313,0x6314,0x62FA,0x6315,0x62FB,0x62F0,0x6541,/* 0xE0-0xE7 */ + 0x6543,0x65AA,0x65BF,0x6636,0x6621,0x6632,0x6635,0x661C,/* 0xE8-0xEF */ +@@ -2027,7 +2021,7 @@ + 0x823C,0x823D,0x823F,0x8275,0x833B,0x83CF,0x83F9,0x8423,/* 0x58-0x5F */ + 0x83C0,0x83E8,0x8412,0x83E7,0x83E4,0x83FC,0x83F6,0x8410,/* 0x60-0x67 */ + 0x83C6,0x83C8,0x83EB,0x83E3,0x83BF,0x8401,0x83DD,0x83E5,/* 0x68-0x6F */ +- 0x83D8,0x83FF,0x83E1,0x83CB,0x83CE,0x83D6,0x83F5,0xF93E,/* 0x70-0x77 */ ++ 0x83D8,0x83FF,0x83E1,0x83CB,0x83CE,0x83D6,0x83F5,0x83C9,/* 0x70-0x77 */ + 0x8409,0x840F,0x83DE,0x8411,0x8406,0x83C2,0x83F3,0x0000,/* 0x78-0x7F */ + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ +@@ -2430,7 +2424,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ +- 0x0000,0x7362,0x7487,0xF994,0x748A,0x7486,0x7481,0x747D,/* 0xA0-0xA7 */ ++ 0x0000,0x7362,0x7487,0x7489,0x748A,0x7486,0x7481,0x747D,/* 0xA0-0xA7 */ + 0x7485,0x7488,0x747C,0x7479,0x7508,0x7507,0x757E,0x7625,/* 0xA8-0xAF */ + 0x761E,0x7619,0x761D,0x761C,0x7623,0x761A,0x7628,0x761B,/* 0xB0-0xB7 */ + 0x769C,0x769D,0x769E,0x769B,0x778D,0x778F,0x7789,0x7788,/* 0xB8-0xBF */ +@@ -2457,7 +2451,7 @@ + 0x8252,0x8250,0x824E,0x8251,0x8524,0x853B,0x850F,0x8500,/* 0x48-0x4F */ + 0x8529,0x850E,0x8509,0x850D,0x851F,0x850A,0x8527,0x851C,/* 0x50-0x57 */ + 0x84FB,0x852B,0x84FA,0x8508,0x850C,0x84F4,0x852A,0x84F2,/* 0x58-0x5F */ +- 0x8515,0x84F7,0x84EB,0x84F3,0xF9C2,0x8512,0x84EA,0x84E9,/* 0x60-0x67 */ ++ 0x8515,0x84F7,0x84EB,0x84F3,0x84FC,0x8512,0x84EA,0x84E9,/* 0x60-0x67 */ + 0x8516,0x84FE,0x8528,0x851D,0x852E,0x8502,0x84FD,0x851E,/* 0x68-0x6F */ + 0x84F6,0x8531,0x8526,0x84E7,0x84E8,0x84F0,0x84EF,0x84F9,/* 0x70-0x77 */ + 0x8518,0x8520,0x8530,0x850B,0x8519,0x852F,0x8662,0x0000,/* 0x78-0x7F */ +@@ -2513,7 +2507,7 @@ + 0x9B70,0x9B68,0x9B64,0x9B6C,0x9CFC,0x9CFA,0x9CFD,0x9CFF,/* 0xE0-0xE7 */ + 0x9CF7,0x9D07,0x9D00,0x9CF9,0x9CFB,0x9D08,0x9D05,0x9D04,/* 0xE8-0xEF */ + 0x9E83,0x9ED3,0x9F0F,0x9F10,0x511C,0x5113,0x5117,0x511A,/* 0xF0-0xF7 */ +- 0x5111,0xFA15,0x5334,0x53E1,0x5670,0x5660,0x566E,0x0000,/* 0xF8-0xFF */ ++ 0x5111,0x51DE,0x5334,0x53E1,0x5670,0x5660,0x566E,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t c2u_E9[256] = { +@@ -2683,7 +2677,7 @@ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ + 0x0000,0x77B4,0x77B1,0x77A8,0x77F0,0x78F3,0x78FD,0x7902,/* 0xA0-0xA7 */ +- 0xF964,0x78FC,0x78F2,0x7905,0x78F9,0x78FE,0x7904,0x79AB,/* 0xA8-0xAF */ ++ 0x78FB,0x78FC,0x78F2,0x7905,0x78F9,0x78FE,0x7904,0x79AB,/* 0xA8-0xAF */ + 0x79A8,0x7A5C,0x7A5B,0x7A56,0x7A58,0x7A54,0x7A5A,0x7ABE,/* 0xB0-0xB7 */ + 0x7AC0,0x7AC1,0x7C05,0x7C0F,0x7BF2,0x7C00,0x7BFF,0x7BFB,/* 0xB8-0xBF */ + 0x7C0E,0x7BF4,0x7C0B,0x7BF3,0x7C02,0x7C09,0x7C03,0x7C01,/* 0xC0-0xC7 */ +@@ -3033,7 +3027,7 @@ + 0x8635,0x8633,0x862C,0x8632,0x8636,0x882C,0x8828,0x8826,/* 0x48-0x4F */ + 0x882A,0x8825,0x8971,0x89BF,0x89BE,0x89FB,0x8B7E,0x8B84,/* 0x50-0x57 */ + 0x8B82,0x8B86,0x8B85,0x8B7F,0x8D15,0x8E95,0x8E94,0x8E9A,/* 0x58-0x5F */ +- 0x8E92,0x8E90,0x8E96,0x8E97,0x8F60,0xF98D,0x9147,0x944C,/* 0x60-0x67 */ ++ 0x8E92,0x8E90,0x8E96,0x8E97,0x8F60,0x8F62,0x9147,0x944C,/* 0x60-0x67 */ + 0x9450,0x944A,0x944B,0x944F,0x9447,0x9445,0x9448,0x9449,/* 0x68-0x6F */ + 0x9446,0x973F,0x97E3,0x986A,0x9869,0x98CB,0x9954,0x995B,/* 0x70-0x77 */ + 0x9A4E,0x9A53,0x9A54,0x9A4C,0x9A4F,0x9A48,0x9A4A,0x0000,/* 0x78-0x7F */ +@@ -3125,7 +3119,7 @@ + 0x2560,0x256C,0x2563,0x255A,0x2569,0x255D,0x2552,0x2564,/* 0xE0-0xE7 */ + 0x2555,0x255E,0x256A,0x2561,0x2558,0x2567,0x255B,0x2553,/* 0xE8-0xEF */ + 0x2565,0x2556,0x255F,0x256B,0x2562,0x2559,0x2568,0x255C,/* 0xF0-0xF7 */ +- 0x2551,0x2550,0x0000,0x0000,0x0000,0x0000,0x2593,0x0000,/* 0xF8-0xFF */ ++ 0x2551,0x2550,0x256D,0x256E,0x2570,0x256F,0x2593,0x0000,/* 0xF8-0xFF */ + }; + + static wchar_t *page_charset2uni[256] = { +@@ -3163,6 +3157,73 @@ + c2u_F8, c2u_F9, NULL, NULL, NULL, NULL, NULL, NULL, + }; + ++ ++static unsigned char u2c_00[512] = { ++ 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, /* 0x00-0x03 */ ++ 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, /* 0x04-0x07 */ ++ 0x00, 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, /* 0x08-0x0B */ ++ 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, /* 0x0C-0x0F */ ++ 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, /* 0x10-0x13 */ ++ 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, /* 0x14-0x17 */ ++ 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, /* 0x18-0x1B */ ++ 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, /* 0x1C-0x1F */ ++ 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, /* 0x20-0x23 */ ++ 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, /* 0x24-0x27 */ ++ 0x00, 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, /* 0x28-0x2B */ ++ 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2E, 0x00, 0x2F, /* 0x2C-0x2F */ ++ 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, /* 0x30-0x33 */ ++ 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, /* 0x34-0x37 */ ++ 0x00, 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, /* 0x38-0x3B */ ++ 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3F, /* 0x3C-0x3F */ ++ 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, /* 0x40-0x43 */ ++ 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, /* 0x44-0x47 */ ++ 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, /* 0x48-0x4B */ ++ 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, /* 0x4C-0x4F */ ++ 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, /* 0x50-0x53 */ ++ 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, /* 0x54-0x57 */ ++ 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, /* 0x58-0x5B */ ++ 0x00, 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00, 0x5F, /* 0x5C-0x5F */ ++ 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, /* 0x60-0x63 */ ++ 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, /* 0x64-0x67 */ ++ 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00, 0x6B, /* 0x68-0x6B */ ++ 0x00, 0x6C, 0x00, 0x6D, 0x00, 0x6E, 0x00, 0x6F, /* 0x6C-0x6F */ ++ 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, /* 0x70-0x73 */ ++ 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, /* 0x74-0x77 */ ++ 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, /* 0x78-0x7B */ ++ 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, /* 0x7C-0x7F */ ++ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xB1, /* 0xA4-0xA7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC2, /* 0xAC-0xAF */ ++ 0xA2, 0x58, 0xA1, 0xD3, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x50, /* 0xB4-0xB7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD1, /* 0xD4-0xD7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE4-0xE7 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD2, /* 0xF4-0xF7 */ ++}; ++ + static unsigned char u2c_02[512] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ +@@ -3224,7 +3285,7 @@ + + static unsigned char u2c_03[512] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ +- 0x00, 0x00, 0xA1, 0xC2, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ +@@ -3283,17 +3344,16 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x56, /* 0x10-0x13 */ +- 0xA1, 0x58, 0xA2, 0x77, 0xA1, 0xFC, 0x00, 0x00, /* 0x14-0x17 */ ++ 0xA1, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ + 0xA1, 0xA5, 0xA1, 0xA6, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ + 0xA1, 0xA7, 0xA1, 0xA8, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ +- 0x00, 0x00, 0x00, 0x00, 0xA1, 0x45, 0x00, 0x00, /* 0x20-0x23 */ +- 0xA3, 0xBB, 0xA1, 0x4C, 0xA1, 0x4B, 0xA1, 0x45, /* 0x24-0x27 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ ++ 0x00, 0x00, 0xA1, 0x4C, 0xA1, 0x4B, 0xA1, 0x45, /* 0x24-0x27 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ +- 0x00, 0x00, 0x00, 0x00, 0xA1, 0xAC, 0xA1, 0xB2, /* 0x30-0x33 */ ++ 0x00, 0x00, 0x00, 0x00, 0xA1, 0xAC, 0x00, 0x00, /* 0x30-0x33 */ + 0x00, 0x00, 0xA1, 0xAB, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xB0, /* 0x38-0x3B */ +- 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC3, 0x00, 0x00, /* 0x3C-0x3F */ + }; + + static unsigned char u2c_21[512] = { +@@ -3345,8 +3405,8 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ +- 0x00, 0x00, 0xA2, 0x41, 0xA2, 0x42, 0x00, 0x00, /* 0x14-0x17 */ +- 0xA2, 0x58, 0x00, 0x00, 0xA1, 0xD4, 0x00, 0x00, /* 0x18-0x1B */ ++ 0x00, 0x00, 0xA2, 0x41, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ ++ 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD4, 0x00, 0x00, /* 0x18-0x1B */ + 0x00, 0x00, 0x00, 0x00, 0xA1, 0xDB, 0xA1, 0xE8, /* 0x1C-0x1F */ + 0xA1, 0xE7, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xFD, /* 0x20-0x23 */ + 0x00, 0x00, 0xA1, 0xFC, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ +@@ -3364,7 +3424,7 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ +- 0xA1, 0xDA, 0xA1, 0xDD, 0x00, 0x00, 0xA1, 0xDD, /* 0x60-0x63 */ ++ 0xA1, 0xDA, 0xA1, 0xDD, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ + 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD8, 0xA1, 0xD9, /* 0x64-0x67 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ +@@ -3391,11 +3451,6 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xE9, /* 0xBC-0xBF */ + }; + +-static unsigned char u2c_23[512] = { +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x5B, /* 0x04-0x07 */ +-}; +- + static unsigned char u2c_25[512] = { + 0xA2, 0x77, 0x00, 0x00, 0xA2, 0x78, 0x00, 0x00, /* 0x00-0x03 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ +@@ -3424,8 +3479,8 @@ + 0xF9, 0xE0, 0xF9, 0xEB, 0xF9, 0xF4, 0xF9, 0xE2, /* 0x60-0x63 */ + 0xF9, 0xE7, 0xF9, 0xF0, 0xF9, 0xDE, 0xF9, 0xED, /* 0x64-0x67 */ + 0xF9, 0xF6, 0xF9, 0xE4, 0xF9, 0xEA, 0xF9, 0xF3, /* 0x68-0x6B */ +- 0xF9, 0xE1, 0xA2, 0x7E, 0xA2, 0xA1, 0xA2, 0xA3, /* 0x6C-0x6F */ +- 0xA2, 0xA2, 0xA2, 0xAC, 0xA2, 0xAD, 0xA2, 0xAE, /* 0x70-0x73 */ ++ 0xF9, 0xE1, 0xF9, 0xFA, 0xF9, 0xFB, 0xF9, 0xFD, /* 0x6C-0x6F */ ++ 0xF9, 0xFC, 0xA2, 0xAC, 0xA2, 0xAD, 0xA2, 0xAE, /* 0x70-0x73 */ + 0xA1, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ +@@ -3461,7 +3516,7 @@ + static unsigned char u2c_26[512] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ + 0x00, 0x00, 0xA1, 0xB9, 0xA1, 0xB8, 0x00, 0x00, /* 0x04-0x07 */ +- 0x00, 0x00, 0xA1, 0xF3, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ +@@ -3475,7 +3530,7 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ +- 0xA1, 0xF0, 0xA1, 0xF2, 0xA1, 0xF1, 0x00, 0x00, /* 0x40-0x43 */ ++ 0xA1, 0xF0, 0x00, 0x00, 0xA1, 0xF1, 0x00, 0x00, /* 0x40-0x43 */ + }; + + static unsigned char u2c_30[512] = { +@@ -3486,12 +3541,10 @@ + 0xA1, 0x69, 0xA1, 0x6A, 0xA2, 0x45, 0x00, 0x00, /* 0x10-0x13 */ + 0xA1, 0x65, 0xA1, 0x66, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ +- 0xA1, 0xE3, 0xA1, 0xA9, 0xA1, 0xAA, 0x00, 0x00, /* 0x1C-0x1F */ ++ 0x00, 0x00, 0xA1, 0xA9, 0xA1, 0xAA, 0x00, 0x00, /* 0x1C-0x1F */ + 0x00, 0x00, 0xA2, 0xC3, 0xA2, 0xC4, 0xA2, 0xC5, /* 0x20-0x23 */ + 0xA2, 0xC6, 0xA2, 0xC7, 0xA2, 0xC8, 0xA2, 0xC9, /* 0x24-0x27 */ + 0xA2, 0xCA, 0xA2, 0xCB, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ +- 0xA1, 0xCA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ + }; + + static unsigned char u2c_31[512] = { +@@ -3506,36 +3559,6 @@ + 0xA3, 0xB1, 0xA3, 0xB2, 0xA3, 0xB3, 0xA3, 0xB4, /* 0x20-0x23 */ + 0xA3, 0xB5, 0xA3, 0xB6, 0xA3, 0xB7, 0xA3, 0xB8, /* 0x24-0x27 */ + 0xA3, 0xB9, 0xA3, 0xBA, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ +- +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ +- 0x00, 0x00, 0x00, 0x00, 0xA4, 0x40, 0xA4, 0x47, /* 0x90-0x93 */ +- 0xA4, 0x54, 0xA5, 0x7C, 0xA4, 0x57, 0xA4, 0xA4, /* 0x94-0x97 */ +- 0xA4, 0x55, 0xA5, 0xD2, 0xA4, 0x41, 0xA4, 0xFE, /* 0x98-0x9B */ +- 0xA4, 0x42, 0xA4, 0xD1, 0xA6, 0x61, 0xA4, 0x48, /* 0x9C-0x9F */ + }; + + static unsigned char u2c_32[512] = { +@@ -3547,15 +3570,15 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ +- 0xA4, 0x40, 0xA4, 0x47, 0xA4, 0x54, 0xA5, 0x7C, /* 0x20-0x23 */ +- 0xA4, 0xAD, 0xA4, 0xBB, 0xA4, 0x43, 0xA4, 0x4B, /* 0x24-0x27 */ +- 0xA4, 0x45, 0xA4, 0x51, 0xA4, 0xEB, 0xA4, 0xF5, /* 0x28-0x2B */ +- 0xA4, 0xF4, 0xA4, 0xEC, 0xAA, 0xF7, 0xA4, 0x67, /* 0x2C-0x2F */ +- 0xA4, 0xE9, 0xAE, 0xE8, 0xA6, 0xB3, 0xAA, 0xC0, /* 0x30-0x33 */ +- 0xA6, 0x57, 0xAF, 0x53, 0xB0, 0x5D, 0xAF, 0xAC, /* 0x34-0x37 */ +- 0xB3, 0xD2, 0xA5, 0x4E, 0xA9, 0x49, 0xBE, 0xC7, /* 0x38-0x3B */ +- 0xBA, 0xCA, 0xA5, 0xF8, 0xB8, 0xEA, 0xA8, 0xF3, /* 0x3C-0x3F */ +- 0xB2, 0xBD, 0xA5, 0xF0, 0xA6, 0xDB, 0xA6, 0xDC, /* 0x40-0x43 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ +@@ -3572,19 +3595,15 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ + +- 0xA4, 0x40, 0xA4, 0x47, 0xA4, 0x54, 0xA5, 0x7C, /* 0x80-0x83 */ +- 0xA4, 0xAD, 0xA4, 0xBB, 0xA4, 0x43, 0xA4, 0x4B, /* 0x84-0x87 */ +- 0xA4, 0x45, 0xA4, 0x51, 0xA4, 0xEB, 0xA4, 0xF5, /* 0x88-0x8B */ +- 0xA4, 0xF4, 0xA4, 0xEC, 0xAA, 0xF7, 0xA4, 0x67, /* 0x8C-0x8F */ +- 0xA4, 0xE9, 0xAE, 0xE8, 0xA6, 0xB3, 0xAA, 0xC0, /* 0x90-0x93 */ +- 0xA6, 0x57, 0xAF, 0x53, 0xB0, 0x5D, 0xAF, 0xAC, /* 0x94-0x97 */ +- 0xB3, 0xD2, 0xAF, 0xB5, 0xA8, 0x6B, 0xA4, 0x6B, /* 0x98-0x9B */ +- 0xBE, 0x41, 0xC0, 0x75, 0xA6, 0x4C, 0xAA, 0x60, /* 0x9C-0x9F */ +- 0xB6, 0xB5, 0xA5, 0xF0, 0xBC, 0x67, 0xA1, 0xC0, /* 0xA0-0xA3 */ +- 0xA4, 0x57, 0xA4, 0xA4, 0xA4, 0x55, 0xA5, 0xAA, /* 0xA4-0xA7 */ +- 0xA5, 0x6B, 0xC2, 0xE5, 0xA9, 0x76, 0xBE, 0xC7, /* 0xA8-0xAB */ +- 0xBA, 0xCA, 0xA5, 0xF8, 0xB8, 0xEA, 0xA8, 0xF3, /* 0xAC-0xAF */ +- 0xA9, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC0, /* 0xA0-0xA3 */ + }; + + static unsigned char u2c_33[512] = { +@@ -4594,7 +4613,6 @@ + 0xBE, 0xC8, 0xEC, 0xD8, 0xEC, 0xD9, 0x00, 0x00, /* 0xF0-0xF3 */ + 0x00, 0x00, 0xC3, 0x64, 0xC4, 0x5F, 0x00, 0x00, /* 0xF4-0xF7 */ + 0xA4, 0x6F, 0x00, 0x00, 0xA6, 0x78, 0x00, 0x00, /* 0xF8-0xFB */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ + }; + + static unsigned char u2c_5C[512] = { +@@ -5138,7 +5156,6 @@ + 0xD9, 0x6F, 0xDD, 0x78, 0xD9, 0x60, 0xD9, 0x5B, /* 0xF0-0xF3 */ + 0xB4, 0xA9, 0xD9, 0x61, 0xD9, 0x5E, 0x00, 0x00, /* 0xF4-0xF7 */ + 0x00, 0x00, 0xB4, 0xAE, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ + }; + + static unsigned char u2c_64[512] = { +@@ -6633,7 +6650,6 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ + 0x00, 0x00, 0x00, 0x00, 0xD6, 0xC6, 0xD6, 0xC7, /* 0xF4-0xF7 */ + 0xD6, 0xC5, 0x00, 0x00, 0xD6, 0xC4, 0xB2, 0xBE, /* 0xF8-0xFB */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ + }; + + static unsigned char u2c_7A[512] = { +@@ -9112,91 +9128,12 @@ + 0xF9, 0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ + }; + +-static unsigned char u2c_DC[512] = { +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ +-}; +- +-static unsigned char u2c_F9[512] = { +- 0xB0, 0x5A, 0xA7, 0xF3, 0xA8, 0xAE, 0xB8, 0xEB, /* 0x00-0x03 */ +- 0xB7, 0xC6, 0xA6, 0xEA, 0xA5, 0x79, 0xC0, 0x74, /* 0x04-0x07 */ +- 0xC0, 0x74, 0xAB, 0xB4, 0xAA, 0xF7, 0xB3, 0xE2, /* 0x08-0x0B */ +- 0xA9, 0x60, 0xC3, 0x69, 0xC4, 0xEE, 0xC3, 0xB9, /* 0x0C-0x0F */ +- 0xC5, 0xDA, 0xC1, 0xB3, 0xBB, 0x72, 0xC5, 0xDE, /* 0x10-0x13 */ +- 0xBC, 0xD6, 0xAC, 0xA5, 0xAF, 0x4F, 0xAF, 0x5F, /* 0x14-0x17 */ +- 0xB8, 0xA8, 0xB9, 0x54, 0xC0, 0x64, 0xB6, 0xC3, /* 0x18-0x1B */ +- 0xA7, 0x5A, 0xC4, 0xE6, 0xC4, 0xEA, 0xC4, 0xF5, /* 0x1C-0x1F */ +- 0xC6, 0x7D, 0xB4, 0x50, 0xC0, 0xDD, 0xC2, 0xC5, /* 0x20-0x23 */ +- 0xC4, 0xB0, 0xA9, 0xD4, 0xC3, 0xBE, 0xC4, 0xFA, /* 0x24-0x27 */ +- 0xB4, 0x59, 0xAE, 0xD4, 0xAE, 0xF6, 0xAF, 0x54, /* 0x28-0x2B */ +- 0x00, 0x00, 0xA8, 0xD3, 0xA7, 0x4E, 0xB3, 0xD2, /* 0x2C-0x2F */ +- 0xBE, 0xDB, 0xC3, 0x72, 0xC4, 0x6C, 0xBF, 0x63, /* 0x30-0x33 */ +- 0xA6, 0xD1, 0xC4, 0xAA, 0xB8, 0xB8, 0xB8, 0xF4, /* 0x34-0x37 */ +- 0xC5, 0x53, 0xBE, 0x7C, 0xC6, 0x4F, 0xB8, 0x4C, /* 0x38-0x3B */ +- 0xB8, 0x53, 0xBA, 0xF1, 0xDB, 0x77, 0xBF, 0xFD, /* 0x3C-0x3F */ +- 0xB3, 0xC0, 0xBD, 0xD7, 0xC3, 0x62, 0xA7, 0xCB, /* 0x40-0x43 */ +- 0xC5, 0xA2, 0xC5, 0xA4, 0xA8, 0x63, 0xBD, 0x55, /* 0x44-0x47 */ +- 0xB8, 0xEF, 0xB9, 0x70, 0xC2, 0x53, 0xB9, 0xF0, /* 0x48-0x4B */ +- 0xBC, 0xD3, 0xB2, 0x5C, 0xBA, 0x7C, 0xB2, 0xD6, /* 0x4C-0x4F */ +- 0xC1, 0x5C, 0xAD, 0xAE, 0xB0, 0xC7, 0xA6, 0xD8, /* 0x50-0x53 */ +- 0xBB, 0xFE, 0xAD, 0xE2, 0xB8, 0x57, 0xBA, 0xF0, /* 0x54-0x57 */ +- 0xB5, 0xD9, 0xB3, 0xAE, 0xC5, 0xAA, 0xCE, 0xD4, /* 0x58-0x5B */ +- 0xBC, 0xD6, 0xBF, 0xD5, 0xA4, 0xA6, 0xB9, 0xE7, /* 0x5C-0x5F */ +- 0xAB, 0xE3, 0xB2, 0x76, 0xB2, 0xA7, 0xA5, 0x5F, /* 0x60-0x63 */ +- 0xED, 0xA8, 0xAB, 0x4B, 0xB4, 0x5F, 0xA4, 0xA3, /* 0x64-0x67 */ +- 0xAA, 0x63, 0xBC, 0xC6, 0xAF, 0xC1, 0xB0, 0xD1, /* 0x68-0x6B */ +- 0xB6, 0xEB, 0xAC, 0xD9, 0xB8, 0xAD, 0xBB, 0xA1, /* 0x6C-0x6F */ +- 0xB1, 0xFE, 0xA8, 0xB0, 0xA8, 0x48, 0xAC, 0x42, /* 0x70-0x73 */ +- 0xAD, 0x59, 0xB1, 0xB0, 0xB2, 0xA4, 0xAB, 0x47, /* 0x74-0x77 */ +- 0xA8, 0xE2, 0x00, 0x00, 0xB1, 0xE7, 0xC2, 0xB3, /* 0x78-0x7B */ +- 0xA8, 0x7D, 0xBD, 0xCC, 0xB6, 0x71, 0xC0, 0x79, /* 0x7C-0x7F */ +- +- 0xA7, 0x66, 0xA4, 0x6B, 0xC3, 0x66, 0xAE, 0xC8, /* 0x80-0x83 */ +- 0xC2, 0x6F, 0xC4, 0x72, 0xBE, 0x5B, 0xC6, 0x7A, /* 0x84-0x87 */ +- 0xC4, 0x52, 0xBE, 0xA4, 0xA4, 0x4F, 0xBE, 0xE4, /* 0x88-0x8B */ +- 0xBE, 0xFA, 0xF7, 0x65, 0xA6, 0x7E, 0xBC, 0xA6, /* 0x8C-0x8F */ +- 0xC5, 0xCA, 0xBC, 0xBF, 0xBA, 0xA7, 0xB7, 0xD2, /* 0x90-0x93 */ +- 0xE6, 0xA3, 0x00, 0x00, 0xBD, 0x6D, 0xC1, 0x70, /* 0x94-0x97 */ +- 0xBD, 0xFB, 0xBD, 0xAC, 0xB3, 0x73, 0xC1, 0xE5, /* 0x98-0x9B */ +- 0xA6, 0x43, 0xA6, 0x48, 0xAB, 0x7C, 0xAF, 0x50, /* 0x9C-0x9F */ +- 0xB5, 0xF5, 0xBB, 0xA1, 0xB7, 0x47, 0xA9, 0xC0, /* 0xA0-0xA3 */ +- 0xB1, 0xC9, 0xC0, 0xD4, 0xC3, 0xAE, 0xC2, 0x79, /* 0xA4-0xA7 */ +- 0xA5, 0x4F, 0xCB, 0xF1, 0xB9, 0xE7, 0xC0, 0xAD, /* 0xA8-0xAB */ +- 0xCC, 0xB0, 0xAC, 0xC2, 0xBC, 0xFC, 0xB2, 0xDC, /* 0xAC-0xAF */ +- 0xB2, 0xE2, 0xB9, 0x61, 0xB9, 0x73, 0xC6, 0x46, /* 0xB0-0xB3 */ +- 0xBB, 0xE2, 0xA8, 0xD2, 0xC2, 0xA7, 0xC4, 0xBF, /* 0xB4-0xB7 */ +- 0xC1, 0xF5, 0xB4, 0x63, 0xA4, 0x46, 0xB9, 0xB1, /* 0xB8-0xBB */ +- 0xBC, 0x64, 0xA7, 0xBF, 0xAE, 0xC6, 0xBC, 0xD6, /* 0xBC-0xBF */ +- 0xBF, 0x52, 0xC0, 0xF8, 0xE7, 0x64, 0xBF, 0xF1, /* 0xC0-0xC3 */ +- 0xC0, 0x73, 0xB7, 0x77, 0xA8, 0xBF, 0xBC, 0x42, /* 0xC4-0xC7 */ +- 0xCC, 0xD8, 0xAC, 0x68, 0xAC, 0x79, 0xB7, 0xC8, /* 0xC8-0xCB */ +- 0xAF, 0x5B, 0xAF, 0x64, 0xB2, 0xB8, 0xAF, 0xC3, /* 0xCC-0xCF */ +- 0xC3, 0xFE, 0xA4, 0xBB, 0xBC, 0xAE, 0xB3, 0xB0, /* 0xD0-0xD3 */ +- 0xAD, 0xDB, 0xB1, 0x5B, 0xB2, 0x5F, 0xBD, 0xFC, /* 0xD4-0xD7 */ +- 0xAB, 0xDF, 0xB7, 0x58, 0xAE, 0xDF, 0xB2, 0x76, /* 0xD8-0xDB */ +- 0xB6, 0xA9, 0xA7, 0x51, 0xA6, 0x4F, 0xBC, 0x69, /* 0xDC-0xDF */ +- 0xA9, 0xF6, 0xA7, 0xF5, 0xB1, 0xF9, 0xAA, 0x64, /* 0xE0-0xE3 */ +- 0xB2, 0x7A, 0xB5, 0x67, 0xBF, 0xA9, 0x00, 0x00, /* 0xE4-0xE7 */ +- 0xB8, 0xCC, 0xA8, 0xBD, 0xC2, 0xF7, 0xB0, 0xCE, /* 0xE8-0xEB */ +- 0xB7, 0xC4, 0xA7, 0x5B, 0xBF, 0x4D, 0xBF, 0x5A, /* 0xEC-0xEF */ +- 0xC4, 0xA9, 0x00, 0x00, 0xC5, 0xEC, 0xC5, 0xEF, /* 0xF0-0xF3 */ +- 0xAA, 0x4C, 0xB2, 0x4F, 0xC1, 0x7B, 0xA5, 0xDF, /* 0xF4-0xF7 */ +- 0xB2, 0xC1, 0xB2, 0xC9, 0xAA, 0xAC, 0xAA, 0xA5, /* 0xF8-0xFB */ +- 0xC3, 0xD1, 0xA4, 0xB0, 0xAF, 0xF9, 0xA8, 0xEB, /* 0xFC-0xFF */ +-}; + + static unsigned char u2c_FA[512] = { +- 0xA4, 0xC1, 0xAB, 0xD7, 0xA9, 0xDD, 0xBF, 0x7D, /* 0x00-0x03 */ +- 0xA6, 0x76, 0xAC, 0x7D, 0xBC, 0xC9, 0xBF, 0xE7, /* 0x04-0x07 */ +- 0xA6, 0xE6, 0xAD, 0xB0, 0xA8, 0xA3, 0xB9, 0xF8, /* 0x08-0x0B */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ + 0xC9, 0x4A, 0xDD, 0xFC, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ +- 0xB6, 0xEF, 0x00, 0x00, 0xB4, 0xB8, 0x00, 0x00, /* 0x10-0x13 */ +- 0x00, 0x00, 0xE8, 0xF9, 0xBD, 0xDE, 0xAF, 0x71, /* 0x14-0x17 */ +- 0x00, 0x00, 0xAF, 0xAB, 0xB2, 0xBB, 0xBA, 0xD6, /* 0x18-0x1B */ +- 0xB9, 0x74, 0xBA, 0xEB, 0xA6, 0xD0, 0x00, 0x00, /* 0x1C-0x1F */ +- 0x00, 0x00, 0x00, 0x00, 0xBD, 0xD1, 0x00, 0x00, /* 0x20-0x23 */ +- 0x00, 0x00, 0xB6, 0x68, 0xB3, 0xA3, 0x00, 0x00, /* 0x24-0x27 */ +- 0x00, 0x00, 0x00, 0x00, 0xB6, 0xBA, 0xB9, 0x7D, /* 0x28-0x2B */ +- 0xC0, 0x5D, 0xC5, 0x62, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ + }; + + static unsigned char u2c_FE[512] = { +@@ -9230,8 +9167,8 @@ + }; + + static unsigned char u2c_FF[512] = { +- 0x00, 0x00, 0xA1, 0x49, 0xA1, 0xA8, 0xA1, 0xAD, /* 0x00-0x03 */ +- 0xA2, 0x43, 0xA2, 0x48, 0xA1, 0xAE, 0xA1, 0xA6, /* 0x04-0x07 */ ++ 0x00, 0x00, 0xA1, 0x49, 0x00, 0x00, 0xA1, 0xAD, /* 0x00-0x03 */ ++ 0xA2, 0x43, 0xA2, 0x48, 0xA1, 0xAE, 0x00, 0x00, /* 0x04-0x07 */ + 0xA1, 0x5D, 0xA1, 0x5E, 0xA1, 0xAF, 0xA1, 0xCF, /* 0x08-0x0B */ + 0xA1, 0x41, 0xA1, 0xD0, 0xA1, 0x44, 0xA1, 0xFE, /* 0x0C-0x0F */ + 0xA2, 0xAF, 0xA2, 0xB0, 0xA2, 0xB1, 0xA2, 0xB2, /* 0x10-0x13 */ +@@ -9244,9 +9181,9 @@ + 0xA2, 0xDA, 0xA2, 0xDB, 0xA2, 0xDC, 0xA2, 0xDD, /* 0x2C-0x2F */ + 0xA2, 0xDE, 0xA2, 0xDF, 0xA2, 0xE0, 0xA2, 0xE1, /* 0x30-0x33 */ + 0xA2, 0xE2, 0xA2, 0xE3, 0xA2, 0xE4, 0xA2, 0xE5, /* 0x34-0x37 */ +- 0xA2, 0xE6, 0xA2, 0xE7, 0xA2, 0xE8, 0xA1, 0x65, /* 0x38-0x3B */ +- 0xA2, 0x40, 0xA1, 0x66, 0xA1, 0x73, 0xA1, 0xC4, /* 0x3C-0x3F */ +- 0xA1, 0xA5, 0xA2, 0xE9, 0xA2, 0xEA, 0xA2, 0xEB, /* 0x40-0x43 */ ++ 0xA2, 0xE6, 0xA2, 0xE7, 0xA2, 0xE8, 0x00, 0x00, /* 0x38-0x3B */ ++ 0xA2, 0x40, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC4, /* 0x3C-0x3F */ ++ 0x00, 0x00, 0xA2, 0xE9, 0xA2, 0xEA, 0xA2, 0xEB, /* 0x40-0x43 */ + 0xA2, 0xEC, 0xA2, 0xED, 0xA2, 0xEE, 0xA2, 0xEF, /* 0x44-0x47 */ + 0xA2, 0xF0, 0xA2, 0xF1, 0xA2, 0xF2, 0xA2, 0xF3, /* 0x48-0x4B */ + 0xA2, 0xF4, 0xA2, 0xF5, 0xA2, 0xF6, 0xA2, 0xF7, /* 0x4C-0x4F */ +@@ -9255,7 +9192,7 @@ + 0xA3, 0x41, 0xA3, 0x42, 0xA3, 0x43, 0xA1, 0x61, /* 0x58-0x5B */ + 0xA1, 0x55, 0xA1, 0x62, 0xA1, 0xE3, 0x00, 0x00, /* 0x5C-0x5F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ +- 0xA1, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ +@@ -9292,11 +9229,11 @@ + }; + + static unsigned char *page_uni2charset[256] = { +- NULL, NULL, u2c_02, u2c_03, NULL, NULL, NULL, NULL, ++ u2c_00, NULL, u2c_02, u2c_03, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +- u2c_20, u2c_21, u2c_22, u2c_23, NULL, u2c_25, u2c_26, NULL, ++ u2c_20, u2c_21, u2c_22, NULL, NULL, u2c_25, u2c_26, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + u2c_30, u2c_31, u2c_32, u2c_33, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +@@ -9319,11 +9256,12 @@ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +- NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +- NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, }; ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, NULL, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, ++}; + + static unsigned char charset2lower[256] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */ +@@ -9408,22 +9346,23 @@ + if (boundlen <= 0) + return -ENAMETOOLONG; + +- +- uni2charset = page_uni2charset[ch]; +- if (uni2charset) { +- if (boundlen <= 1) +- return -ENAMETOOLONG; +- out[0] = uni2charset[cl*2]; +- out[1] = uni2charset[cl*2+1]; +- if (out[0] == 0x00 && out[1] == 0x00) +- return -EINVAL; +- n = 2; +- } else if (ch==0 && cl) { +- out[0] = cl; +- n = 1; +- } +- else ++ if (ch==0 && cl<0x80) { ++ out[0] = cl; ++ n = 1; ++ } else { ++ uni2charset = page_uni2charset[ch]; ++ if (uni2charset) { ++ if (boundlen <= 1) ++ return -ENAMETOOLONG; ++ out[0] = uni2charset[cl*2]; ++ out[1] = uni2charset[cl*2+1]; ++ if (out[0] == 0x00 && out[1] == 0x00) ++ return -EINVAL; ++ n = 2; ++ } ++ else + return -EINVAL; ++ } + + return n; + } +@@ -9447,7 +9386,7 @@ + cl = rawstring[1]; + + charset2uni = page_charset2uni[ch]; +- if (charset2uni && cl) { ++ if (charset2uni && ((cl>=0x40 && cl<=0x7E) || (cl>=0xA1 && cl<=0xFE))) { + *uni = charset2uni[cl]; + if (*uni == 0x0000) + return -EINVAL; +@@ -9482,20 +9421,4 @@ + module_exit(exit_nls_cp950) + MODULE_LICENSE("Dual BSD/GPL"); + +-/* +- * Overrides for Emacs so that we follow Linus's tabbing style. +- * Emacs will notice this stuff at the end of the file and automatically +- * adjust the settings for this buffer only. This must remain at the end +- * of the file. +- * +---------------------------------------------------------------------------- +- * Local variables: +- * c-indent-level: 8 +- * c-brace-imaginary-offset: 0 +- * c-brace-offset: -8 +- * c-argdecl-indent: 8 +- * c-label-offset: -8 +- * c-continued-statement-offset: 8 +- * c-continued-brace-offset: 0 +- * End: +- */ ++ +--- R29/fs/vfat/namei.c 2004-03-24 19:56:04.000000000 +0000 ++++ R63/fs/vfat/namei.c 2005-03-31 06:06:41.000000000 +0100 +@@ -408,9 +408,10 @@ + { + struct msdos_dir_entry *de; + struct buffer_head *bh = NULL; +- int ino,res; ++ loff_t i_pos; ++ int res; + +- res=fat_scan(dir,name,&bh,&de,&ino); ++ res = fat_scan(dir, name, &bh, &de, &i_pos); + fat_brelse(dir->i_sb, bh); + if (res<0) + return -ENOENT; +@@ -891,7 +892,7 @@ + int res, len; + struct msdos_dir_entry *dummy_de; + struct buffer_head *dummy_bh; +- int dummy_ino; ++ loff_t dummy_i_pos; + loff_t dummy; + + dir_slots = (struct msdos_dir_slot *) +@@ -917,7 +918,7 @@ + goto cleanup; + + /* build the empty directory entry of number of slots */ +- offset = fat_add_entries(dir, slots, &dummy_bh, &dummy_de, &dummy_ino); ++ offset = fat_add_entries(dir, slots, &dummy_bh, &dummy_de, &dummy_i_pos); + if (offset < 0) { + res = offset; + goto cleanup; +@@ -927,7 +928,7 @@ + /* Now create the new entry */ + *bh = NULL; + for (slot = 0; slot < slots; slot++) { +- if (fat_get_entry(dir, &offset, bh, de, &sinfo_out->ino) < 0) { ++ if (fat_get_entry(dir, &offset, bh, de, &sinfo_out->i_pos) < 0) { + res = -EIO; + goto cleanup; + } +@@ -972,7 +973,7 @@ + &offset,&sinfo->longname_offset); + if (res>0) { + sinfo->long_slots = res-1; +- if (fat_get_entry(dir,&offset,last_bh,last_de,&sinfo->ino)>=0) ++ if (fat_get_entry(dir,&offset,last_bh,last_de,&sinfo->i_pos)>=0) + return 0; + res = -EIO; + } +@@ -1001,7 +1002,7 @@ + table++; + goto error; + } +- inode = fat_build_inode(dir->i_sb, de, sinfo.ino, &res); ++ inode = fat_build_inode(dir->i_sb, de, sinfo.i_pos, &res); + fat_brelse(dir->i_sb, bh); + if (res) + return ERR_PTR(res); +@@ -1034,7 +1035,7 @@ + res = vfat_add_entry(dir, &dentry->d_name, 0, &sinfo, &bh, &de); + if (res < 0) + return res; +- inode = fat_build_inode(sb, de, sinfo.ino, &res); ++ inode = fat_build_inode(sb, de, sinfo.i_pos, &res); + fat_brelse(sb, bh); + if (!inode) + return res; +@@ -1051,8 +1052,8 @@ + struct buffer_head *bh, struct msdos_dir_entry *de) + { + struct super_block *sb = dir->i_sb; +- loff_t offset; +- int i,ino; ++ loff_t offset, i_pos; ++ int i; + + /* remove the shortname */ + dir->i_mtime = CURRENT_TIME; +@@ -1064,7 +1065,7 @@ + /* remove the longname */ + offset = sinfo->longname_offset; de = NULL; + for (i = sinfo->long_slots; i > 0; --i) { +- if (fat_get_entry(dir, &offset, &bh, &de, &ino) < 0) ++ if (fat_get_entry(dir, &offset, &bh, &de, &i_pos) < 0) + continue; + de->name[0] = DELETED_FLAG; + de->attr = 0; +@@ -1133,7 +1134,7 @@ + res = vfat_add_entry(dir, &dentry->d_name, 1, &sinfo, &bh, &de); + if (res < 0) + return res; +- inode = fat_build_inode(sb, de, sinfo.ino, &res); ++ inode = fat_build_inode(sb, de, sinfo.i_pos, &res); + if (!inode) + goto out; + inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; +@@ -1170,7 +1171,7 @@ + struct super_block *sb = old_dir->i_sb; + struct buffer_head *old_bh,*new_bh,*dotdot_bh; + struct msdos_dir_entry *old_de,*new_de,*dotdot_de; +- int dotdot_ino; ++ loff_t dotdot_i_pos; + struct inode *old_inode, *new_inode; + int res, is_dir; + struct vfat_slot_info old_sinfo,sinfo; +@@ -1185,13 +1186,13 @@ + is_dir = S_ISDIR(old_inode->i_mode); + + if (is_dir && (res = fat_scan(old_inode,MSDOS_DOTDOT,&dotdot_bh, +- &dotdot_de,&dotdot_ino)) < 0) ++ &dotdot_de,&dotdot_i_pos)) < 0) + goto rename_done; + + if (new_dentry->d_inode) { + res = vfat_find(new_dir,&new_dentry->d_name,&sinfo,&new_bh, + &new_de); +- if (res < 0 || MSDOS_I(new_inode)->i_location != sinfo.ino) { ++ if (res < 0 || MSDOS_I(new_inode)->i_pos != sinfo.i_pos) { + /* WTF??? Cry and fail. */ + printk(KERN_WARNING "vfat_rename: fs corrupted\n"); + goto rename_done; +@@ -1215,7 +1216,7 @@ + vfat_remove_entry(old_dir,&old_sinfo,old_bh,old_de); + old_bh=NULL; + fat_detach(old_inode); +- fat_attach(old_inode, sinfo.ino); ++ fat_attach(old_inode, sinfo.i_pos); + mark_inode_dirty(old_inode); + + old_dir->i_version = ++event; +--- R29/include/linux/msdos_fs.h 2004-07-07 09:03:53.000000000 +0100 ++++ R63/include/linux/msdos_fs.h 2005-03-31 06:00:20.000000000 +0100 +@@ -180,7 +180,7 @@ + int total_slots; /* total slots (long and short) */ + loff_t longname_offset; /* dir offset for longname start */ + loff_t shortname_offset; /* dir offset for shortname start */ +- int ino; /* ino for the file */ ++ loff_t i_pos; /* on-disk position of directory entry */ + }; + + /* Determine whether this FS has kB-aligned data. */ +@@ -264,7 +264,7 @@ + unsigned int cmd, unsigned long arg); + extern int fat_dir_empty(struct inode *dir); + extern int fat_add_entries(struct inode *dir, int slots, struct buffer_head **bh, +- struct msdos_dir_entry **de, int *ino); ++ struct msdos_dir_entry **de, loff_t *i_pos); + extern int fat_new_dir(struct inode *dir, struct inode *parent, int is_vfat); + + /* fat/file.c */ +@@ -280,11 +280,11 @@ + + /* fat/inode.c */ + extern void fat_hash_init(void); +-extern void fat_attach(struct inode *inode, int i_pos); ++extern void fat_attach(struct inode *inode, loff_t i_pos); + extern void fat_detach(struct inode *inode); +-extern struct inode *fat_iget(struct super_block *sb, int i_pos); ++extern struct inode *fat_iget(struct super_block *sb, loff_t i_pos); + extern struct inode *fat_build_inode(struct super_block *sb, +- struct msdos_dir_entry *de, int ino, int *res); ++ struct msdos_dir_entry *de, loff_t i_pos, int *res); + extern void fat_delete_inode(struct inode *inode); + extern void fat_clear_inode(struct inode *inode); + extern void fat_put_super(struct super_block *sb); +@@ -306,26 +306,27 @@ + extern int date_dos2unix(unsigned short time, unsigned short date); + extern void fat_date_unix2dos(int unix_date, unsigned short *time, + unsigned short *date); +-extern int fat__get_entry(struct inode *dir, loff_t *pos, struct buffer_head **bh, +- struct msdos_dir_entry **de, int *ino); ++extern int fat__get_entry(struct inode *dir, loff_t *pos, ++ struct buffer_head **bh, ++ struct msdos_dir_entry **de, loff_t *i_pos); + static __inline__ int fat_get_entry(struct inode *dir, loff_t *pos, + struct buffer_head **bh, +- struct msdos_dir_entry **de, int *ino) ++ struct msdos_dir_entry **de, loff_t *i_pos) + { + /* Fast stuff first */ + if (*bh && *de && + (*de - (struct msdos_dir_entry *)(*bh)->b_data) < MSDOS_SB(dir->i_sb)->dir_per_block - 1) { + *pos += sizeof(struct msdos_dir_entry); + (*de)++; +- (*ino)++; ++ (*i_pos)++; + return 0; + } +- return fat__get_entry(dir,pos,bh,de,ino); ++ return fat__get_entry(dir, pos, bh, de, i_pos); + } + extern int fat_subdirs(struct inode *dir); + extern int fat_scan(struct inode *dir, const char *name, + struct buffer_head **res_bh, +- struct msdos_dir_entry **res_de, int *ino); ++ struct msdos_dir_entry **res_de, loff_t *i_pos); + + /* msdos/namei.c - these are for Umsdos */ + extern void msdos_put_super(struct super_block *sb); +--- R29/include/linux/msdos_fs_i.h 2004-03-24 19:56:20.000000000 +0000 ++++ R63/include/linux/msdos_fs_i.h 2005-03-31 05:55:39.000000000 +0100 +@@ -11,7 +11,7 @@ + int i_logstart; /* logical first cluster */ + int i_attrs; /* unused attribute bits */ + int i_ctime_ms; /* unused change time in milliseconds */ +- int i_location; /* on-disk position of directory entry or 0 */ ++ loff_t i_pos; /* on-disk position of directory entry or 0 */ + struct inode *i_fat_inode; /* struct inode of this one */ + struct list_head i_fat_hash; /* hash by i_location */ + }; -- cgit v1.2.3 From a0f81fc7143387807eb8490878b392e8b2817282 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 4 Dec 2005 20:58:07 +0000 Subject: unslung-kernel: Added R29 to R63 patch from Tiersten and marceln --- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 4acc6d7a5f..0ef2944c6b 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -22,6 +22,7 @@ SRC_URI += "file://limit1gb.patch;patch=1 \ file://nfs-blocksize.patch;patch=1 \ file://pl2303.patch;patch=1 \ file://linux-kernel-R25_to_R29.patch;patch=1 \ + file://linux-kernel-R29_to_R63.patch;patch=1 \ ${UNSLUNG_KERNEL_EXTRA_SRC_URI}" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -- cgit v1.2.3 From e2bf92dbb5ce4e66ccc90fca09662a4d8b874d22 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 4 Dec 2005 20:58:21 +0000 Subject: unslung-kernel: Added R29 to R63 patch from Tiersten and marceln --- packages/linux/unslung-kernel/defconfig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index d9a01070d5..7ebbe211ee 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -982,24 +982,24 @@ CONFIG_NLS=y # Native Language Support # CONFIG_NLS_DEFAULT="iso8859-1" -# CONFIG_NLS_CODEPAGE_437 is not set -# CONFIG_NLS_CODEPAGE_737 is not set +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=y # CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_CODEPAGE_852=y # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set # CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set +CONFIG_NLS_CODEPAGE_861=y # CONFIG_NLS_CODEPAGE_862 is not set # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set # CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set +CONFIG_NLS_CODEPAGE_866=y # CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set +CONFIG_NLS_CODEPAGE_936=y +CONFIG_NLS_CODEPAGE_950=y +CONFIG_NLS_CODEPAGE_932=y # CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set -- cgit v1.2.3 From a5ee70e9036d6c3b1a02470cbc8b09c3647a07de Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 4 Dec 2005 23:56:58 +0000 Subject: unslung-kernel: Removed modification of kernel (left-over from the binary version) --- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 0ef2944c6b..3b84269891 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -33,24 +33,3 @@ python () { if mach != 'nslu2': raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2") } - -DEPENDS += "nslu2-linksys-firmware" - -do_deploy_append() { - cp ${STAGING_LIBDIR}/nslu2-binaries/vmlinuz ${WORKDIR}/vmlinuz - dd if=${WORKDIR}/vmlinuz bs=1 count=11732 > ${WORKDIR}/vmlinuh - dd if=${WORKDIR}/vmlinuz bs=1 skip=11732 count=975109 | gzip -dc > ${WORKDIR}/vmlinux - dd if=${WORKDIR}/vmlinuz bs=1 skip=986841 > ${WORKDIR}/vmlinut - cat ${WORKDIR}/vmlinux | sed \ - -e 's/ram0/slug/' \ - -e 's/\x01\x31\x2c\xff/\x00\x1e\x84\x7f/' \ - | gzip -9 -c > ${WORKDIR}/vmlinux.gz -# -e 's/flash_sda\x00/hdd_sda\x00\x00\x00/' \ -# -e 's/flash_\x00/hdd_\x00\x00\x00/' \ -# -e 's/flash_sd%c\x00/hdd_sd%c\x00\x00\x00/' \ - cat ${WORKDIR}/vmlinuh ${WORKDIR}/vmlinux.gz ${WORKDIR}/vmlinut > ${WORKDIR}/vmlinuz -# dd if=/dev/zero of=${WORKDIR}/padding bs=1 count=9 -# cat ${WORKDIR}/vmlinuh ${WORKDIR}/vmlinux.gz ${WORKDIR}/padding ${WORKDIR}/vmlinut > ${WORKDIR}/vmlinuz - install -d ${DEPLOY_DIR}/images - install -m 0644 ${WORKDIR}/vmlinuz ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX} -} -- cgit v1.2.3 From dbefa15b8674451b9db95022a904f4dc22901f8a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 5 Dec 2005 03:06:29 +0000 Subject: unslung-kernel: Changed the defconfig to make all the new codepages as kernel modules. --- packages/linux/unslung-kernel/defconfig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index 7ebbe211ee..110728b68e 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -982,24 +982,24 @@ CONFIG_NLS=y # Native Language Support # CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=y +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m # CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=y +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set # CONFIG_NLS_CODEPAGE_860 is not set -CONFIG_NLS_CODEPAGE_861=y +CONFIG_NLS_CODEPAGE_861=m # CONFIG_NLS_CODEPAGE_862 is not set # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set # CONFIG_NLS_CODEPAGE_865 is not set -CONFIG_NLS_CODEPAGE_866=y +CONFIG_NLS_CODEPAGE_866=m # CONFIG_NLS_CODEPAGE_869 is not set -CONFIG_NLS_CODEPAGE_936=y -CONFIG_NLS_CODEPAGE_950=y -CONFIG_NLS_CODEPAGE_932=y +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m # CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set -- cgit v1.2.3 From 6ba543a9d351edf97f22e628c3aa8b364b4cec95 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 5 Dec 2005 06:33:45 +0000 Subject: unslung: Now based on Linksys version 2.3R63 --- conf/distro/unslung.conf | 15 ++++++++------- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 2 +- packages/meta/unslung-image.bb | 4 +++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 22b041f521..1777135a0d 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -3,11 +3,11 @@ #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 DISTRO_NAME = "Unslung" -DISTRO_VERSION = "5.6-beta" +DISTRO_VERSION = "6.2-alpha" DISTRO_TYPE = "beta" FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" -FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" +FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable" FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable" # pull in the frozen list of bbfiles @@ -57,8 +57,9 @@ PREFERRED_VERSION_glibc-initial ?= "2.2.5" PREFERRED_VERSION_binutils ?= "2.15.94.0.1" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" -PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r29" -PREFERRED_VERSION_unslung-rootfs ?= "2.3r29" -PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29" -PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r29" -PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r29" +PREFERRED_PROVIDER_virtual/kernel ?= "unslung-kernel" +PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63" +PREFERRED_VERSION_unslung-rootfs ?= "2.3r63" +PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" +PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r63" +PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r63" diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 3b84269891..8752a6ed04 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux " -PR = "r3" +PR = "r4" KERNEL_SUFFIX = "unslung" diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb index 7fa1b1cd4c..f9fda0aedc 100644 --- a/packages/meta/unslung-image.bb +++ b/packages/meta/unslung-image.bb @@ -1,5 +1,5 @@ LICENSE = MIT -PR = "r6" +PR = "r7" IMAGE_BASENAME = "unslung" @@ -31,6 +31,8 @@ unslung_clean_image () { rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version # Tidy up some thing which are in the wrong place mv ${IMAGE_ROOTFS}${libdir}/libipkg* ${IMAGE_ROOTFS}/lib/ + # Remove the /lib/*.dat files cause they are too big + rm -f ${IMAGE_ROOTFS}/lib/*.dat # Remove the ipkg symlink - unsling puts it back in rm -f ${IMAGE_ROOTFS}${bindir}/ipkg # Hack out the modutils stuff - it's too hard to make it work -- cgit v1.2.3 From e9479488a6f8b95833b389682f68cc2137b49cc6 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 5 Dec 2005 07:50:27 +0000 Subject: unslung-rootfs: Updated unsling to match new kernel mapping of drives. --- packages/nslu2-binary-only/unslung-rootfs/unsling | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/nslu2-binary-only/unslung-rootfs/unsling b/packages/nslu2-binary-only/unslung-rootfs/unsling index b784378812..c78bb7bbfe 100755 --- a/packages/nslu2-binary-only/unslung-rootfs/unsling +++ b/packages/nslu2-binary-only/unslung-rootfs/unsling @@ -12,22 +12,22 @@ fi if [ $# -eq 1 ] ; then if [ "$1" = "disk1" ] ; then targ=/share/hdd/data - flag=.sda1root + flag=.sdb1root elif [ "$1" = "disk2" ] ; then targ=/share/flash/data - flag=.sdb1root + flag=.sda1root elif [ "$1" = "hdd-data" ] ; then targ=/share/hdd/data - flag=.sda1root + flag=.sdb1root elif [ "$1" = "hdd-conf" ] ; then targ=/share/hdd/conf - flag=.sda2root + flag=.sdb2root elif [ "$1" = "flash-data" ] ; then targ=/share/flash/data - flag=.sdb1root + flag=.sda1root elif [ "$1" = "flash-conf" ] ; then targ=/share/flash/conf - flag=.sdb2root + flag=.sda2root else echo $usage exit 1 -- cgit v1.2.3 From 77c2adc046dcb2841bffa98a8a5474db8441f7ae Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 5 Dec 2005 07:50:46 +0000 Subject: unslung-rootfs: Updated unsling to match new kernel mapping of drives. --- packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb index 2f2e5e1866..7749db06d5 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb @@ -1,6 +1,6 @@ SECTION = "base" -PR = "r3" +PR = "r4" DEPENDS = "nslu2-linksys-libs" -- cgit v1.2.3