Separate packages.
PATCH 1/1 Separate packages.
Ok, next patch.
This is a patch that uses kconfig "tristate" to give the user the possibility to make separate packages (well, tarballs for now. could do .rpm or .ipk and do on if anyone felt like it was a good idea, but then without dependencies, which makes a mess.).
I've kept "M" as the trigger for the packages since I don't feel like messing with kconfig just for that. The whole "change" to kconfig was to put MODULES in packages/Config.in so tristate would work.
this keeps TARGET_DIR where it is and adds a TARGET_PACKAGE_DIR for the packages.
Thomas.
-------------- next part --------------
Config.in +3 -0
@@ -10,6 +10,9 @@ source "target/tar/Config.in" source "target/iso9660/Config.in" +comment "Separate packages" +source "target/packages/Config.in" + comment "bootloader for target device" source "target/x86/grub/Config.in"
packages/packages.mk +20 -0
@@ -0,0 +1,20 @@ +############################################################# +# +# packages to build, yup, packages. +# +############################################################# + +packages: + ( export PATH=$(TARGET_PATH) ; \ + target/packages/make_packages.sh $(TARGET_PACKAGES_DIR) \ + $(BR2_TARGET_PACKAGES_COMP) \ + ); + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_TARGET_PACKAGES)),y) +TARGETS+=packages +endif
packages/make_packages.sh +43 -0
43 lines not on this page · raw message
Property changes on: target/packages/make_packages.sh
___________________________________________________________________
Name: svn:executable
+ *
packages/Config.in +12 -0
@@ -0,0 +1,12 @@ +config BR2_TARGET_PACKAGES + bool "Build autonomous packages (if there are any)" + default y + help + Build autonomous packages/tarballs (if there are any) + +config BR2_TARGET_PACKAGES_COMP + string "packages type" + default "bz2" + help + Compression method for the tarball. bz2, lzma or gzip +
Config.in +3 -0
@@ -1,5 +1,8 @@ menu "Package Selection for the target" +config MODULES + bool + default y comment "The default minimal system" source "package/busybox/Config.in"
Makefile.in +1 -0
@@ -40,6 +40,7 @@ #PATCH_DIR=$(BASE_DIR)/sources/patches BUILD_DIR:=$(BASE_DIR)/$(TOPDIR_PREFIX)build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX) TARGET_DIR:=$(BUILD_DIR)/root +TARGET_PACKAGES_DIR:=$(BUILD_DIR)/packages TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX) GNU_TARGET_SUFFIX:=-$(strip $(subst ",, $(BR2_GNU_TARGET_SUFFIX)))
config/mconf.c +2 -1
@@ -165,7 +165,8 @@"Arrow keys navigate the menu. " "<Enter> selects submenus --->. " "Highlighted letters are hotkeys. " -"Pressing <Y> selectes a feature, while <N> will exclude a feature. " +"Pressing <Y> selectes a feature, while <N> will exclude a feature, " +"<M> will build a separate package. " "Press <Esc><Esc> to exit, <?> for Help, </> for Search. " "Legend: [*] feature is selected [ ] feature is excluded" , radiolist_instructions[] =
dropbear/dropbear.mk +29 -17
66 lines not on this page · raw message
dropbear/Config.in +3 -1
@@ -1,11 +1,13 @@ config BR2_PACKAGE_DROPBEAR - bool "dropbear" + tristate "dropbear" default n help A small SSH 2 server designed for small memory environments. http://matt.ucc.asn.au/dropbear/dropbear.html + Choosing <M> here will choose to build a separate package. + config BR2_PACKAGE_DROPBEAR_URANDOM bool " Use /dev/urandom (low entropy systems only)?" default n
Makefile +7 -3
@@ -75,7 +75,8 @@ TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS)) TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS)) -world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS) +world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ + $(TARGET_PACKAGES_DIR) $(TARGETS) .PHONY: all world clean dirclean distclean source $(TARGETS) \ $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
@@ -113,6 +114,9 @@ -find $(TARGET_DIR) -type d -name CVS | xargs rm -rf -find $(TARGET_DIR) -type d -name .svn | xargs rm -rf +$(TARGET_PACKAGES_DIR): + @mkdir -p $(TARGET_PACKAGES_DIR) + source: $(TARGETS_SOURCE) #############################################################
@@ -121,10 +125,10 @@ # ############################################################# clean: $(TARGETS_CLEAN) - rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) + rm -rf $(STAGING_DIR) $(TARGET_PACKAGES_DIR) $(TARGET_DIR) $(IMAGE) dirclean: $(TARGETS_DIRCLEAN) - rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) + rm -rf $(STAGING_DIR) $(TARGET_PACKAGES_DIR) $(TARGET_DIR) $(IMAGE) distclean: ifeq ($(DL_DIR),$(BASE_DIR)/dl)