diff options
-rw-r--r-- | pkg/module.defs | 5 | ||||
-rw-r--r-- | pkg/module.rules | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/pkg/module.defs b/pkg/module.defs index 11dae99f7..2bc6081c4 100644 --- a/pkg/module.defs +++ b/pkg/module.defs @@ -3,8 +3,9 @@ $(eval $(call import.MODULE.defs,PKG,pkg)) PKG.in/ = $(SRC/)pkg/ PKG.out/ = $(BUILD/)pkg/ -PKG.basename = $(HB.name)-$(HB.version) -PKG.src.tar.bz2 = $(PKG.out/)$(PKG.basename).tar.bz2 +PKG.basename = $(HB.name)-$(HB.version) +PKG.src.tar.bz2 = $(PKG.out/)$(PKG.basename).tar.bz2 +PKG.src-contrib.tar.bz2 = $(PKG.out/)$(PKG.basename)-contrib.tar.bz2 STAGE.out/ = $(BUILD/)stage/ STAGE.out.src/ = $(STAGE.out/)src/ diff --git a/pkg/module.rules b/pkg/module.rules index f841fd93b..da46620f1 100644 --- a/pkg/module.rules +++ b/pkg/module.rules @@ -6,6 +6,8 @@ $(eval $(call import.MODULE.rules,PKG)) pkg.create:: $(PKG.src.tar.bz2) +pkg.createx:: pkg.create $(PKG.src-contrib.tar.bz2) + pkg.clean: $(RM.exe) -fr $(STAGE.out/) $(RM.exe) -fr $(PKG.out/) @@ -20,6 +22,10 @@ $(STAGE.out.src/): $@/$(PKG.basename)/make/configure.py > $@/$(PKG.basename)/make/configure.py.tmp $(MV.exe) $@/$(PKG.basename)/make/configure.py.tmp $@/$(PKG.basename)/make/configure.py +$(PKG.src-contrib.tar.bz2): + $(TAR.exe) cjf $@ -C $(CONTRIB.download/) \ + $(foreach f,$(MODULES.NAMES),$(notdir $($f.FETCH.tar))) + ############################################################################### ## include optional platform packaging |