update busybox + build as part of packages, update cvmfs

config.mk

@@ -3,7 +3,7 @@ UCERNVM_VERSION = 2.1
 UCERNVM_RELEASE = $(shell cat release)
 KERNEL_VANILLA_VERSION = 3.18.13
 KERNEL_CERNVM_RELEASE = 13
-BB_UPSTREAM_VERSION = 1.20.2
+BB_UPSTREAM_VERSION = 1.23.2
 BB_RELEASE = 1
 CURL_UPSTREAM_VERSION = 7.32.0
 CURL_RELEASE = 1
@@ -30,10 +30,10 @@ EXTRAS_VERSION = 0.8
 CERNVM_INCREASE_RELEASE = 0
 
 CERNVM_SYSTEM = HEAD
-#CERNVM_BRANCHES = devel
-#IMAGE_FORMATS = hdd iso
-CERNVM_BRANCHES = testing devel prod slc4 slc5 sl7
-IMAGE_FORMATS = iso hdd fat vdi vmdk tar.gz ova
+CERNVM_BRANCHES = devel
+IMAGE_FORMATS = hdd iso
+#CERNVM_BRANCHES = testing devel prod slc4 slc5 sl7
+#IMAGE_FORMATS = iso hdd fat vdi vmdk tar.gz ova
 
 SIGNING_SERVER = cvm-sign01.cern.ch
 SINGING_URL = https://$(SIGNING_SERVER)/cgi-bin/cernvm/sign-image

packages.d/busybox/Makefile

@@ -2,14 +2,32 @@ include $(TOP)/config.mk
 include config.mk
 
 BB_BINARY = busybox-$(BB_STRONG_VERSION)/sbin/busybox
+BB_BUILD_PRODUCT = $(BB_SOURCETREE)/busybox
+BB_STRIPPED = $(BB_BUILD_PRODUCT)-stripped
+BB_MAKEFILE = $(BB_SOURCETREE)/Makefile
+BB_CONFIG = $(BB_SOURCETREE)/.config
 
 all: $(BB_BINARY)
 
-$(BB_BINARY):
+clean:
+	rm -rf busybox-$(BB_UPSTREAM_VERSION)*
+
+$(BB_BINARY): $(BB_STRIPPED)
 	mkdir -p busybox-$(BB_STRONG_VERSION)/sbin
-	curl $(BB_SOURCE) > $(BB_BINARY) 2>/dev/null || rm -rf busybox-$(BB_STRONG_VERSION)
-	chmod +x $(BB_BINARY)
+	cp $(BB_STRIPPED) $(BB_BINARY)
 
-clean:
-	rm -rf busybox-*
+$(BB_STRIPPED): $(BB_BUILD_PRODUCT)
+	cp $(BB_BUILD_PRODUCT) $(BB_STRIPPED)
+	strip $(BB_STRIPPED)
+
+$(BB_BUILD_PRODUCT): $(BB_MAKEFILE) $(BB_CONFIG)
+	$(MAKE) -j4 -C $(BB_SOURCETREE)
+
+$(BB_MAKEFILE): $(BB_TARBALL)
+	tar -xvjf $(BB_TARBALL)
+
+$(BB_CONFIG): busybox-config $(BB_MAKEFILE)
+	cp busybox-config $(BB_CONFIG)
 
+$(BB_TARBALL):
+	curl $(BB_SOURCE) > $(BB_TARBALL) 2>/dev/null || rm -f $(BB_TARBALL)