X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2FMakefile;h=3250e7b7d0a8c9184893763a4902107acf246096;hp=7e4e97c3aad8de3e5887fa1daaeebd36b45a4b56;hb=9cdf852ae09e8b418d9ab5c462b95742dc2f0fc2;hpb=7d3d765935e0928a78c13571b1309f3eeed3b440 diff --git a/package/Makefile b/package/Makefile index 7e4e97c3aa..3250e7b7d0 100644 --- a/package/Makefile +++ b/package/Makefile @@ -1,80 +1,105 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ - -include $(TOPDIR)/rules.mk -include $(TOPDIR)/.config -include $(TMP_DIR)/.pkgdeps -include $(INCLUDE_DIR)/host.mk - -PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m)) -DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m)) -COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) -INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y)) - -$(STAMP_DIR) $(TARGET_DIR): - mkdir -p $@ - -%-prereq: $(STAMP_DIR) $(TARGET_DIR) - $(MAKE) -C $(patsubst %-prereq,%,$@) prereq - -%-download: $(STAMP_DIR) $(TARGET_DIR) - $(MAKE) -C $(patsubst %-download,%,$@) download - -%-prepare: $(STAMP_DIR) $(TARGET_DIR) - $(MAKE) -C $(patsubst %-prepare,%,$@) prepare -%-compile: $(STAMP_DIR) $(TARGET_DIR) - $(MAKE) -C $(patsubst %-compile,%,$@) compile +curdir:=package -%-install: $(STAMP_DIR) $(TARGET_DIR) - $(MAKE) -C $(patsubst %-install,%,$@) install +include $(INCLUDE_DIR)/rootfs.mk -%-clean: $(STAMP_DIR) $(TARGET_DIR) - $(MAKE) -C $(patsubst %-clean,%,$@) clean - -ifeq ($(SDK),1) -GENDEP_OPTS := -s +-include $(TMP_DIR)/.packagedeps +$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m)) +$(curdir)/builddirs-install:=. +$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) +$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m)) +ifdef CHECK_ALL +$(curdir)/builddirs-check:=$($(curdir)/builddirs) +$(curdir)/builddirs-download:=$($(curdir)/builddirs) +endif +ifneq ($(IGNORE_ERRORS),) + package-y-filter := $(package-y) + package-m-filter := $(filter-out $(package-y),$(package-m)) + package-n-filter := $(filter-out $(package-y) $(package-m),$(package-)) + package-ignore-errors := $(filter n m y,$(IGNORE_ERRORS)) + package-ignore-errors := $(if $(package-ignore-errors),$(package-ignore-errors),n m) + package-ignore-subdirs := $(sort $(foreach m,$(package-ignore-errors),$(package-$(m)-filter))) + $(curdir)/builddirs-ignore-download := $(package-ignore-subdirs) + $(curdir)/builddirs-ignore-compile := $(package-ignore-subdirs) + $(curdir)/builddirs-ignore-host-download := $(package-ignore-subdirs) + $(curdir)/builddirs-ignore-host-compile := $(package-ignore-subdirs) endif -$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo - @$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@ - -all: compile -clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) -prereq: $(PREREQ_PACKAGES) -download: $(DOWNLOAD_PACKAGES) -compile: $(COMPILE_PACKAGES) +PACKAGE_INSTALL_FILES:= \ + $(foreach pkg,$(sort $(package-y)), \ + $(foreach variant, \ + $(if $(strip $(package/$(pkg)/variants)), \ + $(package/$(pkg)/variants), \ + $(if $(package/$(pkg)/default-variant), \ + $(package/$(pkg)/default-variant), \ + default \ + ) \ + ), \ + $(PKG_INFO_DIR)/$(lastword $(subst /,$(space),$(pkg))).$(variant).install \ + ) \ + ) -install-targets: $(INSTALL_PACKAGES) -install: - rm -rf $(BUILD_DIR)/root - $(MAKE) install-targets - @if [ -d $(TOPDIR)/files ]; then \ - $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \ - fi - @( \ - cd $(BUILD_DIR)/root; \ - 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; \ +$(curdir)/cleanup: $(TMP_DIR)/.build + rm -rf $(STAGING_DIR_ROOT) + +$(curdir)/merge: + rm -rf $(PACKAGE_DIR_ALL) + mkdir -p $(PACKAGE_DIR_ALL) + -$(foreach pdir,$(PACKAGE_SUBDIRS),$(if $(wildcard $(pdir)/*.ipk),ln -s $(pdir)/*.ipk $(PACKAGE_DIR_ALL);)) + +$(curdir)/merge-index: $(curdir)/merge + (cd $(PACKAGE_DIR_ALL) && $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages; ) + +$(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index) + - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 + rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG) + [ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp + $(call opkg,$(TARGET_DIR)) install \ + $(call opkg_package_files,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null)) + @for file in $(PACKAGE_INSTALL_FILES); do \ + [ -s $$file.flags ] || continue; \ + for flag in `cat $$file.flags`; do \ + $(call opkg,$(TARGET_DIR)) flag $$flag `cat $$file`; \ done; \ - ) + done || true + @-$(MAKE) package/preconfig + + $(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG) + + $(call prepare_rootfs,$(TARGET_DIR)) + +$(curdir)/index: FORCE + @echo Generating package index... + @for d in $(PACKAGE_SUBDIRS); do ( \ + mkdir -p $$d; \ + cd $$d || continue; \ + $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages.manifest; \ + grep -vE '^(Maintainer|LicenseFiles|Source|Require)' Packages.manifest > Packages && \ + gzip -9nc Packages > Packages.gz; \ + ); done +ifdef CONFIG_SIGNED_PACKAGES + @echo Signing package index... + @for d in $(PACKAGE_SUBDIRS); do ( \ + [ -d $$d ] && \ + cd $$d || continue; \ + $(STAGING_DIR_HOST)/bin/usign -S -m Packages -s $(BUILD_KEY); \ + ); done +endif -index: $(PACKAGE_DIR)/Packages +$(curdir)/preconfig: -$(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk - (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) +$(curdir)/flags-install:= -j1 -symlinks: - ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) +$(eval $(call stampfile,$(curdir),package,prereq,.config)) +$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,check,$(TMP_DIR)/.build)) -ifeq ($(MAKECMDGOALS),compile-targets) -MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL) -else -.NOTPARALLEL: -endif +$(eval $(call subdir,$(curdir)))