From 5c105d9f3fd086aff195d3849dcf847d6b0bd927 Mon Sep 17 00:00:00 2001 From: blogic Date: Fri, 5 Oct 2012 10:12:53 +0000 Subject: branch Attitude Adjustment git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33625 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/imagebuilder/Config.in | 11 ++ target/imagebuilder/Makefile | 59 ++++++++++ target/imagebuilder/files/Makefile | 176 ++++++++++++++++++++++++++++ target/imagebuilder/files/repositories.conf | 6 + 4 files changed, 252 insertions(+) create mode 100644 target/imagebuilder/Config.in create mode 100644 target/imagebuilder/Makefile create mode 100644 target/imagebuilder/files/Makefile create mode 100644 target/imagebuilder/files/repositories.conf (limited to 'target/imagebuilder') diff --git a/target/imagebuilder/Config.in b/target/imagebuilder/Config.in new file mode 100644 index 000000000..23a418bf5 --- /dev/null +++ b/target/imagebuilder/Config.in @@ -0,0 +1,11 @@ +config IB + bool "Build the OpenWrt Image Builder" + depends !TARGET_ROOTFS_INITRAMFS + depends !PROFILE_KCONFIG + depends !EXTERNAL_TOOLCHAIN + help + This is essentially a stripped-down version of the buildroot + with precompiled packages, kernel image and image building tools. + You can use it to generate custom images without compiling anything + + diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile new file mode 100644 index 000000000..a9480ef84 --- /dev/null +++ b/target/imagebuilder/Makefile @@ -0,0 +1,59 @@ +# +# Copyright (C) 2006-2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/host.mk +include $(INCLUDE_DIR)/version.mk + +override MAKEFLAGS= + +PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine))) +PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine))) + +IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))-for-$(PKG_OS)-$(PKG_CPU) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME) +IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR)) +IB_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR)) + +all: compile + +$(BIN_DIR)/$(IB_NAME).tar.bz2: clean + rm -rf $(PKG_BUILD_DIR) + mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/host \ + $(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts + -cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config + $(CP) \ + $(INCLUDE_DIR) $(SCRIPT_DIR) \ + $(TOPDIR)/rules.mk \ + ./files/Makefile \ + ./files/repositories.conf \ + $(TMP_DIR)/.targetinfo \ + $(TMP_DIR)/.packageinfo \ + $(PKG_BUILD_DIR)/ + $(VERSION_SED) $(PKG_BUILD_DIR)/repositories.conf + $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages + $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ + rm -rf \ + $(PKG_BUILD_DIR)/target/linux/*/files{,-*} \ + $(PKG_BUILD_DIR)/target/linux/*/patches{,-*} + -cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here + -cp $(LINUX_DIR)/.config $(IB_LDIR)/ + $(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(PKG_BUILD_DIR)/include/version.mk + find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \ + | $(XARGS) rm -rf + find $(STAGING_DIR_HOST)/bin -maxdepth 1 -type f -perm -u=x \ + | $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(PKG_BUILD_DIR)/staging_dir/host/bin + $(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@ + +download: +prepare: +compile: $(BIN_DIR)/$(IB_NAME).tar.bz2 +install: compile + +clean: FORCE + rm -rf $(PKG_BUILD_DIR) $(BIN_DIR)/$(IB_NAME).tar.bz2 diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile new file mode 100644 index 000000000..b0d0698ac --- /dev/null +++ b/target/imagebuilder/files/Makefile @@ -0,0 +1,176 @@ +# Makefile for OpenWrt +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +TOPDIR:=${CURDIR} +LC_ALL:=C +LANG:=C +export TOPDIR LC_ALL LANG +export OPENWRT_VERBOSE=s +all: help + +include $(TOPDIR)/include/host.mk + +ifneq ($(OPENWRT_BUILD),1) + override OPENWRT_BUILD=1 + export OPENWRT_BUILD +endif + +include rules.mk +include $(INCLUDE_DIR)/debug.mk +include $(INCLUDE_DIR)/depends.mk + +include $(INCLUDE_DIR)/version.mk +export REVISION + +define Helptext +Available Commands: + help: This help text + info: Show a list of available target profiles + clean: Remove images and temporary build files + image: Build an image (see below for more information). + +Building images: + By default 'make image' will create an image with the default + target profile and package set. You can use the following parameters + to change that: + + make image PROFILE="" # override the default target profile + make image PACKAGES=" [ [ ...]]" # include extra packages + make image FILES="" # include extra files from + make image BIN_DIR="" # alternative output directory for the images + +endef +$(eval $(call shexport,Helptext)) + +help: FORCE + echo "$$$(call shvar,Helptext)" + + +# override variables from rules.mk +PACKAGE_DIR:=$(TOPDIR)/packages +OPKG:= \ + IPKG_TMP="$(TOPDIR)/tmp/ipkgtmp" \ + IPKG_INSTROOT="$(TARGET_DIR)" \ + IPKG_CONF_DIR="$(TOPDIR)/tmp" \ + IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \ + $(STAGING_DIR_HOST)/bin/opkg \ + -f $(TOPDIR)/repositories.conf \ + --force-depends \ + --force-overwrite \ + --force-postinstall \ + --cache $(TOPDIR)/dl \ + --offline-root $(TARGET_DIR) \ + --add-dest root:/ \ + --add-arch all:100 \ + --add-arch $(ARCH_PACKAGES):200 + +define Profile + $(eval $(call Profile/Default)) + $(eval $(call Profile/$(1))) + ifeq ($(USER_PROFILE),) + USER_PROFILE:=$(1) + endif + $(1)_NAME:=$(NAME) + $(1)_PACKAGES:=$(PACKAGES) + PROFILE_LIST += \ + echo '$(1):'; [ -z '$(NAME)' ] || echo ' $(NAME)'; echo ' Packages: $(PACKAGES)'; +endef + +include $(INCLUDE_DIR)/target.mk + +_call_info: FORCE + echo 'Current Target: "$(BOARD)$(if $(SUBTARGET), ($(BOARDNAME)))"' + echo 'Default Packages: $(DEFAULT_PACKAGES)' + echo 'Available Profiles:' + echo; $(PROFILE_LIST) + +BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel) +# "-pkgname" in the package list means remove "pkgname" from the package list +BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES)) +PACKAGES:= + +_call_image: + echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))' + echo 'Packages: $(BUILD_PACKAGES)' + echo + rm -rf $(TARGET_DIR) + mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) + if [ ! -f "$(PACKAGE_DIR)/Packages" ] || [ ! -f "$(PACKAGE_DIR)/Packages.gz" ] || [ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/Packages.gz`" ]; then \ + echo "Package list missing or not up-to-date, generating it.";\ + $(MAKE) package_index; \ + else \ + mkdir -p $(TARGET_DIR)/tmp; \ + $(OPKG) update; \ + fi + $(MAKE) package_install +ifneq ($(USER_FILES),) + $(MAKE) copy_files +endif + $(MAKE) package_postinst + $(MAKE) build_image + +package_index: FORCE + @echo + @echo Building package index... + @mkdir -p $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR)/tmp + (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ + gzip -9c Packages > Packages.gz \ + ) >/dev/null 2>/dev/null + $(OPKG) update + +package_install: FORCE + @echo + @echo Installing packages... + $(OPKG) install $(PACKAGE_DIR)/libc_*.ipk + $(OPKG) install $(PACKAGE_DIR)/kernel_*.ipk + $(OPKG) install $(BUILD_PACKAGES) + rm -f $(TARGET_DIR)/usr/lib/opkg/lists/* + +copy_files: FORCE + @echo + @echo Copying extra files + $(CP) $(USER_FILES)/* $(TARGET_DIR)/ + +package_postinst: FORCE + @echo + @echo Cleaning up + @rm -f $(TARGET_DIR)/tmp/opkg.lock + @echo + @echo Activating init scripts + @( \ + cd $(TARGET_DIR); \ + for script in ./etc/init.d/*; do \ + grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ + IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \ + done || true; \ + ) + $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg) + +build_image: FORCE + @echo + @echo Building images... + $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 \ + $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)") + +clean: + rm -rf $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR) $(BIN_DIR) + + +info: + (unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info) + +image: + (unset PROFILE FILES PACKAGES MAKEFLAGS; \ + $(MAKE) _call_image \ + $(if $(PROFILE),USER_PROFILE="$(PROFILE)") \ + $(if $(FILES),USER_FILES="$(FILES)") \ + $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)") \ + $(if $(BIN_DIR),BIN_DIR="$(BIN_DIR)")) + +.SILENT: help info image + diff --git a/target/imagebuilder/files/repositories.conf b/target/imagebuilder/files/repositories.conf new file mode 100644 index 000000000..708855eb8 --- /dev/null +++ b/target/imagebuilder/files/repositories.conf @@ -0,0 +1,6 @@ +## Place your custom repositories here, they must match the architecture and version. +# src/gz %n %U +# src custom file:///usr/src/openwrt/bin/%T/packages + +## This is the local package repository, do not remove! +src imagebuilder file:packages -- cgit v1.2.3