Commit Graph

192 Commits

Author SHA1 Message Date
Matthias Schiffer
33d028783f build: remove rather useless "patch" and "unpatch" make targets 2016-03-25 23:57:15 +01:00
Matthias Schiffer
86894548c5 Explicitly set SHELL to bash
Fixes some messages if /bin/sh doesn't support 'echo -e'.

Suggested-by: Steffen Möller <steffen_moeller@gmx.de>
2016-03-22 13:01:18 +01:00
Matthias Schiffer
0fd4ff0a68 build: don't overwrite opkg key when it already exists 2016-02-13 17:02:11 +01:00
Matthias Schiffer
f23e024787 Convert site.conf to JSON during build
This will allow us to use its content from other languages than Lua as
well.
2016-01-02 23:49:25 +01:00
Matthias Schiffer
87dd5bb3bb build: copy opkg keypair to target openwrt tree instead of linking it
Fixes #579
2015-12-02 15:11:38 +01:00
Matthias Schiffer
c456fb231f build: improve feed update fix (and remove accidentially committed part) 2015-11-25 11:35:34 +01:00
Matthias Schiffer
2ffd05357c build: ensure the feeds are updated when modules or site modules change 2015-11-25 02:28:37 +01:00
Matthias Schiffer
6e79982442 build: improve logging of tool build 2015-11-02 17:40:29 +01:00
Matthias Schiffer
34183c1cb2 build: further fixes for clean builds
usign has pulled in new dependencies, and OpenWrt doesn't like the command
`make tools/prepare` in a clean build.
2015-11-02 15:09:01 +01:00
Matthias Schiffer
31d65173f2 build: clean up key generation and early preparation
This will fix the early preparation happening much too often and also fixes
early preparation after `make clean`.
2015-11-02 01:58:30 +01:00
Matthias Schiffer
db6c50011d build: make make dirclean remove the whole GLUON_OUTPUTDIR 2015-11-02 01:35:53 +01:00
Matthias Schiffer
82a9d7904a build: fix QUILT=1 option
This broke due to the Makefile changes for building the module repo.
2015-10-31 22:53:20 +01:00
Matthias Schiffer
4c4ca21545 build: fix creation of opkg key when BUILDDIR hasn't been created yet 2015-10-30 20:07:19 +01:00
Matthias Schiffer
4b120deaee build: improve handling of repository signing keys 2015-10-30 14:08:29 +01:00
Matthias Schiffer
cbe66e9388 build: add make modules make target
`make modules` will generate a opkg repository containing kernel modules
matching the kernel of the Gluon images.
2015-10-29 18:44:00 +01:00
Matthias Schiffer
cb404a944b build: remove vermagic hack
As the Gluon kernel won't be compatible with the OpenWrt upstream anymore,
we don't need the vermagic hack anymore.
2015-10-29 18:44:00 +01:00
Matthias Schiffer
6061b0874a build: fix manifest generation for model aliases 2015-10-27 22:44:03 +01:00
Matthias Schiffer
3b4f154445 build: use symlinks instead of copies when multiple devices use identical images 2015-10-16 19:11:36 +02:00
Matthias Schiffer
69d18cc9e9 build: update opkg config generation to match upstream 2015-10-13 22:00:47 +02:00
Matthias Schiffer
6d92fcb50e Make Gluon/OpenWrt profile mapping more flexible
Add an optional third argument to the GluonProfile macro while contains the
OpenWrt profile name. This allows creating different Gluon profiles (with
different image names etc.) from the same OpenWrt profile.
2015-10-11 21:07:33 +02:00
Matthias Schiffer
48054fc943 Add update-vermagic make target 2015-07-18 21:21:06 +02:00
Matthias Schiffer
8434686085 build: implicitly configure board and subtarget options
The file targets/$GLUON_TARGET/config becomes optional, as many targets
only used it to set the board and subtarget.

Also fix targets without subtarget.
2015-07-12 22:38:41 +02:00
Matthias Schiffer
07d338919c build: copy all regular files from KERNEL_BUILD_DIR to BOARD_KDIR
Fixes build for brcm2708 targets
2015-07-10 18:16:39 +02:00
Matthias Schiffer
b5d01f81df Remove oldpackages opkg.conf entry
The oldpackages repo has been dropped for Chaos Calmer.
2015-06-20 22:20:53 +02:00
Matthias Schiffer
06cffbdde8 Update modules 2015-06-04 20:12:45 +02:00
Matthias Schiffer
e6c00c1ad7 build: ensure prereq has been run at the beginning of prepare-tmpinfo 2015-05-28 02:45:19 +02:00
Matthias Schiffer
ab10be9f50 We're on Chaos Calmer now 2015-05-22 01:09:19 +02:00
Matthias Schiffer
63059c7e8f Switch to new reduced gluon package module 2015-04-22 21:07:31 +02:00
Matthias Schiffer
a11d4a56b0 Use different BUILD_DIRs and STAGING_DIRs for different targets 2015-03-21 21:33:42 +01:00
Matthias Schiffer
e719df04bf build: move profile build directories to a new subdir 2015-03-21 19:04:51 +01:00
Matthias Schiffer
ff05a1f3ca build: don't delete TMP_DIR during image generation 2015-03-21 18:46:46 +01:00
Matthias Schiffer
8aca9222ef build: fix scripts/config/conf build 2015-03-21 18:42:24 +01:00
Matthias Schiffer
a320ef7d5f Delegate scripts/config/conf build to OpenWrt makefile
Otherwise some dependencies aren't respected.
2015-03-21 14:50:52 +01:00
Matthias Schiffer
c676934e88 build: don't enable all kernel modules in the general OpenWrt .config
With this change, there are two OpenWrt config files: one for the packages
actually used by Gluon, and one with all kernel modules enabled (like it was
since we removed the static kernel configs). The config with all kernel modules
is only used to generate the kernel configuration (so it is compatible with the
upstream kernel).

This should bring the build times back to what they were before the static
configs were removed.
2015-03-20 02:15:58 +01:00
Matthias Schiffer
c059c98074 build: make manifest generation more robust 2015-03-20 00:55:22 +01:00
Matthias Schiffer
267831b04d Remove now unused md5sum.sh script 2015-03-19 19:08:41 +01:00
Matthias Schiffer
7401d02ca4 Add i18n support 2015-03-18 20:21:24 +01:00
Matthias Schiffer
28f35becbf build: minor make logging adjustments 2015-03-16 15:52:46 +01:00
Matthias Schiffer
6f1594666d build: don't require GLUON_TARGET for dirclean 2015-03-14 22:23:42 +01:00
Matthias Schiffer
4d7d3d05b3 build: manifest: fix lua path 2015-03-14 21:55:24 +01:00
Matthias Schiffer
11ea225bec build: manifest: check for prepared instead of target-prepared stamp 2015-03-14 21:52:29 +01:00
Matthias Schiffer
c20d0b4130 Rework target handling
Don't set ar71xx-generic target by default, generate manifest for all built
targets.
2015-03-14 19:11:17 +01:00
Matthias Schiffer
68ff6da1c4 Simplify manifest generation 2015-03-14 16:33:55 +01:00
Matthias Schiffer
564cfc8019 Restructure image suffix handling to make it more flexible 2015-03-13 21:27:15 +01:00
Matthias Schiffer
a35e9620b8 build: prepare tmpinfo before generating config 2015-03-07 21:07:36 +01:00
Matthias Schiffer
6e32328b3f build: use own tmp directory for each target 2015-03-07 18:12:52 +01:00
Matthias Schiffer
7ed5112e8d Move extra images to factory subdir 2015-01-25 03:50:53 +01:00
Matthias Schiffer
3507de14aa Add support for image types that are neither factory nor sysupgrade 2015-01-25 03:34:29 +01:00
Matthias Schiffer
8cfd64d2db Make module scripts use GLUONDIR and GLUON_SITEDIR
This fixes `make update` not working correctly when GLUON_SITEDIR is set
manually.
2015-01-11 09:48:31 +01:00
Matthias Schiffer
e93173c45c Add support for factory images with other suffixes than .bin and profiles without factory images
This adds the new macro GluonProfileFactorySuffix which can be used to override
the factory images suffix ".bin". When the suffix is set to the empty string
Gluon will assume that there are no factory images.
2015-01-03 04:42:00 +01:00
Matthias Schiffer
6f14837b91 Fix image and manifest generation when multiple Gluon images correspond to a single OpenWrt image 2014-11-26 21:34:50 +01:00
Matthias Schiffer
90c9ebde43 Overwrite opkg.conf to work with the upstream repositories 2014-10-16 20:50:00 +02:00
Matthias Schiffer
1c1fbe38d5 Always ignore profile-specific packages supplied by OpenWrt 2014-08-08 17:34:50 +02:00
Matthias Schiffer
e164bac87a Switch to Barrier Breaker 2014-08-07 16:21:56 +02:00
Matthias Schiffer
c4109b349c Add DATE and PRIORITY fields to the manifest 2014-07-20 16:35:20 +02:00
Matthias Schiffer
6e0c29fcdb Makefile: re-add --force-postinstall, it is needed for the postinstall scripts to be run 2014-07-04 23:37:17 +02:00
Matthias Schiffer
0a11febc7a Makefile: add prereq target
This fixes targets like toolchain/clean.
2014-06-12 14:47:18 +02:00
Matthias Schiffer
012f70605e Makefile: remove deprecated cleanall target 2014-06-06 19:28:01 +02:00
Matthias Schiffer
356ab27073 Some (unfinished) x86 support 2014-05-21 20:21:32 +02:00
Matthias Schiffer
3e07f0cb08 Makefile: add missing target/Makefile include 2014-05-20 15:14:13 +02:00
Matthias Schiffer
3f58092023 Fix initial Lua build 2014-05-18 21:31:37 +02:00
Matthias Schiffer
705595574d Remove things not needed anymore with the new site config 2014-05-15 22:59:13 +02:00
Matthias Schiffer
1b520c6856 Use site_config loader from gluon packages 2014-05-15 22:59:12 +02:00
Matthias Schiffer
62feaab756 Add "portable" md5sum and sha512sum scripts 2014-05-15 22:59:12 +02:00
Matthias Schiffer
3a6561a40c New Lua-based site configuration 2014-05-15 22:59:12 +02:00
Matthias Schiffer
1f1ea9dc1f Don't make config target twice from different contexts 2014-05-12 08:13:34 +02:00
Matthias Schiffer
49a04d59a9 make: move prepare-tmpinfo to Gluon Makefile and remove SCAN_DEPTH
We were missing the luci packages...
2014-05-12 07:59:06 +02:00
Matthias Schiffer
f502d1443c make: don't install with --force-*, we want to know when something breaks 2014-05-12 07:40:00 +02:00
Matthias Schiffer
b4d017643d Remove prepared stamp on make clean 2014-05-12 07:21:35 +02:00
Matthias Schiffer
0c0ce66c4b Fix cleanall target 2014-05-11 22:27:36 +02:00
Matthias Schiffer
0fd92dd685 Use target-specific openwrt directories with symlinks
This allows us to use separate .config files per target. Also, don't use
OpenWRT's feeds script anymore, but symlink the feeds ourselves.
2014-05-11 10:47:35 +02:00
Matthias Schiffer
6e8532e39d Generate .config without symlink again
Otherwise, `make cleanall` fails...
2014-05-11 06:12:09 +02:00
Matthias Schiffer
941301680d Include rules.mk earlier so STAGING_DIR_HOST is available in gluon.mk 2014-05-10 16:56:31 +02:00
Matthias Schiffer
2c1a54b353 Another build fix
Explicitly re-build prepare-tmpinfo after the feeds have been installed, as it
isn't done automatically anymore since we have the gluon-tools target.
2014-05-10 15:09:08 +02:00
Matthias Schiffer
d066bdec3b Fix initial build 2014-05-10 11:53:50 +02:00
Matthias Schiffer
8644bfbc18 More multi-target support (still not finished...) 2014-05-10 11:52:06 +02:00
Matthias Schiffer
3b8ad88ce4 Some work towards multi-target support 2014-05-09 15:02:46 +02:00
Matthias Schiffer
379c293b8d make: include the SUBTARGET in BOARD_BUILDDIR
Also, more cleanup.
2014-05-09 15:02:46 +02:00
Matthias Schiffer
14b52a6fd4 Allow building single targets (like single packages etc.) 2014-05-09 09:06:41 +02:00
Matthias Schiffer
f873d6b462 make: remove unneeded rule dependency (it is already defined in openwrt/tools/Makefile) 2014-05-09 08:57:51 +02:00
Matthias Schiffer
c66ffd1daf make: nicer gluon-tools dependencies 2014-05-09 08:52:25 +02:00
Matthias Schiffer
6c862525f7 Use GNU stat (as determined by OpenWRT) for GLUON_CONFIG_VERSION
This *should* fix the build on non-Linux systems like MacOS X.
2014-05-08 00:49:46 +02:00
Matthias Schiffer
a9eb44b41a Fix removal of old images 2014-02-13 15:50:59 +01:00
Matthias Schiffer
1042c74c7a Change all occurences of BRANCH to GLUON_BRANCH... 2014-02-12 10:03:26 +01:00
Matthias Schiffer
736d3c7d2b Rename BRANCH to GLUON_BRANCH, update Gluon packages 2014-02-11 17:11:11 +01:00
Matthias Schiffer
5b51ba8ab5 Shorter image names, make manifest generator more robust 2014-02-11 01:25:10 +01:00
Matthias Schiffer
12abed64fe Add manifest generator 2014-02-06 13:20:34 +01:00
Matthias Schiffer
b6f98402ef Enable sha512sum 2014-02-05 22:56:17 +01:00
Matthias Schiffer
e23099e9bc Move images to a new directory 2014-02-05 22:12:50 +01:00
Matthias Schiffer
8ce95898eb Fix generation of feeds.conf for site modules 2014-01-20 21:01:55 +01:00
Matthias Schiffer
7779c57c34 Use site code and release number for image version strings 2014-01-20 02:40:31 +01:00
Jan-Philipp Litza
ca95374ea1 Enable the site config to include own package feeds 2014-01-19 17:37:46 +01:00
Jan-Philipp Litza
5a17b69547 CONFIG_ATH_USER_REGD=y 2014-01-15 20:10:21 +01:00
Matthias Schiffer
9598d30fba Makefile: remove unused definition 2014-01-13 22:58:07 +01:00
Matthias Schiffer
30f4c8ee12 Remove initscript enable hack 2014-01-13 18:23:25 +01:00
Matthias Schiffer
29e9203c4f Makefile: remove some incorrect + signs 2014-01-11 12:01:19 +01:00
Daniel Ehlers
c2ad15cd65 Validate site.conf in the beginning of the build process 2014-01-11 03:38:04 +01:00
Matthias Schiffer
7537464262 Nicer feed specification 2014-01-02 15:16:32 +01:00
Matthias Schiffer
37f1248d3d Add some more fixes and some checks for the new module system 2013-12-28 22:13:18 +01:00
Matthias Schiffer
1b33134353 Make patch and update scripts a bit nicer 2013-12-28 21:35:16 +01:00