Commit Graph

152 Commits

Author SHA1 Message Date
Alexander Couzens
4a7c653400 IB/SDK/toolchain: use VERSION_DIST_SANITIZED instead of VERSION_DIST
VERSION_DIST can contains spaces which produces problems when used as file name

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
2016-06-01 17:54:36 +02:00
Daniel Dickinson
9fd8e55132 imagebuilder: Fix sorting package list breaks opkg dependency handling for provides
When imagebuild sorts package lists it breaks opkg's ability to realize
that a providers for a Provides has already been installed, when the sort
results in the provider being later in the list of packages that a package
which depends on a Provides (and hence the provider is not yet installed
for opkg to realize the provider was available doesn't not handle the case
of a package that is to be installed satisfying a dependency, only one that
is already installed (or which it schedules to be installed, which in the
absence of an installed provider is whichever provider happens to be the
default)

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
2016-05-18 23:53:01 +02:00
Felix Fietkau
f4c4d501e4 build: remove profile kernel/build system config override support
It has been unused for years

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-05-15 20:55:40 +02:00
Felix Fietkau
80f4988da3 target/imagebuilder: fix using new device profiles
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-05-13 16:32:36 +02:00
Alexander Couzens
009a069ec0 imagebuilder: rename OpenWrt into LEDE
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
2016-05-05 19:07:28 +01:00
Jo-Philipp Wich
b9466382b5 imagebuilder: use correct package directory when bundling kmods and libc
The libc and kernel package files moved since the introduction of shared
packages and the changed output directory layout. This causes the generated
ImageBuilder archive to lack the necessary "libc" and "kernel" meta packages,
leading to opkg install errors later on.

Use the FeedPackageDir macro to figure out the proper source directory to use.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-04-22 12:22:57 +02:00
Jo-Philipp Wich
da46d2b228 imagebuilder: fix standalone operation
Fix standalone ImageBuilders after the package layout rework.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-04-13 01:46:09 +02:00
Felix Fietkau
0a0bfc8507 images imagebuilder: Allow to add sanitized extra name
For final output image names allow user to add an
extra string (which is sanitized).  This is particularly
useful with ImageBuilder where you may generate multiple
images from the same base and for the same board,
with different package selections and additional files
(via FILES=).

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>

SVN-Revision: 48083
2016-01-03 14:44:56 +00:00
Felix Fietkau
d69efa4e15 targets: Use configured distribution name for SDK, IB, and Toolchain tarball names
We allow to configure the version distribution name;
let's also use it for the tarballs (SDK, ImageBuilder,
and SDK).

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>

SVN-Revision: 48081
2016-01-03 14:44:42 +00:00
Jo-Philipp Wich
fb3fb9b6c1 imagebuilder: store package lists in cache directory
Force opkg to store the downloaded repository indizes into the cache
directory as well, this way the IB can be used in an offline setting
once all required files have been cached.

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

SVN-Revision: 46912
2015-09-14 16:57:03 +00:00
Felix Fietkau
add0c00c96 imagebuilder: run build prereq checks before building image to set up host commands properly
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 46840
2015-09-10 11:06:42 +00:00
John Crispin
096b3759a9 build: Prevent more gzip timestamps
To improve reproducibility, prevent the inclusion of timestamps
in the gzip header.

Signed-off-by: Reiner Herrmann <reiner@reiner-h.de>

SVN-Revision: 46361
2015-07-14 09:57:45 +00:00
Jo-Philipp Wich
11f05afd26 imagebuilder: create cache directory if needed (#18629)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 45866
2015-06-01 06:15:39 +00:00
Jo-Philipp Wich
e91342e285 IB: make CONFIG_IB_STANDALONE the default
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 45800
2015-05-28 09:51:38 +00:00
Jo-Philipp Wich
3c5357d6ef feeds: use common macro "FeedSourcesAppend" to populate opkg configurations
This introduces a common macro to assemble the correct url templates to
avoid code duplication and have the feed config handling in a central place.

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

SVN-Revision: 45799
2015-05-28 09:47:37 +00:00
Jo-Philipp Wich
6c21bcaa65 IB: use online repositories
Change the IB packaging to only embed libc, kernel and kmod packages by default
and generate repositories.conf to refer to the remote package repositories.

Introduce a new config option CONFIG_IB_STANDALONE which restores the old
behaviour of building self contained IB archives.

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

SVN-Revision: 45772
2015-05-27 11:22:20 +00:00
Jo-Philipp Wich
65ec08d1b0 imagebuilder: align filename with SDK
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44313
2015-02-07 21:01:48 +00:00
Jo-Philipp Wich
188032c8e3 imagebuilder: don't pregenerate package index, strip host binaries
The package index is generated on first use anyway, therefore it makes no
sense to continue shipping it.

Also sstrip the bundled host binaries when packing the IB to save some
additional space.

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

SVN-Revision: 44293
2015-02-06 12:31:31 +00:00
Jo-Philipp Wich
2adab34c20 imagebuilder: use FreeBSD compatible tar invocation
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44288
2015-02-06 00:27:06 +00:00
Jo-Philipp Wich
dffaf94d44 imagebuilder: fail with error if the passed profile name does not exist
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 43916
2015-01-10 18:19:59 +00:00
Jo-Philipp Wich
15d8db1f8c build: add version number to filenames
This commit introduces a new option CONFIG_VERSION_FILENAMES which causes
OpenWrt to embed the version number in generated image files, SDK- and
ImageBuilder archives.

The option is enabled by default if CONFIG_VERSIONOPT is set.

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

SVN-Revision: 43869
2015-01-08 11:02:00 +00:00
Felix Fietkau
0b1c89f6fe target/imagebuilder: remove obsolete !TARGET_ROOTFS_INITRAMFS dependency
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43128
2014-10-31 12:59:23 +00:00
John Crispin
44249f71a8 postinst trigger: the new postinst trigger broke IB
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 42571
2014-09-16 11:56:19 +00:00
Felix Fietkau
7632358add imagebuilder: remove postinst files before generating image
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42339
2014-08-31 11:06:31 +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
caa671d873 imagebuilder: fix typo that copied grub to the wrong folder
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41824
2014-07-24 15:46:12 +00:00
John Crispin
941dab02d5 imagebuilder: copy dts folder
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41790
2014-07-21 18:42:00 +00:00
John Crispin
68e8614009 imagebuilder: x86 fails to build inside the imagebuilder
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41580
2014-07-10 22:02:31 +00:00
Felix Fietkau
897b2e4b98 target/imagebuilder: add missing package index (fixes #16675)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40968
2014-06-02 13:27:31 +00:00
Jo-Philipp Wich
69a6fd0190 imagebuilder: bundle dtc (#12953, #14741)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 40767
2014-05-14 12:29:36 +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
Jo-Philipp Wich
476ea2bcb4 imagebuilder: use file_copy to deploy files/ in the image generation phase
SVN-Revision: 34439
2012-12-02 12:20:43 +00:00
Jo-Philipp Wich
b73f22de1e imagebuilder: merge r25078 to align files/ handling with current buildroot
SVN-Revision: 34301
2012-11-22 19:46:54 +00:00
John Crispin
3686b8d279 derive system from hostcc to allow building inside a chroot
SVN-Revision: 33228
2012-08-22 15:07:32 +00:00
Jo-Philipp Wich
a062e08bb4 use bundle-libraries.sh to install required host utilities into imagebuilder staging tree
SVN-Revision: 33196
2012-08-15 13:28:26 +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
John Crispin
76e4cd2a24 add $(SUBTARGET) to the filename if available
SVN-Revision: 32007
2012-05-30 18:04:15 +00:00
Felix Fietkau
fab5ee9566 imagebuilder: explicitly install the kernel .ipk before installing anything else, it is no longer part of the package index (fixes #11450)
SVN-Revision: 31711
2012-05-14 14:00:01 +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
Jo-Philipp Wich
cfe30549a1 don't overwrite version.mk, substitute REVISION instead
SVN-Revision: 31327
2012-04-17 09:31:16 +00:00
Jo-Philipp Wich
3cb72f38fd populate repositories.conf from version.mk
SVN-Revision: 31268
2012-04-12 23:08:13 +00:00
Gabor Juhos
faf17f197f ImageBuilder: respect the PROFILE parameter
Based on a patch from #10766

SVN-Revision: 29877
2012-01-24 09:47:20 +00:00
Jo-Philipp Wich
1e24383ae6 Various enhancements from Manuel Munz <freifunk@somakoma.de> - don't regenerate Package index unless the packagedir changes - remove opkg lists from rootfs, saves > 1MB uncompressed - don't direct errors on index creation into packagelist
SVN-Revision: 28205
2011-09-09 17:25:20 +00:00
Felix Fietkau
e5e17a1ce8 imagebuilder: clean opkg files if requested (patch from #9866)
SVN-Revision: 27872
2011-08-01 23:58:11 +00:00
Jo-Philipp Wich
c5a65a0373 Send ipkg-make-index.sh output to stdout
The "Generating index for package" created by ipkg-make-index only
clutter stderr and serve to push previous warnings/errors off-screen.
Instead, send to stdout.

Note:  This would send incorrect invocation messages to stdout as well.
If this is a concern, perhaps we could send them to FD 3, then send 3 to
2...

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

SVN-Revision: 25678
2011-02-23 22:59:57 +00:00
Jo-Philipp Wich
d45c310c34 allow overriding BIN_DIR (#7412)
SVN-Revision: 23643
2010-10-26 14:15:52 +00:00
Jo-Philipp Wich
cdbeb0e80b copy kernel .config, needed by mkfs.jffs2 to detect compression capabilities
SVN-Revision: 23639
2010-10-26 13:34:21 +00:00
Jo-Philipp Wich
ea5904ff93 - sync with host opkg changes - get rid of autogenerated opkg.conf - utilize dl/ as package cache, useful for remote downloads
SVN-Revision: 23039
2010-09-12 22:04:09 +00:00
Jo-Philipp Wich
ee81bb7cdb fix a small typo in sed pattern
SVN-Revision: 22997
2010-09-10 15:40:42 +00:00
Jo-Philipp Wich
7a2ce99fe5 fix arch detection pattern to cope with underscores in board name, e.g. "adm5120_mips"
SVN-Revision: 22980
2010-09-08 05:46:37 +00:00
Jo-Philipp Wich
699876fa6b - add a helper script to generate opkg.conf, attempt to detect package architecture from packages/ - fix package defaults when no package override is given, IB previously aggregated the defautls of all profiles - introduce a repositories.conf, allows using remote opkg repositories in imagebuilder
SVN-Revision: 22978
2010-09-08 00:36:35 +00:00
Jo-Philipp Wich
2c59d54a43 use --force-run-hooks for host opkg install
SVN-Revision: 22973
2010-09-07 21:22:07 +00:00
Jo-Philipp Wich
9d74fc3eb3 use opkg/host for package installation - speeds up rebuild operations - aligns generated package list format with the one created by opkg on the target - fixes broken dependency handling in imagebuilder
SVN-Revision: 22949
2010-09-06 02:15:46 +00:00
Jo-Philipp Wich
e47a8a001c revert r22372 and r22405, dependency on host libtool causes problems
SVN-Revision: 22406
2010-07-28 02:18:16 +00:00
Jo-Philipp Wich
8c1d9afc40 use host opkg for installing packages in buildroot and ImageBuilder
SVN-Revision: 22372
2010-07-23 19:49:19 +00:00
Jo-Philipp Wich
cdd44e7984 - correctly copy .config when scripts/env is used in the buildroot - prevent user provides PACKAGES from overriding per-profile defaults
SVN-Revision: 21213
2010-04-27 22:16:40 +00:00
Nicolas Thill
ceaff7a566 imagebuilder: don't disable on uml
SVN-Revision: 20598
2010-03-30 11:42:41 +00:00
Nicolas Thill
8c2b753329 imagebuilder: various fixes * only copy host tools from $(STAGING_DIR_HOST)/bin * remove more target patches, and also target files * combine the 3 find commands into a single one
SVN-Revision: 20597
2010-03-30 11:41:51 +00:00
Jo-Philipp Wich
cfaeab171a remove dependency on CONFIG_ALL
SVN-Revision: 20084
2010-03-09 14:49:53 +00:00
Gabor Juhos
3ba43e6528 imagebuilder: add REVISION variable (closes #6795)
SVN-Revision: 20064
2010-03-08 17:00:46 +00:00
Jo-Philipp Wich
9b4005c58c fix custom package selection
SVN-Revision: 19623
2010-02-13 01:56:48 +00:00
Nicolas Thill
ac695f35fa disable IB & SDK when using an external toolchain (closes: #6001)
SVN-Revision: 18837
2009-12-18 18:55:03 +00:00
Felix Fietkau
991a35c6a6 imagebuilder: accept empty profile names, some targets do not define profiles (thx, patrick)
SVN-Revision: 18117
2009-10-22 01:35:32 +00:00
Florian Fainelli
b1f1f7c5a9 remove board name hack (#5823)
SVN-Revision: 17652
2009-09-20 16:06:53 +00:00
Andy Boyett
9756b46d1a remove legacy 2.4-specific behavior, fixes IB on brcm-2.4
SVN-Revision: 16654
2009-07-02 07:24:56 +00:00
Andy Boyett
b728796706 fix profile package selection, packages from last parsed profile were accidentally installed
SVN-Revision: 16653
2009-07-02 07:24:50 +00:00
Nicolas Thill
3f8ac1680c fix initscripts activation (closes: #4037, #4745)
SVN-Revision: 15320
2009-04-21 11:20:25 +00:00
Felix Fietkau
34939cad39 get rid of $Id$ - it has never helped us and it has broken too many patches ;)
SVN-Revision: 15242
2009-04-17 14:09:46 +00:00
Nicolas Thill
be1a9ff41d fix ImageBuilder (closes: #3863)
SVN-Revision: 12370
2008-08-22 13:45:54 +00:00
Felix Fietkau
bdb9c7351c some more build system cleanup
SVN-Revision: 12329
2008-08-17 11:14:13 +00:00
Andy Boyett
6b045c7dc6 Generate gzipped package lists - Can be used by changing the src line in /etc/ipkg.conf to src/gz - Cannot be used by busybox ipkg
SVN-Revision: 11981
2008-07-29 03:36:11 +00:00
Felix Fietkau
44db3f4117 Detach the building of sdk and imagebuilder from "Select all packages by default", since those really represent two distinct build operations from normal package selection.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

SVN-Revision: 10621
2008-03-19 08:16:02 +00:00
Florian Fainelli
50c077affb Fix imagebuilder for 2.6 kernels (#2900)
SVN-Revision: 10099
2008-01-03 22:17:51 +00:00
Felix Fietkau
b81933c951 strip -$(KERNEL) from sdk/imagebuilder names
SVN-Revision: 9742
2007-12-13 22:31:56 +00:00
Felix Fietkau
fa9710c7ee fix imagebuilder compile
SVN-Revision: 9736
2007-12-13 21:04:21 +00:00
Felix Fietkau
93575b53a7 Use $(CP) instead of $(INSTALL_BIN) for binaries.
Signed-off-by: Andy Boyett <agb-openwrt@padded-cell.net>

SVN-Revision: 9694
2007-12-09 18:53:06 +00:00
Felix Fietkau
dfa7618bd6 fix the image builder
SVN-Revision: 9549
2007-11-14 23:11:07 +00:00
Florian Fainelli
43dc71fb0d Fix the imagebuilder generation (does not mean it works with the recent changes)
SVN-Revision: 8710
2007-09-09 15:09:10 +00:00
Florian Fainelli
c54708272f Fix image builder generation (#2213)
SVN-Revision: 8412
2007-08-14 09:47:29 +00:00
Florian Fainelli
163dab630d Fix the imagebuilder compilation (#2213)
SVN-Revision: 8410
2007-08-13 16:30:54 +00:00
Felix Fietkau
c0f9679587 fix a typo
SVN-Revision: 7906
2007-07-10 20:21:09 +00:00
Florian Fainelli
e7113073f3 Suppress spaces in uname -m
SVN-Revision: 7594
2007-06-12 16:48:10 +00:00
Mike Baker
52553da52c fix bug in imagebuilder init.d scripts
SVN-Revision: 7188
2007-05-11 17:47:05 +00:00
Felix Fietkau
874f03ea00 fixes for a few build errors on osx without fink
SVN-Revision: 7065
2007-04-29 01:30:48 +00:00
Felix Fietkau
25fc88fe41 export the IMAGEBUILDER variable so that makefiles can test for the image builder run
SVN-Revision: 6951
2007-04-15 09:53:04 +00:00
Felix Fietkau
3e91dd1bd5 revert find | xargs => find | exec changes - this is completely unnecessary and introduces additional dependencies that we do not need
SVN-Revision: 6942
2007-04-12 19:18:38 +00:00
Mike Baker
8101912ed6 Accidentially broke sdk and imagebuilder in [6857]
SVN-Revision: 6858
2007-04-03 23:29:02 +00:00
Mike Baker
3295536b02 more [6849]
SVN-Revision: 6850
2007-04-03 13:59:07 +00:00
Florian Fainelli
6cd84c6838 Use find -exec instead of xargs
SVN-Revision: 6837
2007-04-02 16:09:15 +00:00
Felix Fietkau
2a7df08119 mark uml as broken and add some cleanups (not working yet)
SVN-Revision: 6439
2007-02-28 18:25:14 +00:00
Felix Fietkau
804bfa954d ignore profiles with custom kernel configs in the image builder itself
SVN-Revision: 6342
2007-02-22 04:03:35 +00:00
Felix Fietkau
ccd12544f6 disable the image builder in menuconfig for profiles with custom kernel configs
SVN-Revision: 6341
2007-02-22 03:56:54 +00:00
Felix Fietkau
5281d134cd rename the Profile template that the image builder uses to prevent name conflicts with the template that the kernel uses
SVN-Revision: 6336
2007-02-22 02:27:01 +00:00
Felix Fietkau
0aec54a5b5 fix a typo
SVN-Revision: 6158
2007-01-21 12:56:55 +00:00
Felix Fietkau
2fb06d46d9 Add WL-700gE support (based on work by jr) Includes kernel/diag patch and a new target profile
SVN-Revision: 6142
2007-01-20 12:35:00 +00:00
Felix Fietkau
146500a67c include .pkginfo in image builder
SVN-Revision: 6135
2007-01-20 01:38:31 +00:00
Felix Fietkau
7cb45c3be8 show package list on make info in the image builder
SVN-Revision: 6103
2007-01-14 23:49:23 +00:00
Felix Fietkau
351d0d4b07 Fix config checks for Image Builder and SDK - only build them when requested. Clear all packages from bin/packages at the beginning of package/compile when the Image Builder is selected, because the Image Builder can't handle multiple versions of the same package.
SVN-Revision: 6102
2007-01-14 23:37:40 +00:00
Felix Fietkau
fd9477a18f remove BIN_DIR on make clean in the image builder
SVN-Revision: 6101
2007-01-14 23:12:30 +00:00
Felix Fietkau
374f384350 include .targetinfo in the image builder, and allow direct calls to the package_index target
SVN-Revision: 6093
2007-01-14 10:49:00 +00:00