diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-03-16 03:02:31 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-03-16 03:02:31 +0000 |
commit | 2c62bddcfe20dc4691d13995bfe8c6e3d869d62f (patch) | |
tree | 1d41250dcc9cac9ed489fecf0f3eb42b8ecc69bb /package/Makefile | |
parent | 7b1a36cab40624bc52a6475633d06cfb4ba11527 (diff) | |
download | master-31e0f0ae-2c62bddcfe20dc4691d13995bfe8c6e3d869d62f.tar.gz master-31e0f0ae-2c62bddcfe20dc4691d13995bfe8c6e3d869d62f.tar.bz2 master-31e0f0ae-2c62bddcfe20dc4691d13995bfe8c6e3d869d62f.zip |
Add an 'Image Configuration' menu to menuconfig Packages can export a list of config options with labels and data types through the metadata. The selected config values will be exported to the target filesystem in /etc/uci-defaults and applied on the first boot.
SVN-Revision: 6572
Diffstat (limited to 'package/Makefile')
-rw-r--r-- | package/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/package/Makefile b/package/Makefile index 151942de34..bf7090d04d 100644 --- a/package/Makefile +++ b/package/Makefile @@ -8,9 +8,12 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/.config -include $(TMP_DIR)/.pkgdeps include $(INCLUDE_DIR)/host.mk +all: compile + +include $(TMP_DIR)/.pkgdeps + PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m)) DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m)) COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) @@ -29,9 +32,9 @@ GENDEP_OPTS := -s endif $(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo - @$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@ + @$(TOPDIR)/scripts/metadata.pl package_mk $(GENDEP_OPTS) < $< > $@ || rm -f $@ -all: compile +preconfig: clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) prereq: $(PREREQ_PACKAGES) download: $(DOWNLOAD_PACKAGES) @@ -41,6 +44,7 @@ install-targets: $(INSTALL_PACKAGES) install: rm -rf $(BUILD_DIR)/root $(MAKE) install-targets + $(MAKE) preconfig @if [ -d $(TOPDIR)/files ]; then \ $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \ fi @@ -49,7 +53,7 @@ install: for script in ./etc/init.d/*; do \ grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \ - done; \ + done || true \ ) index: $(PACKAGE_DIR)/Packages |