projects
/
openwrt
/
staging
/
lynxis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: bump PKG_RELEASE
[openwrt/staging/lynxis.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 91b6946ac3420c8d7272807a809bb418f3f99103..09db75c5508d49d1bc10f66007149136ca0bcf7c 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-9,15
+9,16
@@
TOPDIR:=${CURDIR}
LC_ALL:=C
LANG:=C
TOPDIR:=${CURDIR}
LC_ALL:=C
LANG:=C
-export TOPDIR LC_ALL LANG
+TZ:=UTC
+export TOPDIR LC_ALL LANG TZ
empty:=
space:= $(empty) $(empty)
empty:=
space:= $(empty) $(empty)
-$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the
OpenWrt
directory must not include any spaces))
+$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the
LEDE
directory must not include any spaces))
world:
world:
-include $(TOPDIR)/include/host.mk
+export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH)
ifneq ($(OPENWRT_BUILD),1)
_SINGLE=export MAKEFLAGS=$(space);
ifneq ($(OPENWRT_BUILD),1)
_SINGLE=export MAKEFLAGS=$(space);
@@
-38,11
+39,12
@@
else
include tools/Makefile
include toolchain/Makefile
include tools/Makefile
include toolchain/Makefile
-$(toolchain/stamp-
install): $(tools/stamp-install
)
-$(target/stamp-compile): $(toolchain/stamp-
install) $(tools/stamp-install
) $(BUILD_DIR)/.prepared
+$(toolchain/stamp-
compile): $(tools/stamp-compile
)
+$(target/stamp-compile): $(toolchain/stamp-
compile) $(tools/stamp-compile
) $(BUILD_DIR)/.prepared
$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
$(package/stamp-install): $(package/stamp-compile)
$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
$(package/stamp-install): $(package/stamp-compile)
$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
+check: $(tools/stamp-check) $(toolchain/stamp-check) $(package/stamp-check)
printdb:
@true
printdb:
@true
@@
-50,10
+52,10
@@
printdb:
prepare: $(target/stamp-compile)
clean: FORCE
prepare: $(target/stamp-compile)
clean: FORCE
- rm -rf $(BUILD_DIR) $(
BIN_DIR) $(BUILD_LOG_DIR)
+ rm -rf $(BUILD_DIR) $(
STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR) $(TOPDIR)/staging_dir/packages
dirclean: clean
dirclean: clean
- rm -rf $(STAGING_DIR
) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST)
$(BUILD_DIR_TOOLCHAIN)
+ rm -rf $(STAGING_DIR
_HOST) $(STAGING_DIR_HOSTPKG) $(TOOLCHAIN_DIR) $(BUILD_DIR_BASE)/host $(BUILD_DIR_BASE)/hostpkg
$(BUILD_DIR_TOOLCHAIN)
rm -rf $(TMP_DIR)
ifndef DUMP_TARGET_DB
rm -rf $(TMP_DIR)
ifndef DUMP_TARGET_DB
@@
-75,30
+77,26
@@
endif
# check prerequisites before starting to build
prereq: $(target/stamp-prereq) tmp/.prereq_packages
# check prerequisites before starting to build
prereq: $(target/stamp-prereq) tmp/.prereq_packages
- @if [ ! -f "$(INCLUDE_DIR)/site/$(
REAL_GNU_TARGET_NAME
)" ]; then \
- echo 'ERROR: Missing site config for
target "$(REAL_GNU_TARGET_NAME
)" !'; \
+ @if [ ! -f "$(INCLUDE_DIR)/site/$(
ARCH
)" ]; then \
+ echo 'ERROR: Missing site config for
architecture "$(ARCH
)" !'; \
echo ' The missing file will cause configure scripts to fail during compilation.'; \
echo ' The missing file will cause configure scripts to fail during compilation.'; \
- echo ' Please provide a "$(INCLUDE_DIR)/site/$(
REAL_GNU_TARGET_NAME
)" file and restart the build.'; \
+ echo ' Please provide a "$(INCLUDE_DIR)/site/$(
ARCH
)" file and restart the build.'; \
exit 1; \
fi
exit 1; \
fi
-prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
-world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE
- $(_SINGLE)$(SUBMAKE) -r package/index
+checksum: FORCE
+ $(call sha256sums,$(BIN_DIR))
-# update all feeds, re-create index files, install symlinks
-package/symlinks:
- $(SCRIPT_DIR)/feeds update -a
- $(SCRIPT_DIR)/feeds install -a
+diffconfig: FORCE
+ mkdir -p $(BIN_DIR)
+ $(SCRIPT_DIR)/diffconfig.sh > $(BIN_DIR)/config.seed
-# re-create index files, install symlinks
-package/symlinks-install:
- $(SCRIPT_DIR)/feeds update -i
- $(SCRIPT_DIR)/feeds install -a
+prepare: .config $(tools/stamp-compile) $(toolchain/stamp-compile)
+ $(_SINGLE)$(SUBMAKE) -r diffconfig
-# remove all symlinks, don't touch ./feeds
-package/symlinks-clean:
- $(
SCRIPT_DIR)/feeds uninstall -a
+world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE
+ $(_SINGLE)$(SUBMAKE) -r package/index
+ $(
_SINGLE)$(SUBMAKE) -r checksum
.PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean
.PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean