Commit Graph

618 Commits (6380a6108205931b9f64955d9e1433ec22078c9f)

Author SHA1 Message Date
Felix Fietkau 67e1e9add6 scripts/diffconfig.sh: reduce config output with CONFIG_BUSYBOX_CUSTOM
Use similar approach as r47461 to reduce output for busybox config.

Since r39435 CONFIG_BUSYBOX_CUSTOM=y has caused the addition of
all ~260 busybox config options to the diffconfig output even if
only one option has been changed.

This patch eliminates the unchanged busybox config options from the output
and leaves only the actually modified options.

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

Backport of r47463

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47497 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-11-18 12:38:56 +00:00
Felix Fietkau 4fda441db6 scripts/diffconfig.sh: reduce config output with CONFIG_ALL_KMODS
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

Backport of r47461

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47496 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-11-18 12:38:48 +00:00
Steven Barth 72cab74402 scripts/feeds: observe -p flag for preferential feeds
lookup_target was trampling the $feed variable, resulting in the -p flag
no longer preferentially installing from the named feed.

Make sure to use a local variable for this instead.

Signed-off-by: Karl Palsson <karlp@remake.is>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46213 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-07-07 11:30:39 +00:00
Jo-Philipp Wich 22d36e6399 scripts: add srecimage.pl, a script to convert binaries to SREC format
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45808 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-05-28 15:53:55 +00:00
Jonas Gorski 630ed5df05 scripts/arm-magic.sh: make the generated kernels also include $IMG_PREFIX
In r45785 ixp4xx was changed to use a common image prefix also for
kernels, but the script creating them was not updated to generate the
expected filenames.
Fix this by letting arm-magic.sh respect $IMG_PREFIX for the output
kernel file names as well.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45803 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-05-28 10:48:23 +00:00
Felix Fietkau a9532e4386 scripts/feeds: fix typo in copied code
do_install_target copied code from do_install_package, but didn't
replace all text.

Signed-off-by: Karl Palsson <karlp@remake.is>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45784 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-05-27 15:20:22 +00:00
Jo-Philipp Wich af3ff42467 scripts: ensure that ipkg-make-index.sh exits successfully
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45771 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-05-27 08:29:10 +00:00
Felix Fietkau 0e2a822b3a build: allow creating empty package feeds
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45757 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-05-26 09:09:07 +00:00
John Crispin b531ed5009 scripts/feeds: Delete package/feeds folder in the clean procedure to prevent dangling links.
Hello,

if you run:
./scripts/feeds clean
It removes ./feeds folder but not ./package/feeds/ which is full of dangling links then. This patch fixes it.

Best Regards,
Martin Strbačka

Signed-off-by: Martin Strbacka <martin.strbacka@nic.cz>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45738 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-05-23 15:29:06 +00:00
Felix Fietkau 894476db48 scripts/feeds: add support for optionally using a full clone of git repositories
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45668 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-05-10 15:51:19 +00:00
Felix Fietkau 4022f5a9f4 build: make device-tree arg optional in mkits.sh
mkits.sh help currently shows dtb file as optional, but generates an
invalid its file when this option is unspecified.

We're fixing this problem by removing the use of the sed command and
just including variables instead.

Signed-off-by: Mathieu Olivari <mathieu@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45659 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-05-10 11:46:45 +00:00
Jo-Philipp Wich 00f1d3b2c9 env: allow passing a commit message on save
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45592 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-05-01 17:23:15 +00:00
Felix Fietkau ceb67a714d scripts/ipkg: remove file, it is obsolete
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45130 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-29 07:35:36 +00:00
Felix Fietkau 083034a599 tools: replace ipkg-utils with a reduced ipkg-build variant in scripts/
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45129 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-29 07:35:26 +00:00
Felix Fietkau 629211cefa scripts/metadata.pl: do not emit ARCH selection for a target if it has subtargets
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45112 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-29 04:31:15 +00:00
Jonas Gorski 88ea80c8f3 buildroot: make it easier to build all kmods
Split out kmods from ALL to make it easier to create local builds that
are compatible kmod-wise with releases.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44830 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-16 11:51:54 +00:00
Felix Fietkau fd9fbc68bb scripts/feeds: add support for uninstalling targets
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44782 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-15 11:08:10 +00:00
Felix Fietkau 2888f54b6d scripts/feeds: add support for installing targets
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44781 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-15 11:08:05 +00:00
Felix Fietkau f7a7b550d3 scripts/metadata.pm: save target makefile names
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44780 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-15 11:08:01 +00:00
Felix Fietkau 9ccecb891f scripts/feeds: get rid of redundant feed cache copy
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44779 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-15 11:07:57 +00:00
Felix Fietkau 5f795282b5 scripts/feeds: remove useless install_method abstraction
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44778 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-15 11:07:52 +00:00
Felix Fietkau 121595b939 scripts/feeds: add support for searching for targets
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44777 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-15 11:07:44 +00:00
Felix Fietkau 2a7aff42fd scripts/metadata.pl: move parse_target_metadata() to metadata.pm
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44776 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-15 11:07:40 +00:00
Felix Fietkau 6e940fdbb8 scripts/feeds: scan for target metadata
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44775 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-15 11:07:34 +00:00
Felix Fietkau 9e9282c382 scripts/feeds: remove a few trailing tabs
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44773 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-15 11:06:50 +00:00
Felix Fietkau bef0825885 scripts: fix ubinize-image on OS X
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44761 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-03-15 05:12:11 +00:00
John Crispin 0709b59745 scripts: fix getver git dir check
Git internals are referenced by .git which isn't necessarily a
directory. It may also be a file that references the actual .git
directory using the gitdir directive.

If .git is assumed to be a directory the build will not be able to get
the correct version when openwrt is included as a git submodule because
when used as a submodule .git will actually be a file referencing to a
subdirectory in the parent's git dir.

When the correct version is not detected some image generation tools
will fail because the OpenWrt string will be 'OpenWrtunknown' which is
too long for some header formats.

Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44452 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-02-14 20:48:37 +00:00
Jo-Philipp Wich 6da5c89178 scripts: extend rstrip.sh to remove bad rpaths
Remove all rpath entries which do not point to a location below /lib or
/usr/lib and which do not begin with '$ORIGIN'.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44377 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-02-10 15:48:48 +00:00
John Crispin 6b1d86bc97 build: propagate override information to .config file
With this change, override information is now parsed from the metadata
and put in the %packages hash. A new hash - %overrides - is created and
exported, to be used during the .config-package.in generation.

If an override is detected, a new option CONFIG_OVERRIDE_PKGS will be
created in the .config, and will contain a space-separated list of all
the overridden packages.

Signed-off-by: Mathieu Olivari <mathieu@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44336 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-02-09 12:09:43 +00:00
John Crispin 045c40fb05 build: allow openwrt.git packages to be replaced by feeds
Currently, replacing a package available in openwrt.git requires
modifications in openwrt.git, or requires duplicating the package in a
feed but with a different name, which causes all kind of problems
related to dependencies (all packages selecting it would have to be
modified accordingly to select the new package).

With this change, if a package with the same name is present both in
feeds/ and package/ folders, the one in feeds/ can override the one
in package/, both in the menuconfig and during the build, by passing the
"-f" option to "./scripts/feeds install"

This mechanism is particularly useful for vendor tree, or in general for
application which needs to replace one particular package which exists
within openwrt.git by a custom/newer version.

Signed-off-by: Mathieu Olivari <mathieu@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44334 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-02-09 12:09:23 +00:00
Jo-Philipp Wich 108659afe2 scripts: avoid outputting empty lines in gen-dependencies.sh
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44208 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-29 22:05:31 +00:00
Jo-Philipp Wich e09cec721e scripts: gen-dependencies.sh: fix kmod dependency generation
Do not output faulty ".ko" dependency if a scanned .ko file has an empty
"depends=" specification, also replace the `grep | sed | awk` chain with a
single sed program.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44206 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-29 21:59:10 +00:00
Jo-Philipp Wich 421913b256 scripts: add version_filter command to metadata.pl
Also support version annotated Kconfig symbols in the kconfig subcommand.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44188 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-29 15:50:53 +00:00
Jo-Philipp Wich d2b3101053 scripts: remote-gdb: fix target / libc matching on directory names
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44088 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-23 12:41:06 +00:00
John Crispin 6b66328ef4 build: revert r44076
the patch causes issues when installing feeds

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44078 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-22 13:13:09 +00:00
John Crispin 7fdb8680e3 build: allow openwrt.git packages to be replaced by feeds
Currently, replacing a package available in openwrt.git requires
modifications in openwrt.git, or requires duplicating the package in a
feed but with a different name, which causes all kind of problems
related to dependencies (all packages selecting it would have to be
modified accordingly to select the new package).

With this change, if a package with the same name is present both in
feeds/ and package/ folders, the one in feeds/ can override the one
in package/, both in the menuconfig and during the build, by passing the
"-f" option to "./scripts/feeds install"

This mechanism is particularly useful for vendor tree, or in general for
application which needs to replace one particular package which exists
within openwrt.git by a custom/newer version.

Signed-off-by: Mathieu Olivari <mathieu@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44076 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-22 09:35:40 +00:00
Felix Fietkau 648b9ba08b scripts/config: sync with linux upstream
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43873 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-08 14:33:53 +00:00
Felix Fietkau aa4cbcc9bb scripts/config: fix segfault introduced in r43652
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43695 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-13 14:01:26 +00:00
Jo-Philipp Wich bdcde56bdb scripts/config: remove debug statement
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43655 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-12 12:37:51 +00:00
Felix Fietkau 12868dc7a5 scripts/download.pl: add support for adding mirrors through an environment variable
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43654 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-12 12:35:23 +00:00
Jo-Philipp Wich 6fa321ff1c scripts/config: support includes relative to the currently processed file
When the initial glob() attempt on a path specified with "source" statement
yields no result, then retry the globbing on the same path with the directory
part of the currently processed file prepended.

This allows us to reference Config.in files relative to their parent instead
of relative to the top dir.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43652 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-12 12:29:58 +00:00
John Crispin b6471d5ff3 scripts: use extended-remote for greater compatibility
Plain "remote" results in failure to connect using the gdb built with
the toolchain. (On atheros target at least)  extended-remote also allows
"run" to restart the target process.

Signed-off-by: Karl Palsson <karlp@remake.is>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43596 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-10 15:50:52 +00:00
John Crispin c53e189dfb packages: fix typo in OpenWrt name
Signed-off-by: Cezary Jackiewicz <cezary.jackiewicz@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43542 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-07 16:53:30 +00:00
Felix Fietkau a7992ea6d1 scripts/config.sub: add back musl support that was accidentally dropped in r43353
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43417 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-28 00:59:57 +00:00
Florian Fainelli 688e48076b aarch64: add initial support
Add initial support for the AArch64 architecture

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43353 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-24 06:33:13 +00:00
John Crispin 4fbb94f514 scripts/om-fwupgradecfg-gen.sh: add support for the MR900
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43260 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-14 16:54:23 +00:00
John Crispin ef7634e29e 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43070 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-26 16:57:33 +00:00
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