diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-07-02 06:49:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-07-02 06:49:36 +0000 |
| commit | 4c725597425f2b0113f98b052515c059117b6695 (patch) | |
| tree | 04e7329f5a8a7fa9e679e6db847882f6ec144136 | |
| parent | c163347f4b237de68e0fc431ee35912ce416d96d (diff) | |
| download | upstream-4c725597425f2b0113f98b052515c059117b6695.tar.gz upstream-4c725597425f2b0113f98b052515c059117b6695.tar.bz2 upstream-4c725597425f2b0113f98b052515c059117b6695.zip | |
move mkelfimage from tools/ to package/ as it needs a proper i386 toolchain - make the package hidden so that it is automatically built without having to be selected
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27345 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mkelfimage/Makefile | 35 | ||||
| -rw-r--r-- | package/mkelfimage/patches/no-stack-protector.patch (renamed from tools/mkelfimage/patches/no-stack-protector.patch) | 0 | ||||
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/mkelfimage/Makefile | 23 |
4 files changed, 36 insertions, 24 deletions
diff --git a/package/mkelfimage/Makefile b/package/mkelfimage/Makefile new file mode 100644 index 0000000000..2433c72038 --- /dev/null +++ b/package/mkelfimage/Makefile @@ -0,0 +1,35 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=mkelfimage +PKG_VERSION:=2.7 + +PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz +PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/m/mkelfimage/ +PKG_MD5SUM:=e505cb87e9c0cdc44cf03d2c4ea8c74b + +include $(INCLUDE_DIR)/package.mk + +define Package/mkelfimage + SECTION:=base + CATEGORY:=Base system + TITLE:=mkelfimage + HIDDEN:=1 + DEPENDS:=@i386 + DEFAULT:=y if TARGET_x86 +endef + +CONFIGURE_VARS += AS="$(TARGET_CROSS)as" +MAKE_FLAGS += HOST_CC="$(HOSTCC)" DEFS="-I$(STAGING_DIR_HOST)/include" + +define Build/InstallDev + $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/objdir/sbin/mkelfImage $(STAGING_DIR_HOST)/bin +endef + +$(eval $(call BuildPackage,mkelfimage)) diff --git a/tools/mkelfimage/patches/no-stack-protector.patch b/package/mkelfimage/patches/no-stack-protector.patch index 108583aedd..108583aedd 100644 --- a/tools/mkelfimage/patches/no-stack-protector.patch +++ b/package/mkelfimage/patches/no-stack-protector.patch diff --git a/tools/Makefile b/tools/Makefile index a49e0cf97e..80c2d11628 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -19,7 +19,7 @@ tools-y += sstrip ipkg-utils genext2fs e2fsprogs mtd-utils mkimage tools-y += firmware-utils patch-cmdline quilt yaffs2 flock tools-y += mm-macros xorg-macros xfce-macros missing-macros xz cmake tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2 -tools-$(CONFIG_TARGET_x86) += qemu mkelfimage +tools-$(CONFIG_TARGET_x86) += qemu ifneq ($(CONFIG_TARGET_ar71xx),) tools-y += lzma-old squashfs endif diff --git a/tools/mkelfimage/Makefile b/tools/mkelfimage/Makefile deleted file mode 100644 index 75cff88d93..0000000000 --- a/tools/mkelfimage/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=mkelfimage -PKG_VERSION:=2.7 - -PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz -PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/m/mkelfimage/ -PKG_MD5SUM:=e505cb87e9c0cdc44cf03d2c4ea8c74b - -include $(INCLUDE_DIR)/host-build.mk - -define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin - $(INSTALL_BIN) $(HOST_BUILD_DIR)/objdir/sbin/mkelfImage $(STAGING_DIR_HOST)/bin -endef - -$(eval $(call HostBuild)) |