Commit Graph

592 Commits (f70b78ddb485a3f24cf3df90cca273e9ba16010b)

Author SHA1 Message Date
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
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