Commit Graph

571 Commits (0cc57816cfce504c4509adcc2e8c8ea8a7f67a08)

Author SHA1 Message Date
John Crispin 81d9f2d585 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42911 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-14 12:21:11 +00:00
John Crispin 0834da1573 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42891 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-13 19:41:27 +00:00
John Crispin 978b39ca1f 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42840 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-08 08:01:39 +00:00
Felix Fietkau 3ed277255c build: add support for declaring package CONFLICTS which only affect selecting built-in packages
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42770 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-05 16:41:33 +00:00
Felix Fietkau 51b28882cc build: allow packages with build variants to explicitly select a default variant
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42654 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-09-23 10:41:15 +00:00
Jo-Philipp Wich 10e649119b script/remote-gdb: enable and keep command history
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42609 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-09-18 09:29:44 +00:00
Jo-Philipp Wich fdb795c3e4 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42002 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-05 11:24:24 +00:00
John Crispin 25eedaa1ad 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41771 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-20 17:30:48 +00:00
Felix Fietkau 0f1f2c383a scripts/abs2rel.pl: remove, it is unused
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41510 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-04 12:11:40 +00:00
Felix Fietkau d78513c970 scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41407 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-30 06:50:22 +00:00
John Crispin 083e1af755 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41368 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-29 06:59:29 +00:00
Imre Kaloz 5f417387b8 make UbinizeImage work nicely without a kernel volume
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41359 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-27 12:58:08 +00:00
John Crispin e327858613 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41347 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-26 11:43:42 +00:00
Felix Fietkau ed6c5b50c3 scripts/metadata.pl: avoid adding depends and select for the same symbol
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41160 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-12 14:35:09 +00:00
John Crispin 2e87c25986 kernel: add a NAND_SUPPORT symbol
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41122 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 12:59:22 +00:00
John Crispin fc4bed72a8 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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41121 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 12:59:19 +00:00
Felix Fietkau e90a2269bc build: add a feature flag for low-memory systems
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40980 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 17:04:38 +00:00
Felix Fietkau ab9efa1b90 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40967 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 13:27:23 +00:00
Felix Fietkau b17e073ff9 metadata.pl: suppress profile config.in code for targets that have subtargets (fixes #14480)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40896 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-01 15:18:47 +00:00
Felix Fietkau 1553b40323 scripts/metadata.pl: fix ignoring missing host dependencies
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39917 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-03-13 14:14:06 +00:00
Felix Fietkau 57e0faf0bb scripts/metadata.pl: remove sdk specific config symbol override
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39916 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-03-13 14:14:03 +00:00
Felix Fietkau 3de0703944 scripts/config: make wildcard include with no results non-fatal
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39862 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-03-10 18:58:40 +00:00
John Crispin c0a637de03 scripts/kconfig.pl: Indicate which file we couldn't open
Signed-off-by: Daniel Colascione <dancol@dancol.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39327 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-01-19 17:27:04 +00:00
Felix Fietkau 752239ae40 scripts/download.pl: prefer the GNU mirror redirect over the primary site (#14603)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39045 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-13 16:43:07 +00:00
Imre Kaloz 27bb4475fb add a feature flag for device tree support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38893 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-22 12:01:01 +00:00
Felix Fietkau 73e5ad61ec scripts/gen-dependencies.sh: prevent zero-length dep.* files from accumulating in tmp/
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38860 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-19 00:03:34 +00:00
Felix Fietkau e3a909038d 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38560 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-28 15:15:09 +00:00
Steven Barth c2338633c0 ipkg-make-index: use more backwards-compatible openssl call for SHA256
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38440 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-17 19:32:28 +00:00
Luka Perkov fd9d6b9a97 build: drop FIT option until we actually need it
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38439 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-17 15:45:41 +00:00
Luka Perkov 7c37d1e787 build: add menuconfig option for building FIT images
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38431 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-16 21:23:24 +00:00
Luka Perkov 4f1464dcef build: move mkits.sh script to more common place
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38430 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-16 10:29:50 +00:00
Steven Barth f578cfad56 opkg: add support for SHA256 verification
based on a patch by Evan Hunt <each@isc.org>
Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38302 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-04 05:56:20 +00:00
Felix Fietkau 8eabf4789e scripts/gen-dependencies.sh: use the cross readelf (#12940)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38259 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-29 20:10:42 +00:00
Felix Fietkau be6662ecdf build: include the cpu type as part of the toolchain/target directory name
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38214 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-26 17:53:32 +00:00
Luka Perkov 6eb901700c 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38172 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-25 13:02:55 +00:00
Florian Fainelli 8f5a397e4d 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37884 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-02 18:25:10 +00:00
Vasilis Tsiligiannis 69e11f1a53 scripts/checkpatch.pl: Fix whitespace errors
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37864 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-31 11:16:49 +00:00
Vasilis Tsiligiannis 5153d22bde scripts/{cleanfile,cleanpatch}: Add scripts for cleaning up file and patch whitespaces
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37863 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-31 11:16:44 +00:00
Vasilis Tsiligiannis ec09b7b756 scripts/checkpatch.pl: Remove checks for __setup's documentation
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37862 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-31 11:15:06 +00:00
Vasilis Tsiligiannis 21fbf2d125 scripts/checkpatch.pl: Remove check for deprecated features
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37861 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-31 11:15:03 +00:00
Vasilis Tsiligiannis 2c143cc093 scripts/checkpatch.pl: Introduce 'checkpatch.pl' script
Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37860 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-31 11:14:53 +00:00
Felix Fietkau ef5da32acb build: process transitive dependencies after local dependencies
This improves duplicate dependency detection

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37679 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-04 12:17:26 +00:00
Felix Fietkau e84c4d5b0a build: suppress conditional dependencies if there are unconditional dependencies on the same symbol
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37678 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-04 12:17:22 +00:00
Felix Fietkau 17e4d34085 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37491 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-21 11:55:30 +00:00
Felix Fietkau 580b2a70a0 scripts/metadata.pl: emit dependencies for package/kernel/linux
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37433 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-19 12:49:21 +00:00
Felix Fietkau 8ce0b53794 scripts/gen-dependencies.sh: clean up temp files
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37430 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-19 10:41:56 +00:00
Jo-Philipp Wich 2df2035f95 scripts: change metadata.pm and metadata.pl to not emit "default m if ALL" Kconfig instructions for hidden packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37397 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-18 13:11:46 +00:00
Felix Fietkau d32395794d gen-dependencies.sh: sort kmod dependencies
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37390 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-18 11:57:36 +00:00
Felix Fietkau de904cbdf8 build: implement kernel module dependency tracking
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37386 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-18 10:47:05 +00:00
Jo-Philipp Wich e9abe75648 metadata.pl: use alphabetical order for menuconfig categories, also fixes random ordering of symbols in .config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37369 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-16 10:35:40 +00:00