Commit Graph

626 Commits

Author SHA1 Message Date
John Crispin
9b1bc2d671 scripts/om-fwupgradecfg-gen.sh: add support for the MR900
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>

SVN-Revision: 43260
2014-11-14 16:54:23 +00:00
John Crispin
eb738f5275 generate list of license information for packages
Many packages define already metadata about their license (PKG_LICENSE),
but this is only included in the ipk files.

This change allows to create the information also on the build-host,
to get an overview on the used licenses.
In the full list, also all packages without this info are shown

Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>

SVN-Revision: 43070
2014-10-26 16:57:33 +00:00
John Crispin
20940138ac scripts: fix wrong usage of '==' operator
[base-files] shell-scripting: fix wrong usage of '==' operator

normally the '==' is used for invoking a regex parser and is a bashism.
all of the fixes just want to compare a string. the used busybox-ash
will silently "ignore" this mistake, but make it portable/clean at least.

this patch does not change the behavior/logic of the scripts.

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>

SVN-Revision: 42911
2014-10-14 12:21:11 +00:00
John Crispin
590b855c26 scripts/feeds: handle missing/broken feeds better
pts/feeds update -a" can fail rather silently for feeds using git, as
the script does not pause when updating a feed fails. Instead it prints the
error message and calmly continues to the next feed. It is very easy to
overlook update errors with the feeds updated first, as their text scrolls
rapidly away from the screen.

This behaviour has not been a big problem with svn feeds, as svn update stops
with a conflict message and interactively forces the user to resolve or
postpone the conflict. In any case the svn error is noticed by the user.

Majority of the feeds use now git, so this silent failure can affect users
doing private builds in an increasing amount.

Below is an example of update failing and script continuing:

perus@v1404:/Openwrt/barrier$ ./scripts/feeds update -a
Updating feed 'packages' from
'https://github.com/openwrt/packages.git;for-14.07' ...
remote: Counting objects: 17, done.
remote: Compressing objects: 100% (15/15), done.
remote: Total 17 (delta 10), reused 8 (delta 1)
Unpacking objects: 100% (17/17), done.
 From https://github.com/openwrt/packages
62031da..dc26009  for-14.07  -> origin/for-14.07
Updating 62031da..dc26009
error: Your local changes to the following files would be overwritten by merge:
utils/collectd/Makefile
Please, commit your changes or stash them before you can merge.
Aborting
failed.
Updating feed 'luci' from 'http://git.openwrt.org/project/luci.git;luci-0.12' ...
Already up-to-date.
Create index file './feeds/luci.index'
Updating feed 'routing' from
'https://github.com/openwrt-routing/packages.git;for-14.07' ...
...

The script prints "failed.", but does not break the updating process. The
"update_feed" function returns an error code 1, but that value is not checked
in the "update" function, which continues to the next feed.
Return 1 as error:
​https://dev.openwrt.org/browser/trunk/scripts/feeds#L547
Call to update_feed without any error monitoring:
​https://dev.openwrt.org/browser/trunk/scripts/feeds#L585

The included patch makes the feeds script to stop updating after failing to
update a feed.

The script continues to the refresh_config step despite a possible failure in
updating, so the stopping action just prevents the other feeds from updating
and makes the error more clearly visible.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

SVN-Revision: 42891
2014-10-13 19:41:27 +00:00
John Crispin
b0a1c7dc0d include/download.mk: Add download mirrors for tools from GNU Savannah (bug #15184)
I defined a new download method @SAVANNAH in include/download.mk and scripts/download.pl,
and converted quilt and qemu to use that method.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

SVN-Revision: 42840
2014-10-08 08:01:39 +00:00
Felix Fietkau
5e4789671a build: add support for declaring package CONFLICTS which only affect selecting built-in packages
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42770
2014-10-05 16:41:33 +00:00
Felix Fietkau
a62f0d02ec build: allow packages with build variants to explicitly select a default variant
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42654
2014-09-23 10:41:15 +00:00
Jo-Philipp Wich
2490007142 script/remote-gdb: enable and keep command history
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 42609
2014-09-18 09:29:44 +00:00
Jo-Philipp Wich
a720dd209f build: introduce per feed repository support
This changeset implements a new menuconfig option to generate separate
repositories for each enabled package feed instead of one monolithic one.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 42002
2014-08-05 11:24:24 +00:00
John Crispin
4e03bdd63c scripts/om-fwupgradecfg-gen.sh: add support for the OM5P
Signed-off-by: Marek Lindner <marek@open-mesh.com>
[sven@open-mesh.com: Rebased]
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>

SVN-Revision: 41771
2014-07-20 17:30:48 +00:00
Felix Fietkau
069e862ad5 scripts/abs2rel.pl: remove, it is unused
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41510
2014-07-04 12:11:40 +00:00
Felix Fietkau
dcb5d00875 scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41407
2014-06-30 06:50:22 +00:00
John Crispin
d1898b84c6 scripts/ubinize-image.sh: fix ubinize-image.sh when used with --kernel
r41359 broke support for building ubinized images which do
include a kernel volume.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 41368
2014-06-29 06:59:29 +00:00
Imre Kaloz
dc9ebfc9e6 make UbinizeImage work nicely without a kernel volume
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 41359
2014-06-27 12:58:08 +00:00
John Crispin
0f39877bac scripts/ubinize-image.sh: fix parameter handling
ubinize-image.sh previously used ${var:offset:length} substitutions
which are not valid in standard shell.
Replace the existing parameter matching by a case ... esac expression.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 41347
2014-06-26 11:43:42 +00:00
Felix Fietkau
58bd3b0764 scripts/metadata.pl: avoid adding depends and select for the same symbol
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41160
2014-06-12 14:35:09 +00:00
John Crispin
ac5d5cbc79 kernel: add a NAND_SUPPORT symbol
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41122
2014-06-11 12:59:22 +00:00
John Crispin
28a563dec3 scripts: add ubinize-image.sh to generate ubi images
This is a wrapper for the ubinize tool which integrates auto-generation
of the ubinize.cfg for common volume layouts with and without a kernel
volume.
It supports auto-detecting the rootfs-type and decides whether or not
to include a rootfs_data volume based on whether the rootfs is ubifs
or not (and thus is read-only and needs rootfs_data ubifs overlay).
The script allows to create layouts as found in all current
ubinize{,-overlay}.cfg files using

ubinize-image.sh --no-kernel root.{ubifs,squashfs} output.ubi $UBI_OPTS

It also includes support for adding ubootenv and ubootenv2 volumes
typically used by U-Boot for storing its environment in UBI using the
"--uboot-env" parameter.
See also
https://gitorious.org/openwrt-oxnas/openwrt-oxnas/source/target/linux/
oxnas/image/Makefile

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

 create mode 100755 scripts/ubinize-image.sh

SVN-Revision: 41121
2014-06-11 12:59:19 +00:00
Felix Fietkau
b24897ee5c build: add a feature flag for low-memory systems
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40980
2014-06-02 17:04:38 +00:00
Felix Fietkau
aab9ffeacc scripts/bundle-libraries: fall back to only copying binaries if ldd is unavailable (e.g. non-linux system)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40967
2014-06-02 13:27:23 +00:00
Felix Fietkau
2c4bde9c8f metadata.pl: suppress profile config.in code for targets that have subtargets (fixes #14480)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40896
2014-06-01 15:18:47 +00:00
Felix Fietkau
e9abf9f8a0 scripts/metadata.pl: fix ignoring missing host dependencies
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39917
2014-03-13 14:14:06 +00:00
Felix Fietkau
52dcb1f411 scripts/metadata.pl: remove sdk specific config symbol override
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39916
2014-03-13 14:14:03 +00:00
Felix Fietkau
81013f6bbe scripts/config: make wildcard include with no results non-fatal
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39862
2014-03-10 18:58:40 +00:00
John Crispin
2f5f498969 scripts/kconfig.pl: Indicate which file we couldn't open
Signed-off-by: Daniel Colascione <dancol@dancol.org>

SVN-Revision: 39327
2014-01-19 17:27:04 +00:00
Felix Fietkau
27fe688c5f scripts/download.pl: prefer the GNU mirror redirect over the primary site (#14603)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39045
2013-12-13 16:43:07 +00:00
Imre Kaloz
f3e2331e18 add a feature flag for device tree support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 38893
2013-11-22 12:01:01 +00:00
Felix Fietkau
13f5ebaf8e scripts/gen-dependencies.sh: prevent zero-length dep.* files from accumulating in tmp/
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38860
2013-11-19 00:03:34 +00:00
Felix Fietkau
1879c5f8e7 build: fix build on Mac OS X 10.9
Add a wrapper around the clang gcc emulation to fix -print-file-name=<lib>

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38560
2013-10-28 15:15:09 +00:00
Steven Barth
f22196e4e9 ipkg-make-index: use more backwards-compatible openssl call for SHA256
SVN-Revision: 38440
2013-10-17 19:32:28 +00:00
Luka Perkov
59eb6137dd build: drop FIT option until we actually need it
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38439
2013-10-17 15:45:41 +00:00
Luka Perkov
cc1b164634 build: add menuconfig option for building FIT images
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38431
2013-10-16 21:23:24 +00:00
Luka Perkov
acdb0ac35c build: move mkits.sh script to more common place
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38430
2013-10-16 10:29:50 +00:00
Steven Barth
8b7b7cabf2 opkg: add support for SHA256 verification
based on a patch by Evan Hunt <each@isc.org>
Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 38302
2013-10-04 05:56:20 +00:00
Felix Fietkau
b14e0d008c scripts/gen-dependencies.sh: use the cross readelf (#12940)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38259
2013-09-29 20:10:42 +00:00
Felix Fietkau
e0189ccef4 build: include the cpu type as part of the toolchain/target directory name
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38214
2013-09-26 17:53:32 +00:00
Luka Perkov
49722e7dcb feeds: enable cloning of specific git commit
Following syntax should be used to enable this feature:

src-git custom git://openwrt/custom-feed^SHA_COMMIT_ID

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38172
2013-09-25 13:02:55 +00:00
Florian Fainelli
a1267290ed scripts/feeds: ensure that --ff is enabled
Users may have merge.ff set to false, which will force merge commits to
be generated.  The intent here is to have a fast-forward merge when
possible, so let's make sure fast-forwards are enabled.

Signed-off-by: John Szakmeister <john@szakmeister.net>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 37884
2013-09-02 18:25:10 +00:00
Vasilis Tsiligiannis
e532d65373 scripts/checkpatch.pl: Fix whitespace errors
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

SVN-Revision: 37864
2013-08-31 11:16:49 +00:00
Vasilis Tsiligiannis
957c2576cc scripts/{cleanfile,cleanpatch}: Add scripts for cleaning up file and patch whitespaces
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

SVN-Revision: 37863
2013-08-31 11:16:44 +00:00
Vasilis Tsiligiannis
a35b5dc2f7 scripts/checkpatch.pl: Remove checks for __setup's documentation
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

SVN-Revision: 37862
2013-08-31 11:15:06 +00:00
Vasilis Tsiligiannis
23ea2cb10e scripts/checkpatch.pl: Remove check for deprecated features
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

SVN-Revision: 37861
2013-08-31 11:15:03 +00:00
Vasilis Tsiligiannis
c724c76f65 scripts/checkpatch.pl: Introduce 'checkpatch.pl' script
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

SVN-Revision: 37860
2013-08-31 11:14:53 +00:00
Felix Fietkau
1d3067892b build: process transitive dependencies after local dependencies
This improves duplicate dependency detection

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37679
2013-08-04 12:17:26 +00:00
Felix Fietkau
0249f7510c build: suppress conditional dependencies if there are unconditional dependencies on the same symbol
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37678
2013-08-04 12:17:22 +00:00
Felix Fietkau
94439c2b5d kernel: add a new global config symbol for enabling rfkill support (can be enabled by default via target feature flag)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37491
2013-07-21 11:55:30 +00:00
Felix Fietkau
14b307c10e scripts/metadata.pl: emit dependencies for package/kernel/linux
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37433
2013-07-19 12:49:21 +00:00
Felix Fietkau
1ffa67e0c6 scripts/gen-dependencies.sh: clean up temp files
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37430
2013-07-19 10:41:56 +00:00
Jo-Philipp Wich
b2f2233306 scripts: change metadata.pm and metadata.pl to not emit "default m if ALL" Kconfig instructions for hidden packages
SVN-Revision: 37397
2013-07-18 13:11:46 +00:00
Felix Fietkau
ccebc5a091 gen-dependencies.sh: sort kmod dependencies
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37390
2013-07-18 11:57:36 +00:00
Felix Fietkau
18840ae808 build: implement kernel module dependency tracking
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37386
2013-07-18 10:47:05 +00:00
Jo-Philipp Wich
24f345dbe4 metadata.pl: use alphabetical order for menuconfig categories, also fixes random ordering of symbols in .config
SVN-Revision: 37369
2013-07-16 10:35:40 +00:00
Mirko Vogt
53d4d18f07 remove broken mirrors for linux kernel
ftp.de.kernel.org / ftp.fr.kernel.org don't resolv anymore,
ftp.all.kernel.org is DNS round robin anyway

Signed-off-by: Mirko Vogt <mirko@openwrt.org>

SVN-Revision: 37323
2013-07-14 21:26:35 +00:00
Felix Fietkau
40b3db713d scripts/download.pl: use HTTP instead of FTP for the default GNU site
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37213
2013-07-09 12:52:12 +00:00
John Crispin
89d41d95bf metadata.pl: fixpath exclusion of kernel packages
module and build deps did not work for kernel modules

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37091
2013-06-29 19:37:11 +00:00
Jonas Gorski
9f7ef8d5f0 target: split jffs2 NAND out of jffs2
Make jffs2_nand a separate option so this can be triggered without forcing
jffs2 images for nor targets.

Adds a new NAND_BLOCKSIZE variable that allows setting the generated layout
in <page_size>:<block_size> pairs.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 36860
2013-06-05 20:58:03 +00:00
Jo-Philipp Wich
103b69e250 feeds: fix check for core packages that are not in the package/ toplevel directory
SVN-Revision: 36763
2013-05-29 18:17:07 +00:00
Felix Fietkau
6f4cb088a0 build: clean up stale files from a previous build when installing a package build to the staging dir
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36755
2013-05-29 10:31:45 +00:00
Jo-Philipp Wich
1c9bc8822d scripts: dl_cleanup.py: properly detect file names with <date>-<githash> version string
SVN-Revision: 36729
2013-05-26 17:28:11 +00:00
Felix Fietkau
eea89fea6a build: add config symbols for different ARM arch levels
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36620
2013-05-13 15:04:58 +00:00
Felix Fietkau
0fb3475ecc scripts/remote-gdb: add support for debugging core files
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36596
2013-05-09 20:50:58 +00:00
Felix Fietkau
ed30c90e2d scripts/remote-gdb: fix path when built for musl
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36595
2013-05-09 20:50:54 +00:00
Felix Fietkau
f935d800bf scripts/config: fix an option processing error that caused duplication in diffconfig.sh output (#13384)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36522
2013-05-02 14:06:10 +00:00
Felix Fietkau
45339e03de scripts/config: warn on deprected "depends" syntax instead of throwing a syntax error
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36375
2013-04-22 12:53:32 +00:00
Felix Fietkau
9d5510a500 build: add new menuconfig code based on linux 3.9
SVN-Revision: 36361
2013-04-18 12:05:16 +00:00
Felix Fietkau
96bb7c123b build: consistently use 'depends on' instead of 'depends'
make the syntax more compatible with kernel menuconfig

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36351
2013-04-17 15:36:41 +00:00
Florian Fainelli
9e1d2c15d9 buildroot: allow enabling MIPS16 user-space build
Enabling MIPS16 is made conditional on advertising the "mips16" feature
for a specific target since it requires support from the CPU
(HAS_MIPS16) and the actual use of MIPS16 for building packages
(USE_MIPS16).

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 36202
2013-04-05 12:36:12 +00:00
Felix Fietkau
1f77bfff96 build: BSD compile fixes
following patch allows to build images for Qemu ARM on
OpenBSD 5.2 amd64 and FreeBSD 9.1 amd64.

Mostly small pieces of code changes to get things right on the
specific platform.

Updated the README to describe better, which tools on the host
are required. Added some kind of prepare scripts to install needed
tools on BSD via packages.

Signed-off-by: Waldemar Brodkorb <mail@waldemar-brodkorb.de>

SVN-Revision: 35900
2013-03-07 17:32:29 +00:00
Luka Perkov
819472b2d0 scripts: update GNU mirrors
SVN-Revision: 35838
2013-02-28 23:49:36 +00:00
Jonas Gorski
2d8c5117c0 scripts/symlink-tree.sh: print warnings/errors to stderr
Makes warnings/errors visible when building with V=w/V=1.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 35718
2013-02-21 11:45:27 +00:00
Jonas Gorski
5449b24099 scripts/ipkg: print warnings/errors to stderr
Makes warnings/errors visible when building with V=w/V=1.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 35717
2013-02-21 11:45:25 +00:00
Jo-Philipp Wich
9622f68581 buildroot: allow specifying libc personality for external toolchains
SVN-Revision: 35703
2013-02-20 15:06:10 +00:00
Gabor Juhos
65fc9eee18 Add xz compressed packages to known extensions of dl_cleanup
Add .tar.xz, .txz, and .orig.tar.xz as known extensions to dl_cleanup.py.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 35645
2013-02-17 21:37:14 +00:00
Jo-Philipp Wich
509f39a10a scripts: bundle-libraries.sh: support mixing 32bit and 64bit binaries
SVN-Revision: 35349
2013-01-28 15:54:27 +00:00
Florian Fainelli
4801705d83 remove support for ubicom32
Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 34432
2012-11-30 10:53:55 +00:00
Florian Fainelli
6b63716262 add preliminary support for musl
Musl is an alternative C-library, see http://www.musl-libc.org for more infos.

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 34314
2012-11-23 20:02:29 +00:00
Gabor Juhos
d325e622d2 scripts/om-fwupgradecfg-gen.sh: add support for the MR600
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34233
2012-11-18 09:32:36 +00:00
Gabor Juhos
7da001d068 scripts: rename om2p-fwupgradecfg-gen.sh to more generic om-fwupgradecfg-gen.sh
It will be used for non OM2P boards as well.

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34200
2012-11-14 14:18:33 +00:00
Imre Kaloz
527c473674 add support for the Tonze AP-422/425
SVN-Revision: 34165
2012-11-11 21:04:30 +00:00
Imre Kaloz
79289bdca5 fix machtype handling above 4096
SVN-Revision: 34141
2012-11-11 11:07:59 +00:00
Jo-Philipp Wich
26263535fe scripts: fix remote-gdb script to cope with _eabi suffix in uClibc version
SVN-Revision: 34118
2012-11-08 11:22:09 +00:00
Jonas Gorski
53c014e221 scrips/metadata.pl: fix broken targets with subtargets being selectable
r26926 moved all target features to subtargets if present, which had the
side effect that broken targets are available for selection, just without
any available subtargets (since they are still marked as broken).

Fix this by explicitly letting the top level target also depend on broken.

SVN-Revision: 33892
2012-10-22 22:16:19 +00:00
Jo-Philipp Wich
5b38fdd704 scripts/config: fix menuconfig segfault in text inputs when format patterns are entered by the user
SVN-Revision: 33773
2012-10-14 17:11:57 +00:00
Imre Kaloz
84b43f112a AR71xx/9xxx based routers are the most common these days, select that as the default target
SVN-Revision: 33590
2012-09-28 20:54:35 +00:00
Jo-Philipp Wich
c70e919ae8 fix library bundling when host libraries reside in /lib/tls/ or similar
SVN-Revision: 33353
2012-09-09 22:37:32 +00:00
Jo-Philipp Wich
183f625a48 add a helper script to bundle required libraries for host utilities
SVN-Revision: 33195
2012-08-15 13:28:23 +00:00
Felix Fietkau
2335304a08 build: ensure that reordering of KCONFIG lines are handled properly and that the final result does not depend on the package scan order
SVN-Revision: 32788
2012-07-22 21:00:07 +00:00
Felix Fietkau
3df534502c scripts/feeds: redirect stderr of the which call to /dev/null to avoid potentially confusing error messages on some systems
SVN-Revision: 32499
2012-06-25 00:27:03 +00:00
Jo-Philipp Wich
3f8fb64e60 gen-dependencies.sh: only include lib*.so* files in dependency list, to match the filtering of provides lists
SVN-Revision: 32272
2012-06-12 22:02:41 +00:00
Felix Fietkau
7cb42738e6 package/index: filter out the libc package from the index
SVN-Revision: 32187
2012-06-11 01:29:11 +00:00
Felix Fietkau
6ca6d317b3 build: add checks for missing package dependencies
SVN-Revision: 32185
2012-06-11 00:57:36 +00:00
Felix Fietkau
03babf3641 target: add a feature flag for RTC support
SVN-Revision: 31777
2012-05-17 15:28:09 +00:00
Felix Fietkau
a243cb1735 scripts/ipkg-make-index.sh: use bash instead of /bin/sh to fix use of [[ ]]
SVN-Revision: 31708
2012-05-13 16:29:39 +00:00
Felix Fietkau
f1fd082441 build: prevent the virtual "kernel" package from leaking into the package index to make dependency checks fail on kernel config mismatch
SVN-Revision: 31704
2012-05-13 12:31:53 +00:00
Jo-Philipp Wich
12728ea66b download.pl: - cleanup cache handling code - use alternative m// and s/// delimiters to get rid of tedious slash escaping - use multi-argument form of system() where possible to avoid quoting & escaping issues - avoid a temporary variable
SVN-Revision: 31677
2012-05-11 18:17:15 +00:00
Felix Fietkau
85f1a2c67a add further countermeasures against the git core.autocrlf option (fixes #9075)
SVN-Revision: 31650
2012-05-08 13:30:54 +00:00
Jo-Philipp Wich
643babfc3c ext-toolchain.sh: don't pass CFLAGS when wrapping ld
SVN-Revision: 31549
2012-05-01 22:45:55 +00:00
Felix Fietkau
34ffb526a2 build: rework verbosity level selection
V=99 and V=1 are now deprecated in favor of a new verbosity class system,
though the old flags are still supported.
You can set the V variable on the command line (or OPENWRT_VERBOSE in the
environment) to one or more of the following characters:

- s: stdout+stderr (equal to the old V=99)
- c: commands (for build systems that suppress commands by default, e.g. kbuild)
- w: warnings/errors only (equal to the old V=1)

SVN-Revision: 31484
2012-04-26 17:53:56 +00:00
Mirko Vogt
1f489e4084 re-enable shallow git clones ('--depth 1')
SVN-Revision: 31469
2012-04-24 18:19:16 +00:00
Mirko Vogt
2ebcd4707c include revisions of feeds when listing them
SVN-Revision: 31467
2012-04-24 12:56:18 +00:00
John Crispin
0c4bcae7a1 allow arbitary folder layout when using localmirrors
Make the download script follow symlinks and search subfolders when looking for
a file in a local download mirror.

Signed-off-by: Tathagata Das <tathagata@alumnux.com>

SVN-Revision: 31240
2012-04-10 14:11:45 +00:00
Felix Fietkau
571bd159a1 kernel: fix stripping of modules with duplicate symbol names
SVN-Revision: 31031
2012-03-19 21:09:47 +00:00
Felix Fietkau
7b609a31be kernel: improve profiling support, keep static symbols when profiling is enabled
SVN-Revision: 30964
2012-03-17 13:03:14 +00:00
Felix Fietkau
236dd9d9a2 kernel: keep more symbols in the kernel modules when doing profiling
SVN-Revision: 30762
2012-03-01 15:13:26 +00:00
Felix Fietkau
a8ec8ce1ac kernel: do not rename module symbols with kallsyms enabled
SVN-Revision: 30759
2012-03-01 09:58:03 +00:00
Felix Fietkau
548155ab7d Revert "scripts/download.pl: fix sourceforge url"
To use the new url, the project name would need to be appended multiple times,
let's hope the old redirect will continue to work in the future

SVN-Revision: 30730
2012-02-26 09:29:53 +00:00
Felix Fietkau
4dc4ebe0c8 scripts/download.pl: fix sourceforge url
SVN-Revision: 30726
2012-02-25 20:44:02 +00:00
Felix Fietkau
c2590fe930 strip kernel modules more aggressively: make all global symbols local, rename all symbols in the symbol table to make them compress better
SVN-Revision: 30662
2012-02-20 17:38:26 +00:00
Florian Fainelli
e50315d61c env: colorize git output
SVN-Revision: 30602
2012-02-16 19:24:34 +00:00
Jo-Philipp Wich
1a6ccdc0cf patch-specs.sh: gcc 3.4.6 has an additional "(OpenWrt-2.0)" after the version tag, cope with that
SVN-Revision: 29948
2012-01-29 20:19:06 +00:00
Jo-Philipp Wich
0c3a383974 download.pl: remove ftp.geo.kernel.org mirror, it does not resolve
SVN-Revision: 29947
2012-01-29 19:28:12 +00:00
Jo-Philipp Wich
c21b5cc34a ext-toolchain.sh: rework generated gcc wrapper Only append -L and -Wl,-rpath-link flags if the command line contains -l, -L, -shared or -static flags; this is needed to suppress "-rpath-link: linker input file unused because linking not done" on each cc invocation.
SVN-Revision: 29946
2012-01-29 18:53:12 +00:00
Jo-Philipp Wich
d5cf09642c patch-specs.sh: fallback to ext-toolchain.sh --wrap if spec file patching is not possible (gcc < 4.3.0)
SVN-Revision: 29945
2012-01-29 17:42:58 +00:00
Jo-Philipp Wich
86ddf7c7a8 ext-toolchain.sh: support --wrap with src == dest
SVN-Revision: 29944
2012-01-29 17:42:10 +00:00
Jo-Philipp Wich
fe60046a26 ext-toolchain.sh: CONFIG_NLS -> CONFIG_BUILD_NLS
SVN-Revision: 29782
2012-01-19 00:03:52 +00:00
Jo-Philipp Wich
ee62b0d751 ext-toolchain.sh: fix typo
SVN-Revision: 29781
2012-01-19 00:01:54 +00:00
Jo-Philipp Wich
796231d95c ext-toolchain.sh: add option to write .config Add a new --config option to generate a .config from a given toolchain, this allows for easy integration of external toolchains, e.g.
./scripts/ext-toolchain.sh --toolchain /opt/mips-2011.03 --cflags "-muclibc" --config atheros

to setup a ready-to-compile atheros target using the external CodeSourcery toolchain.

SVN-Revision: 29780
2012-01-18 23:46:06 +00:00
Jo-Philipp Wich
989c73848f ext-toolchain.sh: properly handle toolchains without sysroot support
SVN-Revision: 29772
2012-01-18 04:03:15 +00:00
Jo-Philipp Wich
f20b6c3ff9 ext-toolchain.sh: - use GCC's own idea of the target name (-dumpmachine) - display help if called without args - add copyright foo - remove some leftover flag handling code
SVN-Revision: 29769
2012-01-18 03:32:30 +00:00
Jo-Philipp Wich
6df3af8a36 add patch-specs.sh, a utility for modifying GCC specs The patch-specs.sh utility dumps the GCC specs of a given toolchain and modifies them to always include $STAGING_DIR in the link and compiler command lines, this makes most -I and -L flags unnecessary and lets the compiler automatically find libraries and headers in the staging dir, also solves the majority of -rpath issues.
SVN-Revision: 29767
2012-01-18 03:11:45 +00:00
Jo-Philipp Wich
7a563f122f add ext-toolchain.sh, a utility for external toolchains The ext-toolchain.sh utility script implements various external toolchain tasks: * Testing of available features, like c++, soft-float or ipv6 support * Finding the libc implementation (uclibc or eglibc/glibc) * Inferring the GNU target name * Finding shared objects for packaging (libc, libpthread, ...) * Finding executables for packaging (ldd, gdbserver, ...) * Generating wrapper scripts for toolchain commands
SVN-Revision: 29765
2012-01-18 03:03:24 +00:00
Jo-Philipp Wich
73b4974397 metadata.pl: filter direct recursive depends like "select PACKAGE_kmod-ipv6 if PACKAGE_kmod-ipv6"
SVN-Revision: 29695
2012-01-08 15:49:20 +00:00
Gabor Juhos
6c28efff9c scripts: add a script for generating fwupgrade config for the OM2P board
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

SVN-Revision: 29396
2011-12-01 22:49:03 +00:00
Nicolas Thill
140dfb485f scripts: add script to generate combined extended image format
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

SVN-Revision: 29358
2011-11-30 07:43:58 +00:00
Felix Fietkau
a97304cf61 scripts/env: improve the wording of the question when starting repository (patch by Rolf Leggewie)
SVN-Revision: 29262
2011-11-19 17:15:53 +00:00
Felix Fietkau
6b929e2687 scripts/env: make mv and cp operations more robust (treat dotfiles appropriately) (based on patch by Rolf Leggewie)
SVN-Revision: 29261
2011-11-19 17:15:50 +00:00
Felix Fietkau
b9eb659364 scripts/env: fix indentation (patch by Rolf Leggewie)
SVN-Revision: 29260
2011-11-19 17:15:45 +00:00
Michael Büsch
50a7ff97ef mconf: Fix compile warning: "warning: conflicting types for ‘sym_set_all_changed’"
SVN-Revision: 29190
2011-11-16 17:27:36 +00:00
Felix Fietkau
5e48d47dfe scripts/config: merge fixes for various issues, including recursive dependency detection/handling (patch by mbm)
SVN-Revision: 28658
2011-10-28 14:09:12 +00:00
Jo-Philipp Wich
ad6c4198a9 getver.sh: cope with varying "git log" line formats to reliably extract the git-svn rev (#10268)
SVN-Revision: 28604
2011-10-26 14:54:57 +00:00
Felix Fietkau
e925dbf704 scripts/feeds: override the OPENWRT_BUILD variable when calling internal targets (based on patch from #10212)
SVN-Revision: 28503
2011-10-21 13:03:37 +00:00
John Crispin
ad250089aa allow targets to define a default subtarget when using automatic subtarget detection from r27407
SVN-Revision: 27444
2011-07-04 11:21:37 +00:00
John Crispin
4d8b9fafcb ignore empty lines in scripts/localmirrors
SVN-Revision: 27416
2011-07-03 19:33:24 +00:00
Jo-Philipp Wich
0649dfdfb6 download.pl: cope with potential two-digit linux versions
SVN-Revision: 27376
2011-07-03 15:00:24 +00:00
Felix Fietkau
bcf4757508 add support for hidden packages that get selected/built but do not show up in menuconfig
SVN-Revision: 27344
2011-07-02 06:49:09 +00:00
Jo-Philipp Wich
e745fc762b metadata.pl: fix handling of multiple conditional depends that reference the same package (exposed by previous hotplug2 changes), also kill duplicate dependency specs while we're at it
SVN-Revision: 27267
2011-06-23 19:28:16 +00:00
Jo-Philipp Wich
11dcad2834 scripts/config/.gitignore omits source files scripts/config/.gitignore aims to avoid checking binaries in to git. Unfortunately it also omits conf.c, confdata.c, and all source files in lxdialog. An OpenWRT tree pulled from a git repository will not build, and I suspect this was not the intention.
Signed-off-by: Denton Gentry <denny@geekhold.com>

SVN-Revision: 27244
2011-06-20 10:41:02 +00:00
Hauke Mehrtens
e04f68fb77 Fix CONFIG_LINUX_ for linux 3.0
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>

SVN-Revision: 27184
2011-06-15 21:11:05 +00:00
Felix Fietkau
6e43f65dc4 remove the now unused Target-Kernel field from the target metadata
SVN-Revision: 27033
2011-05-30 23:07:53 +00:00
Jo-Philipp Wich
a02ba6ccc2 Add support for git-svn package feeds Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
SVN-Revision: 26988
2011-05-24 09:30:24 +00:00
Felix Fietkau
984ab9a139 metadata: do not emit feature flag selects for targets which have subtargets - fixes a buildbot error cause by ssb not being blacklisted for lantiq falcon
SVN-Revision: 26926
2011-05-17 12:54:45 +00:00
Hamish Guthrie
7b53059401 Correct libc path
SVN-Revision: 26885
2011-05-13 11:52:40 +00:00
Felix Fietkau
459762ace2 add a new package metadata variable MDEPENDS for specifying local menuconfig dependencies that do not propagate to other packages
SVN-Revision: 26491
2011-04-05 19:03:51 +00:00
John Crispin
e42e2b3e9c path expansion was broken due to a badly quoted *
Signed-of-by: Benjamin Cama <benoar@dolka.fr>

SVN-Revision: 26391
2011-04-01 11:07:27 +00:00
Felix Fietkau
1dbabd309b scripts/diffconfig.sh: handle CONFIG_ALL, CONFIG_DEVEL and CONFIG_TOOLCHAINOPTS properly
SVN-Revision: 26349
2011-03-28 23:25:18 +00:00
Felix Fietkau
1cc0bcfffc base-files: relink uclibc and libgcc libraries to remove leftovers of the statically linked initial libgcc saves a few kb and gets rid of unused not exported functions as well should also improve the reliability of mklibs
SVN-Revision: 25800
2011-03-01 05:40:38 +00:00
Jo-Philipp Wich
073c5e0e74 add config.rpath and link it in autotools.mk if missing, some packages might need it, especially users of lib-link.m4 or iconv.m4
SVN-Revision: 25753
2011-02-27 15:39:27 +00:00
Jo-Philipp Wich
3edf9c3544 Never write errors to stdout from ipkg-make-index.sh
Since the output of ipkg-make-index.sh is unconditionally used to create
the Packages file, sending the errors into this file is unacceptable
(both because they are not shown to users and because they make an
invalid Packages file).

For incorrect invocation, write to stderr.
For errors from which, send to /dev/null with stdout.

Signed-off-by: Kevin Locke <klocke@digitalenginesoftware.com>

SVN-Revision: 25677
2011-02-23 22:58:58 +00:00
Jo-Philipp Wich
a9c7feb0f7 download.pl: adjust kernel download urls for longterm and testing releases
SVN-Revision: 25589
2011-02-19 15:41:00 +00:00
Felix Fietkau
8d0cf8fde2 metadata: fix handling of multiple build dependencies with different conditions
SVN-Revision: 25505
2011-02-13 02:52:22 +00:00
Felix Fietkau
b0359432ae scripts/diffconfig.sh: use the new kconfig mode to remove some more unnecessary entries in the generated output
SVN-Revision: 25233
2011-01-29 02:35:28 +00:00
Felix Fietkau
b760b5fcf7 scripts/kconfig.pl: add a mode to generate a config diff that ignores added undefined config values
SVN-Revision: 25232
2011-01-29 02:35:24 +00:00
Felix Fietkau
024dc6ea5f add scripts/diffconfig.sh: a tool for making reduced .config files these files contain only the target selection and options that differ from the default settings this makes it much easier to review .config files
SVN-Revision: 25231
2011-01-29 02:22:45 +00:00
Felix Fietkau
b0f60f8023 scripts/config: add an option for making the conf tool write to a different file
SVN-Revision: 25230
2011-01-29 02:22:40 +00:00
Felix Fietkau
8740549c57 mpc85xx: add a new 'spe_fpu' feature flag for the FPU used on freescale powerpc cpus The SPE FPU is ABI-incompatible with the regular powerpc FPU, this needs to be reflected in the toolchain target name. Fixes floating point crashes in user space
SVN-Revision: 25018
2011-01-16 01:25:06 +00:00
Jo-Philipp Wich
65fad8645d download.pl: pass --no-check-certificate to wget
SVN-Revision: 24686
2010-12-18 20:54:53 +00:00
Michael Büsch
58255d44e2 deptest: Also accept stamps that are broken links.
SVN-Revision: 24350
2010-12-08 16:08:14 +00:00
Felix Fietkau
3945267a99 scripts/feeds: support checking out git trees with different branches
SVN-Revision: 24285
2010-12-06 16:57:25 +00:00
Michael Büsch
bdfe80df4c deptest: Make stamps be symlinks to logs.
SVN-Revision: 24277
2010-12-06 10:49:37 +00:00
Imre Kaloz
4052849677 switch from ext2 to ext4 (w/o) journaling
SVN-Revision: 24084
2010-11-22 12:12:39 +00:00
Michael Büsch
bf274946af deptest: Capitalize failure message. Makes it easier to spot in the logs.
SVN-Revision: 23855
2010-11-04 11:30:10 +00:00
Michael Büsch
100fc4c7ce deptest: Do not clobber the base build and staging dirs
SVN-Revision: 23835
2010-11-03 18:48:03 +00:00
Michael Büsch
55081c6a19 deptest: --force also overrides blacklist stamps
SVN-Revision: 23827
2010-11-03 15:18:53 +00:00
Michael Büsch
ae6b08d22b deptest: Add --force to force a test
SVN-Revision: 23826
2010-11-03 15:01:03 +00:00
Michael Büsch
050902efd7 deptest: Install of host tools has to be forced for every test, because the host staging dir is cleaned prior a test.
SVN-Revision: 23825
2010-11-03 14:58:32 +00:00
Michael Büsch
00e1797f14 deptest: Add option for lean test
SVN-Revision: 23821
2010-11-03 14:44:31 +00:00
Michael Büsch
1e317e8f43 deptest: Add sanity check to avoid trouble with illegal package names
SVN-Revision: 23819
2010-11-03 12:49:38 +00:00
Michael Büsch
57ccc7e834 deptest: Support specifying certain packages to test on the commandline.
SVN-Revision: 23818
2010-11-03 12:41:28 +00:00
Michael Büsch
0e2b397a8b deptest: Add optional blacklisting
SVN-Revision: 23811
2010-11-03 01:10:52 +00:00
Michael Büsch
ba91f56bf4 deptest: Check for .config
SVN-Revision: 23810
2010-11-03 00:27:50 +00:00
Michael Büsch
87fe1d36d3 deptest: Install the kernel at init stage
SVN-Revision: 23809
2010-11-03 00:24:12 +00:00
Michael Büsch
e37d386dfc deptest: Better detection of base directory
SVN-Revision: 23807
2010-11-02 23:22:34 +00:00
Michael Büsch
0cacb5855d deptest: Also make sure the toolchain is built in the initialization step. This makes it possible to run the script from within a fresh tree.
SVN-Revision: 23806
2010-11-02 22:48:29 +00:00
Michael Büsch
0f21452ff8 deptest: Also create "failed" stamps. This makes it easier to check what failed after the script finished.
SVN-Revision: 23805
2010-11-02 22:36:32 +00:00
Michael Büsch
6bb89b547a deptest: Add shbang
SVN-Revision: 23804
2010-11-02 21:58:24 +00:00
Michael Büsch
12dfecd4be deptest: Fix indent
SVN-Revision: 23803
2010-11-02 21:57:03 +00:00
Florian Fainelli
0d74b45467 add support for darcs-based feeds
The following patch adds support for darcs-based feeds.
It is tested and works well for my purpose.  I wish it
were committed upstream so that I can share my feed with
other users without converting it to svn/git/whatever.

Best regards,

Signed-off-by: Gabriel Kerneis <kerneis@pps.jussieu.fr>

SVN-Revision: 23616
2010-10-24 12:36:51 +00:00
Michael Büsch
b5cfdcd278 Fix typo
SVN-Revision: 23524
2010-10-18 21:43:50 +00:00
Jo-Philipp Wich
04c4b01fb4 remote-gdb: fix parsing of arch and libc from given path as well
SVN-Revision: 23407
2010-10-12 03:07:07 +00:00
Jo-Philipp Wich
9d50430238 remote-gdb: - fix parsing of arch-libc tuples - automatically add sysroot to executable if needed
SVN-Revision: 23406
2010-10-12 01:15:55 +00:00
Jo-Philipp Wich
80a79d3910 metadata.pl: don't emit LINUX_2_6 selects anymore
SVN-Revision: 23375
2010-10-10 12:27:44 +00:00
Jo-Philipp Wich
be2a1e14ba patch-kernel.sh: utilize --force (#7745), also use the PATCH env var and fallback to "patch" if unset
SVN-Revision: 23314
2010-10-08 09:21:01 +00:00
Jo-Philipp Wich
adcfdc46e0 feeds: restore previously active feed after install_package(), fixes install all case for packages with inter-feed dependencies
SVN-Revision: 23171
2010-10-02 02:37:27 +00:00
Felix Fietkau
7f80e26661 fix build dependencies on packages with multiple variants but no selected virtual packages
SVN-Revision: 23102
2010-09-20 20:17:28 +00:00
Michael Büsch
1460115836 dl_cleanup: Add support for GIT-SHASUM
SVN-Revision: 23084
2010-09-18 19:19:34 +00:00
Jo-Philipp Wich
064e7c8f00 Implement an ARCH_PACKAGES variable which defaults to BOARD but can be overridden on a per-subtarget basis. This is intended for targets such as adm5120 and malta which support both big and little endianess and will replace the target specific exceptions in package-defaults and Image Builder.
SVN-Revision: 23029
2010-09-12 20:49:54 +00:00
Jo-Philipp Wich
097d38615b metadata.pl: fix handling of HOST_BUILD_DEPENDS if a package is referenced that only exists as source pkg, e.g. libtool
SVN-Revision: 22946
2010-09-06 01:43:20 +00:00
Felix Fietkau
00d1e599d7 add a command for printing a cleaned up make target database - will be used to analyze package dependencies at some point
SVN-Revision: 22871
2010-09-01 17:51:36 +00:00
Felix Fietkau
198f027c4b scripts/feeds: fix a bug in the metadata caching change
SVN-Revision: 22819
2010-08-26 21:40:16 +00:00
Felix Fietkau
76d517b629 scripts/feeds: switch to the right feed metadata when installing a package to fix dependency handling (patch by matthijs from #5891)
SVN-Revision: 22815
2010-08-26 15:13:47 +00:00
Felix Fietkau
f9ff9d02f6 scripts/feeds: cache feed metadata instead of re-reading it on every get_feed() call
SVN-Revision: 22814
2010-08-26 15:13:42 +00:00
Michael Büsch
7a8066735d Add usb gadget feature flag
SVN-Revision: 22798
2010-08-25 17:35:34 +00:00
Michael Büsch
b0745dd8ce Fix dl_cleanup.py
SVN-Revision: 22578
2010-08-10 15:08:02 +00:00
Felix Fietkau
0e1337ea47 scripts/env: fix initialization of files/ when creating a new environment (patch from #7603)
SVN-Revision: 22336
2010-07-21 17:49:52 +00:00
Imre Kaloz
c1e57d12c8 upgrade the config.* scripts
SVN-Revision: 22312
2010-07-20 13:21:00 +00:00
Hamish Guthrie
1d2f157928 Revert r22094 and r22095
SVN-Revision: 22096
2010-07-08 16:15:57 +00:00
Hamish Guthrie
6a7c2c244f Added --non-interactive flag to svn package downloads
SVN-Revision: 22095
2010-07-08 15:44:24 +00:00
Hamish Guthrie
6615374f13 add --trust-server-cert to svn checkout of feeds
SVN-Revision: 22094
2010-07-08 15:27:33 +00:00
Felix Fietkau
bb44616ebe set the default target to brcm47xx, now that brcm-2.4 is gone
SVN-Revision: 21960
2010-06-26 23:47:25 +00:00
Florian Fainelli
27fc94ff52 make flashing scripts executable
SVN-Revision: 21958
2010-06-26 22:18:15 +00:00