From 996193de7b68c02ae7d719019ddd5c4a14bb2ef1 Mon Sep 17 00:00:00 2001 From: Bjoern Buerger Date: Tue, 10 Jan 2006 10:48:02 +0000 Subject: fixed deprecated HOSTTOOL_ and hosttool- labels & targets git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.9-trunk@3748 33e552b5-05e3-0310-8538-816dae2090ed --- rules/Rules.make | 2 +- rules/Virtual.make | 6 +-- rules/bootdisk.make | 4 +- rules/e2tools.make | 86 ++++++++++++++++---------------- rules/host-fakeroot.make | 82 +++++++++++++++--------------- rules/host-flex254.make | 66 ++++++++++++------------ rules/host-genext2fs.make | 74 +++++++++++++-------------- rules/host-ipkg-utils.make | 42 ++++++++-------- rules/host-ipkg.make | 82 +++++++++++++++--------------- rules/host-ksymoops.make | 36 +++++++------- rules/host-mknbi.make | 76 ++++++++++++++-------------- rules/host-module-init-tools.make | 74 +++++++++++++-------------- rules/host-modutils.make | 102 +++++++++++++++++++------------------- rules/host-mtd.make | 96 +++++++++++++++++------------------ rules/host-umkimage.make | 72 +++++++++++++-------------- rules/host-util-linux.make | 48 +++++++++--------- rules/host-zlib.make | 50 +++++++++---------- rules/kernel-native.make | 2 +- rules/kernel.make | 6 +-- 19 files changed, 503 insertions(+), 503 deletions(-) (limited to 'rules') diff --git a/rules/Rules.make b/rules/Rules.make index ad3cec428..a47d3a078 100644 --- a/rules/Rules.make +++ b/rules/Rules.make @@ -57,7 +57,7 @@ PARALLELMFLAGS = -j$(shell if [ -r /proc/cpuinfo ]; \ else echo 1; \ fi) -ifdef PTXCONF_HOSTTOOL_FAKEROOT +ifdef PTXCONF_HOST_FAKEROOT FAKEROOT = $(PTXCONF_HOST_PREFIX)/bin/fakeroot else FAKEROOT = fakeroot diff --git a/rules/Virtual.make b/rules/Virtual.make index 5fac11c01..af21a6d0e 100644 --- a/rules/Virtual.make +++ b/rules/Virtual.make @@ -19,8 +19,8 @@ virtual-xchain_install_deps = $(STATEDIR)/crosstool.install endif ifdef PTXCONF_IMAGE_IPKG -virtual-xchain_install_deps += $(STATEDIR)/hosttool-ipkg-utils.install -virtual-xchain_install_deps += $(STATEDIR)/hosttool-fakeroot.install +virtual-xchain_install_deps += $(STATEDIR)/host-ipkg-utils.install +virtual-xchain_install_deps += $(STATEDIR)/host-fakeroot.install endif ifdef PTXCONF_IMAGE_HOST_DEB @@ -28,7 +28,7 @@ virtual-xchain_install_deps += $(STATEDIR)/host-checkinstall.install endif ifdef PTXCONF_IMAGE_JFFS2 -virtual-xchain_install_deps += $(STATEDIR)/hosttool-mtd.install +virtual-xchain_install_deps += $(STATEDIR)/host-mtd.install endif virtual-xchain_install_deps += $(STATEDIR)/host-pkg-config-wrapper.install diff --git a/rules/bootdisk.make b/rules/bootdisk.make index ec9e344a9..24bbff085 100644 --- a/rules/bootdisk.make +++ b/rules/bootdisk.make @@ -68,8 +68,8 @@ bootdisk_targetinstall_deps = $(STATEDIR)/kernel.compile bootdisk_targetinstall_deps += $(STATEDIR)/grub.compile bootdisk_targetinstall_deps += $(STATEDIR)/e2fsprogs.compile bootdisk_targetinstall_deps += $(STATEDIR)/ncurses.compile -bootdisk_targetinstall_deps += $(STATEDIR)/hosttool-genext2fs.install -bootdisk_targetinstall_deps += $(STATEDIR)/hosttool-util-linux.install +bootdisk_targetinstall_deps += $(STATEDIR)/host-genext2fs.install +bootdisk_targetinstall_deps += $(STATEDIR)/host-util-linux.install $(STATEDIR)/bootdisk.targetinstall: $(bootdisk_targetinstall_deps) @$(call targetinfo, $@) diff --git a/rules/e2tools.make b/rules/e2tools.make index eb9488c06..f0a8b6a9e 100644 --- a/rules/e2tools.make +++ b/rules/e2tools.make @@ -14,17 +14,17 @@ # # We provide this package # -PACKAGES-$(PTXCONF_E2TOOLS) += hosttool-e2tools +PACKAGES-$(PTXCONF_E2TOOLS) += host-e2tools # # Paths and names # -HOSTTOOL_E2TOOLS_VERSION = 0.0.15 -HOSTTOOL_E2TOOLS = e2tools-$(HOSTTOOL_E2TOOLS_VERSION) -HOSTTOOL_E2TOOLS_SUFFIX = tar.gz -HOSTTOOL_E2TOOLS_URL = http://home.earthlink.net/~k_sheff/sw/e2tools/$(HOSTTOOL_E2TOOLS).$(HOSTTOOL_E2TOOLS_SUFFIX) -HOSTTOOL_E2TOOLS_SOURCE = $(SRCDIR)/$(HOSTTOOL_E2TOOLS).$(HOSTTOOL_E2TOOLS_SUFFIX) -HOSTTOOL_E2TOOLS_DIR = $(BUILDDIR)/$(E2TOOLS) +HOST_E2TOOLS_VERSION = 0.0.15 +HOST_E2TOOLS = e2tools-$(HOST_E2TOOLS_VERSION) +HOST_E2TOOLS_SUFFIX = tar.gz +HOST_E2TOOLS_URL = http://home.earthlink.net/~k_sheff/sw/e2tools/$(HOST_E2TOOLS).$(HOST_E2TOOLS_SUFFIX) +HOST_E2TOOLS_SOURCE = $(SRCDIR)/$(HOST_E2TOOLS).$(HOST_E2TOOLS_SUFFIX) +HOST_E2TOOLS_DIR = $(BUILDDIR)/$(E2TOOLS) include $(call package_depfile) @@ -32,98 +32,98 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-e2tools_get: $(STATEDIR)/hosttool-e2tools.get +host-e2tools_get: $(STATEDIR)/host-e2tools.get -hosttool-e2tools_get_deps = $(HOSTTOOL_E2TOOLS_SOURCE) +host-e2tools_get_deps = $(HOST_E2TOOLS_SOURCE) -$(STATEDIR)/hosttool-e2tools.get: $(hosttool-e2tools_get_deps) +$(STATEDIR)/host-e2tools.get: $(host-e2tools_get_deps) @$(call targetinfo, $@) @$(call touch, $@) -$(HOSTTOOL_E2TOOLS_SOURCE): +$(HOST_E2TOOLS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOSTTOOL_E2TOOLS_URL)) + @$(call get, $(HOST_E2TOOLS_URL)) # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -hosttool-e2tools_extract: $(STATEDIR)/hosttool-e2tools.extract +host-e2tools_extract: $(STATEDIR)/host-e2tools.extract -hosttool-e2tools_extract_deps = $(STATEDIR)/hosttool-e2tools.get +host-e2tools_extract_deps = $(STATEDIR)/host-e2tools.get -$(STATEDIR)/hosttool-e2tools.extract: $(hosttool-e2tools_extract_deps) +$(STATEDIR)/host-e2tools.extract: $(host-e2tools_extract_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_E2TOOLS_DIR)) - @$(call extract, $(HOSTTOOL_E2TOOLS_SOURCE)) + @$(call clean, $(HOST_E2TOOLS_DIR)) + @$(call extract, $(HOST_E2TOOLS_SOURCE)) @$(call touch, $@) # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -hosttool-e2tools_prepare: $(STATEDIR)/hosttool-e2tools.prepare +host-e2tools_prepare: $(STATEDIR)/host-e2tools.prepare # # dependencies # -hosttool-e2tools_prepare_deps = \ - $(STATEDIR)/hosttool-e2tools.extract \ - $(STATEDIR)/hosttool-e2fsprogs.install +host-e2tools_prepare_deps = \ + $(STATEDIR)/host-e2tools.extract \ + $(STATEDIR)/host-e2fsprogs.install -HOSTTOOL_E2TOOLS_PATH = PATH=$(CROSS_PATH) -HOSTTOOL_E2TOOLS_ENV = $(CROSS_ENV) -#HOSTTOOL_E2TOOLS_ENV += +HOST_E2TOOLS_PATH = PATH=$(CROSS_PATH) +HOST_E2TOOLS_ENV = $(CROSS_ENV) +#HOST_E2TOOLS_ENV += # # autoconf # -HOSTTOOL_E2TOOLS_AUTOCONF = \ +HOST_E2TOOLS_AUTOCONF = \ --build=$(GNU_HOST) --host=$(GNU_HOST) --target=$(GNU_HOST) -$(STATEDIR)/hosttool-e2tools.prepare: $(hosttool-e2tools_prepare_deps) +$(STATEDIR)/host-e2tools.prepare: $(host-e2tools_prepare_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_E2TOOLS_DIR)/config.cache) - cd $(HOSTTOOL_E2TOOLS_DIR) && \ - $(HOSTTOOL_E2TOOLS_PATH) $(HOSTTOOL_E2TOOLS_ENV) \ - ./configure $(HOSTTOOL_E2TOOLS_AUTOCONF) + @$(call clean, $(HOST_E2TOOLS_DIR)/config.cache) + cd $(HOST_E2TOOLS_DIR) && \ + $(HOST_E2TOOLS_PATH) $(HOST_E2TOOLS_ENV) \ + ./configure $(HOST_E2TOOLS_AUTOCONF) @$(call touch, $@) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -hosttool-e2tools_compile: $(STATEDIR)/hosttool-e2tools.compile +host-e2tools_compile: $(STATEDIR)/host-e2tools.compile -hosttool-e2tools_compile_deps = $(STATEDIR)/hosttool-e2tools.prepare +host-e2tools_compile_deps = $(STATEDIR)/host-e2tools.prepare -$(STATEDIR)/hosttool-e2tools.compile: $(hosttool-e2tools_compile_deps) +$(STATEDIR)/host-e2tools.compile: $(host-e2tools_compile_deps) @$(call targetinfo, $@) - $(HOSTTOOL_E2TOOLS_PATH) make -C $(HOSTTOOL_E2TOOLS_DIR) + $(HOST_E2TOOLS_PATH) make -C $(HOST_E2TOOLS_DIR) @$(call touch, $@) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -hosttool-e2tools_install: $(STATEDIR)/hosttool-e2tools.install +host-e2tools_install: $(STATEDIR)/host-e2tools.install -$(STATEDIR)/hosttool-e2tools.install: $(STATEDIR)/hosttool-e2tools.compile +$(STATEDIR)/host-e2tools.install: $(STATEDIR)/host-e2tools.compile @$(call targetinfo, $@) - @$(call install, HOSTTOOL_E2TOOLS) + @$(call install, HOST_E2TOOLS) @$(call touch, $@) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -hosttool-e2tools_targetinstall: $(STATEDIR)/hosttool-e2tools.targetinstall +host-e2tools_targetinstall: $(STATEDIR)/host-e2tools.targetinstall -hosttool-e2tools_targetinstall_deps = $(STATEDIR)/hosttool-e2tools.compile +host-e2tools_targetinstall_deps = $(STATEDIR)/host-e2tools.compile -$(STATEDIR)/hosttool-e2tools.targetinstall: $(hosttool-e2tools_targetinstall_deps) +$(STATEDIR)/host-e2tools.targetinstall: $(host-e2tools_targetinstall_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -131,8 +131,8 @@ $(STATEDIR)/hosttool-e2tools.targetinstall: $(hosttool-e2tools_targetinstall_dep # Clean # ---------------------------------------------------------------------------- -hosttool-e2tools_clean: - rm -rf $(STATEDIR)/hosttool-e2tools.* - rm -rf $(HOSTTOOL_E2TOOLS_DIR) +host-e2tools_clean: + rm -rf $(STATEDIR)/host-e2tools.* + rm -rf $(HOST_E2TOOLS_DIR) # vim: syntax=make diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make index 7a44d18e3..fc23633cb 100644 --- a/rules/host-fakeroot.make +++ b/rules/host-fakeroot.make @@ -12,17 +12,17 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_HOSTTOOL_FAKEROOT) += hosttool-fakeroot +HOST_PACKAGES-$(PTXCONF_HOST_FAKEROOT) += host-fakeroot # # Paths and names # -HOSTTOOL_FAKEROOT_VERSION = 1.5.1 -HOSTTOOL_FAKEROOT = fakeroot-$(HOSTTOOL_FAKEROOT_VERSION) -HOSTTOOL_FAKEROOT_SUFFIX = tar.gz -HOSTTOOL_FAKEROOT_URL = $(PTXCONF_SETUP_DEBMIRROR)/pool/main/f/fakeroot/fakeroot_$(HOSTTOOL_FAKEROOT_VERSION).$(HOSTTOOL_FAKEROOT_SUFFIX) -HOSTTOOL_FAKEROOT_SOURCE = $(SRCDIR)/fakeroot_$(HOSTTOOL_FAKEROOT_VERSION).$(HOSTTOOL_FAKEROOT_SUFFIX) -HOSTTOOL_FAKEROOT_DIR = $(HOST_BUILDDIR)/$(HOSTTOOL_FAKEROOT) +HOST_FAKEROOT_VERSION = 1.5.1 +HOST_FAKEROOT = fakeroot-$(HOST_FAKEROOT_VERSION) +HOST_FAKEROOT_SUFFIX = tar.gz +HOST_FAKEROOT_URL = $(PTXCONF_SETUP_DEBMIRROR)/pool/main/f/fakeroot/fakeroot_$(HOST_FAKEROOT_VERSION).$(HOST_FAKEROOT_SUFFIX) +HOST_FAKEROOT_SOURCE = $(SRCDIR)/fakeroot_$(HOST_FAKEROOT_VERSION).$(HOST_FAKEROOT_SUFFIX) +HOST_FAKEROOT_DIR = $(HOST_BUILDDIR)/$(HOST_FAKEROOT) include $(call package_depfile) @@ -30,93 +30,93 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-fakeroot_get: $(STATEDIR)/hosttool-fakeroot.get +host-fakeroot_get: $(STATEDIR)/host-fakeroot.get -hosttool-fakeroot_get_deps = $(HOSTTOOL_FAKEROOT_SOURCE) +host-fakeroot_get_deps = $(HOST_FAKEROOT_SOURCE) -$(STATEDIR)/hosttool-fakeroot.get: $(hosttool-fakeroot_get_deps) +$(STATEDIR)/host-fakeroot.get: $(host-fakeroot_get_deps) @$(call targetinfo, $@) @$(call touch, $@) -$(HOSTTOOL_FAKEROOT_SOURCE): +$(HOST_FAKEROOT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOSTTOOL_FAKEROOT_URL)) + @$(call get, $(HOST_FAKEROOT_URL)) # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -hosttool-fakeroot_extract: $(STATEDIR)/hosttool-fakeroot.extract +host-fakeroot_extract: $(STATEDIR)/host-fakeroot.extract -hosttool-fakeroot_extract_deps = $(STATEDIR)/hosttool-fakeroot.get +host-fakeroot_extract_deps = $(STATEDIR)/host-fakeroot.get -$(STATEDIR)/hosttool-fakeroot.extract: $(hosttool-fakeroot_extract_deps) +$(STATEDIR)/host-fakeroot.extract: $(host-fakeroot_extract_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_FAKEROOT_DIR)) - @$(call extract, $(HOSTTOOL_FAKEROOT_SOURCE), $(HOST_BUILDDIR)) + @$(call clean, $(HOST_FAKEROOT_DIR)) + @$(call extract, $(HOST_FAKEROOT_SOURCE), $(HOST_BUILDDIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -hosttool-fakeroot_prepare: $(STATEDIR)/hosttool-fakeroot.prepare +host-fakeroot_prepare: $(STATEDIR)/host-fakeroot.prepare # # dependencies # -hosttool-fakeroot_prepare_deps = \ - $(STATEDIR)/hosttool-fakeroot.extract +host-fakeroot_prepare_deps = \ + $(STATEDIR)/host-fakeroot.extract -HOSTTOOL_FAKEROOT_PATH = PATH=$(CROSS_PATH) -HOSTTOOL_FAKEROOT_ENV = $(HOSTCC_ENV) +HOST_FAKEROOT_PATH = PATH=$(CROSS_PATH) +HOST_FAKEROOT_ENV = $(HOSTCC_ENV) # # autoconf # -HOSTTOOL_FAKEROOT_AUTOCONF = $(HOST_AUTOCONF) +HOST_FAKEROOT_AUTOCONF = $(HOST_AUTOCONF) -$(STATEDIR)/hosttool-fakeroot.prepare: $(hosttool-fakeroot_prepare_deps) +$(STATEDIR)/host-fakeroot.prepare: $(host-fakeroot_prepare_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_FAKEROOT_DIR)/config.cache) - cd $(HOSTTOOL_FAKEROOT_DIR) && \ - $(HOSTTOOL_FAKEROOT_PATH) $(HOSTTOOL_FAKEROOT_ENV) \ - ./configure $(HOSTTOOL_FAKEROOT_AUTOCONF) + @$(call clean, $(HOST_FAKEROOT_DIR)/config.cache) + cd $(HOST_FAKEROOT_DIR) && \ + $(HOST_FAKEROOT_PATH) $(HOST_FAKEROOT_ENV) \ + ./configure $(HOST_FAKEROOT_AUTOCONF) @$(call touch, $@) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -hosttool-fakeroot_compile: $(STATEDIR)/hosttool-fakeroot.compile +host-fakeroot_compile: $(STATEDIR)/host-fakeroot.compile -hosttool-fakeroot_compile_deps = $(STATEDIR)/hosttool-fakeroot.prepare +host-fakeroot_compile_deps = $(STATEDIR)/host-fakeroot.prepare -$(STATEDIR)/hosttool-fakeroot.compile: $(hosttool-fakeroot_compile_deps) +$(STATEDIR)/host-fakeroot.compile: $(host-fakeroot_compile_deps) @$(call targetinfo, $@) - cd $(HOSTTOOL_FAKEROOT_DIR) && $(HOSTTOOL_FAKEROOT_PATH) make + cd $(HOST_FAKEROOT_DIR) && $(HOST_FAKEROOT_PATH) make @$(call touch, $@) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -hosttool-fakeroot_install: $(STATEDIR)/hosttool-fakeroot.install +host-fakeroot_install: $(STATEDIR)/host-fakeroot.install -$(STATEDIR)/hosttool-fakeroot.install: $(STATEDIR)/hosttool-fakeroot.compile +$(STATEDIR)/host-fakeroot.install: $(STATEDIR)/host-fakeroot.compile @$(call targetinfo, $@) - @$(call install, HOSTTOOL_FAKEROOT,,h) + @$(call install, HOST_FAKEROOT,,h) @$(call touch, $@) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -hosttool-fakeroot_targetinstall: $(STATEDIR)/hosttool-fakeroot.targetinstall +host-fakeroot_targetinstall: $(STATEDIR)/host-fakeroot.targetinstall -hosttool-fakeroot_targetinstall_deps = $(STATEDIR)/hosttool-fakeroot.compile +host-fakeroot_targetinstall_deps = $(STATEDIR)/host-fakeroot.compile -$(STATEDIR)/hosttool-fakeroot.targetinstall: $(hosttool-fakeroot_targetinstall_deps) +$(STATEDIR)/host-fakeroot.targetinstall: $(host-fakeroot_targetinstall_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -124,8 +124,8 @@ $(STATEDIR)/hosttool-fakeroot.targetinstall: $(hosttool-fakeroot_targetinstall_d # Clean # ---------------------------------------------------------------------------- -hosttool-fakeroot_clean: - rm -rf $(STATEDIR)/hosttool-fakeroot.* - rm -rf $(HOSTTOOL_FAKEROOT_DIR) +host-fakeroot_clean: + rm -rf $(STATEDIR)/host-fakeroot.* + rm -rf $(HOST_FAKEROOT_DIR) # vim: syntax=make diff --git a/rules/host-flex254.make b/rules/host-flex254.make index e7f09fa8d..9b3c9ef51 100644 --- a/rules/host-flex254.make +++ b/rules/host-flex254.make @@ -12,12 +12,12 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_HOSTTOOL_FLEX254) += hosttool-flex254 +HOST_PACKAGES-$(PTXCONF_HOST_FLEX254) += host-flex254 # # Paths and names # -HOSTTOOL_FLEX254_DIR = $(HOST_BUILDDIR)/$(FLEX) +HOST_FLEX254_DIR = $(HOST_BUILDDIR)/$(FLEX) include $(call package_depfile) @@ -25,11 +25,11 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-flex254_get: $(STATEDIR)/hosttool-flex254.get +host-flex254_get: $(STATEDIR)/host-flex254.get -hosttool-flex254_get_deps = $(STATEDIR)/flex.get +host-flex254_get_deps = $(STATEDIR)/flex.get -$(STATEDIR)/hosttool-flex254.get: $(hosttool-flex254_get_deps) +$(STATEDIR)/host-flex254.get: $(host-flex254_get_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -37,13 +37,13 @@ $(STATEDIR)/hosttool-flex254.get: $(hosttool-flex254_get_deps) # Extract # ---------------------------------------------------------------------------- -hosttool-flex254_extract: $(STATEDIR)/hosttool-flex254.extract +host-flex254_extract: $(STATEDIR)/host-flex254.extract -hosttool-flex254_extract_deps = $(STATEDIR)/hosttool-flex254.get +host-flex254_extract_deps = $(STATEDIR)/host-flex254.get -$(STATEDIR)/hosttool-flex254.extract: $(hosttool-flex254_extract_deps) +$(STATEDIR)/host-flex254.extract: $(host-flex254_extract_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_FLEX254_DIR)) + @$(call clean, $(HOST_FLEX254_DIR)) @$(call extract, $(FLEX_SOURCE), $(HOST_BUILDDIR)) @$(call touch, $@) @@ -51,63 +51,63 @@ $(STATEDIR)/hosttool-flex254.extract: $(hosttool-flex254_extract_deps) # Prepare # ---------------------------------------------------------------------------- -hosttool-flex254_prepare: $(STATEDIR)/hosttool-flex254.prepare +host-flex254_prepare: $(STATEDIR)/host-flex254.prepare # # dependencies # -hosttool-flex254_prepare_deps = \ - $(STATEDIR)/hosttool-flex254.extract +host-flex254_prepare_deps = \ + $(STATEDIR)/host-flex254.extract -HOSTTOOL_FLEX254_PATH = PATH=$(CROSS_PATH) -HOSTTOOL_FLEX254_ENV = $(HOSTCC_ENV) +HOST_FLEX254_PATH = PATH=$(CROSS_PATH) +HOST_FLEX254_ENV = $(HOSTCC_ENV) # # autoconf, but without automake :-( # -HOSTTOOL_FLEX254_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/usr +HOST_FLEX254_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/usr -$(STATEDIR)/hosttool-flex254.prepare: $(hosttool-flex254_prepare_deps) +$(STATEDIR)/host-flex254.prepare: $(host-flex254_prepare_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_FLEX254_DIR)/config.cache) - cd $(HOSTTOOL_FLEX254_DIR) && \ - $(HOSTTOOL_FLEX254_PATH) $(HOSTTOOL_FLEX254_ENV) \ - ./configure $(HOSTTOOL_FLEX254_AUTOCONF) + @$(call clean, $(HOST_FLEX254_DIR)/config.cache) + cd $(HOST_FLEX254_DIR) && \ + $(HOST_FLEX254_PATH) $(HOST_FLEX254_ENV) \ + ./configure $(HOST_FLEX254_AUTOCONF) @$(call touch, $@) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -hosttool-flex254_compile: $(STATEDIR)/hosttool-flex254.compile +host-flex254_compile: $(STATEDIR)/host-flex254.compile -hosttool-flex254_compile_deps = $(STATEDIR)/hosttool-flex254.prepare +host-flex254_compile_deps = $(STATEDIR)/host-flex254.prepare -$(STATEDIR)/hosttool-flex254.compile: $(hosttool-flex254_compile_deps) +$(STATEDIR)/host-flex254.compile: $(host-flex254_compile_deps) @$(call targetinfo, $@) - cd $(HOSTTOOL_FLEX254_DIR) && $(HOSTTOOL_FLEX254_PATH) make + cd $(HOST_FLEX254_DIR) && $(HOST_FLEX254_PATH) make @$(call touch, $@) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -hosttool-flex254_install: $(STATEDIR)/hosttool-flex254.install +host-flex254_install: $(STATEDIR)/host-flex254.install -$(STATEDIR)/hosttool-flex254.install: $(STATEDIR)/hosttool-flex254.compile +$(STATEDIR)/host-flex254.install: $(STATEDIR)/host-flex254.compile @$(call targetinfo, $@) - @$(call install, HOSTTOOL_FLEX254,,h) + @$(call install, HOST_FLEX254,,h) @$(call touch, $@) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -hosttool-flex254_targetinstall: $(STATEDIR)/hosttool-flex254.targetinstall +host-flex254_targetinstall: $(STATEDIR)/host-flex254.targetinstall -hosttool-flex254_targetinstall_deps = $(STATEDIR)/hosttool-flex254.compile +host-flex254_targetinstall_deps = $(STATEDIR)/host-flex254.compile -$(STATEDIR)/hosttool-flex254.targetinstall: $(hosttool-flex254_targetinstall_deps) +$(STATEDIR)/host-flex254.targetinstall: $(host-flex254_targetinstall_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -115,8 +115,8 @@ $(STATEDIR)/hosttool-flex254.targetinstall: $(hosttool-flex254_targetinstall_dep # Clean # ---------------------------------------------------------------------------- -hosttool-flex254_clean: - rm -rf $(STATEDIR)/hosttool-flex254.* - rm -rf $(HOSTTOOL_FLEX254_DIR) +host-flex254_clean: + rm -rf $(STATEDIR)/host-flex254.* + rm -rf $(HOST_FLEX254_DIR) # vim: syntax=make diff --git a/rules/host-genext2fs.make b/rules/host-genext2fs.make index 4ae66abfa..159773f4d 100644 --- a/rules/host-genext2fs.make +++ b/rules/host-genext2fs.make @@ -12,18 +12,18 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_HOSTTOOL_GENEXT2FS) += hosttool-genext2fs +HOST_PACKAGES-$(PTXCONF_HOST_GENEXT2FS) += host-genext2fs # # Paths and names # -HOSTTOOL_GENEXT2FS_VERSION = 1.3.orig -HOSTTOOL_GENEXT2FS = genext2fs-$(HOSTTOOL_GENEXT2FS_VERSION) -HOSTTOOL_GENEXT2FS_TARBALL = genext2fs_$(HOSTTOOL_GENEXT2FS_VERSION).$(HOSTTOOL_GENEXT2FS_SUFFIX) -HOSTTOOL_GENEXT2FS_SUFFIX = tar.gz -HOSTTOOL_GENEXT2FS_URL = $(PTXCONF_SETUP_DEBMIRROR)/pool/main/g/genext2fs/$(HOSTTOOL_GENEXT2FS_TARBALL) -HOSTTOOL_GENEXT2FS_SOURCE = $(SRCDIR)/$(HOSTTOOL_GENEXT2FS_TARBALL) -HOSTTOOL_GENEXT2FS_DIR = $(HOST_BUILDDIR)/$(HOSTTOOL_GENEXT2FS) +HOST_GENEXT2FS_VERSION = 1.3.orig +HOST_GENEXT2FS = genext2fs-$(HOST_GENEXT2FS_VERSION) +HOST_GENEXT2FS_TARBALL = genext2fs_$(HOST_GENEXT2FS_VERSION).$(HOST_GENEXT2FS_SUFFIX) +HOST_GENEXT2FS_SUFFIX = tar.gz +HOST_GENEXT2FS_URL = $(PTXCONF_SETUP_DEBMIRROR)/pool/main/g/genext2fs/$(HOST_GENEXT2FS_TARBALL) +HOST_GENEXT2FS_SOURCE = $(SRCDIR)/$(HOST_GENEXT2FS_TARBALL) +HOST_GENEXT2FS_DIR = $(HOST_BUILDDIR)/$(HOST_GENEXT2FS) include $(call package_depfile) @@ -31,44 +31,44 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-genext2fs_get: $(STATEDIR)/hosttool-genext2fs.get +host-genext2fs_get: $(STATEDIR)/host-genext2fs.get -hosttool-genext2fs_get_deps = $(HOSTTOOL_GENEXT2FS_SOURCE) +host-genext2fs_get_deps = $(HOST_GENEXT2FS_SOURCE) -$(STATEDIR)/hosttool-genext2fs.get: $(hosttool-genext2fs_get_deps) +$(STATEDIR)/host-genext2fs.get: $(host-genext2fs_get_deps) @$(call targetinfo, $@) - @$(call get_patches, $(HOSTTOOL_GENEXT2FS)) + @$(call get_patches, $(HOST_GENEXT2FS)) @$(call touch, $@) -$(HOSTTOOL_GENEXT2FS_SOURCE): +$(HOST_GENEXT2FS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOSTTOOL_GENEXT2FS_URL)) + @$(call get, $(HOST_GENEXT2FS_URL)) # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -hosttool-genext2fs_extract: $(STATEDIR)/hosttool-genext2fs.extract +host-genext2fs_extract: $(STATEDIR)/host-genext2fs.extract -$(STATEDIR)/hosttool-genext2fs.extract: $(STATEDIR)/hosttool-genext2fs.get +$(STATEDIR)/host-genext2fs.extract: $(STATEDIR)/host-genext2fs.get @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_GENEXT2FS_DIR)) - @$(call extract, $(HOSTTOOL_GENEXT2FS_SOURCE),$(HOST_BUILDDIR)) - @$(call patchin, $(HOSTTOOL_GENEXT2FS),$(HOSTTOOL_GENEXT2FS_DIR)) + @$(call clean, $(HOST_GENEXT2FS_DIR)) + @$(call extract, $(HOST_GENEXT2FS_SOURCE),$(HOST_BUILDDIR)) + @$(call patchin, $(HOST_GENEXT2FS),$(HOST_GENEXT2FS_DIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -hosttool-genext2fs_prepare: $(STATEDIR)/hosttool-genext2fs.prepare +host-genext2fs_prepare: $(STATEDIR)/host-genext2fs.prepare -HOSTTOOL_GENEXT2FS_ENV = $(HOSTCC_ENV) +HOST_GENEXT2FS_ENV = $(HOSTCC_ENV) -hosttool-genext2fs_prepare_deps = \ - $(STATEDIR)/hosttool-genext2fs.extract +host-genext2fs_prepare_deps = \ + $(STATEDIR)/host-genext2fs.extract -$(STATEDIR)/hosttool-genext2fs.prepare: $(hosttool-genext2fs_prepare_deps) +$(STATEDIR)/host-genext2fs.prepare: $(host-genext2fs_prepare_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -76,39 +76,39 @@ $(STATEDIR)/hosttool-genext2fs.prepare: $(hosttool-genext2fs_prepare_deps) # Compile # ---------------------------------------------------------------------------- -hosttool-genext2fs_compile: $(STATEDIR)/hosttool-genext2fs.compile +host-genext2fs_compile: $(STATEDIR)/host-genext2fs.compile -hosttool-genext2fs_compile_deps = $(STATEDIR)/hosttool-genext2fs.prepare +host-genext2fs_compile_deps = $(STATEDIR)/host-genext2fs.prepare -$(STATEDIR)/hosttool-genext2fs.compile: $(hosttool-genext2fs_compile_deps) +$(STATEDIR)/host-genext2fs.compile: $(host-genext2fs_compile_deps) @$(call targetinfo, $@) - cd $(HOSTTOOL_GENEXT2FS_DIR) && make $(HOSTTOOL_GENEXT2FS_ENV) + cd $(HOST_GENEXT2FS_DIR) && make $(HOST_GENEXT2FS_ENV) @$(call touch, $@) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -hosttool-genext2fs_install: $(STATEDIR)/hosttool-genext2fs.install +host-genext2fs_install: $(STATEDIR)/host-genext2fs.install -hosttool-genext2fs_install_deps = $(STATEDIR)/hosttool-genext2fs.compile +host-genext2fs_install_deps = $(STATEDIR)/host-genext2fs.compile -$(STATEDIR)/hosttool-genext2fs.install: $(hosttool-genext2fs_install_deps) +$(STATEDIR)/host-genext2fs.install: $(host-genext2fs_install_deps) @$(call targetinfo, $@) install -d $(PTXCONF_HOST_PREFIX)/usr/bin/ install -d $(PTXCONF_HOST_PREFIX)/usr/man/man8/ # FIXME: correct path? - install -m 755 $(HOSTTOOL_GENEXT2FS_DIR)/genext2fs $(PTXCONF_HOST_PREFIX)/usr/bin/ - install -m 644 $(HOSTTOOL_GENEXT2FS_DIR)/genext2fs.8 $(PTXCONF_HOST_PREFIX)/usr/man/man8/ + install -m 755 $(HOST_GENEXT2FS_DIR)/genext2fs $(PTXCONF_HOST_PREFIX)/usr/bin/ + install -m 644 $(HOST_GENEXT2FS_DIR)/genext2fs.8 $(PTXCONF_HOST_PREFIX)/usr/man/man8/ @$(call touch, $@) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -hosttool-genext2fs_targetinstall: $(STATEDIR)/hosttool-genext2fs.targetinstall +host-genext2fs_targetinstall: $(STATEDIR)/host-genext2fs.targetinstall -$(STATEDIR)/hosttool-genext2fs.targetinstall: $(STATEDIR)/hosttool-genext2fs.install +$(STATEDIR)/host-genext2fs.targetinstall: $(STATEDIR)/host-genext2fs.install @$(call targetinfo, $@) @$(call touch, $@) @@ -116,7 +116,7 @@ $(STATEDIR)/hosttool-genext2fs.targetinstall: $(STATEDIR)/hosttool-genext2fs.ins # Clean # ---------------------------------------------------------------------------- -hosttool-genext2fs_clean: - rm -rf $(STATEDIR)/hosttool-genext2fs.* $(HOSTTOOL_GENEXT2FS_DIR) +host-genext2fs_clean: + rm -rf $(STATEDIR)/host-genext2fs.* $(HOST_GENEXT2FS_DIR) # vim: syntax=make diff --git a/rules/host-ipkg-utils.make b/rules/host-ipkg-utils.make index 067c151a7..8a39b9951 100644 --- a/rules/host-ipkg-utils.make +++ b/rules/host-ipkg-utils.make @@ -12,7 +12,7 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_HOSTTOOL_IPKG_UTILS) += hosttool-ipkg-utils +HOST_PACKAGES-$(PTXCONF_HOST_IPKG_UTILS) += host-ipkg-utils # # Paths and names @@ -30,11 +30,11 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-ipkg-utils_get: $(STATEDIR)/hosttool-ipkg-utils.get +host-ipkg-utils_get: $(STATEDIR)/host-ipkg-utils.get -hosttool-ipkg-utils_get_deps = $(HOSTTOOL-IPKG-UTILS_SOURCE) +host-ipkg-utils_get_deps = $(HOSTTOOL-IPKG-UTILS_SOURCE) -$(STATEDIR)/hosttool-ipkg-utils.get: $(hosttool-ipkg-utils_get_deps) +$(STATEDIR)/host-ipkg-utils.get: $(host-ipkg-utils_get_deps) @$(call targetinfo, $@) @$(call get_patches, $(HOSTTOOL-IPKG-UTILS)) @$(call touch, $@) @@ -47,11 +47,11 @@ $(HOSTTOOL-IPKG-UTILS_SOURCE): # Extract # ---------------------------------------------------------------------------- -hosttool-ipkg-utils_extract: $(STATEDIR)/hosttool-ipkg-utils.extract +host-ipkg-utils_extract: $(STATEDIR)/host-ipkg-utils.extract -hosttool-ipkg-utils_extract_deps = $(STATEDIR)/hosttool-ipkg-utils.get +host-ipkg-utils_extract_deps = $(STATEDIR)/host-ipkg-utils.get -$(STATEDIR)/hosttool-ipkg-utils.extract: $(hosttool-ipkg-utils_extract_deps) +$(STATEDIR)/host-ipkg-utils.extract: $(host-ipkg-utils_extract_deps) @$(call targetinfo, $@) @$(call clean, $(HOSTTOOL-IPKG-UTILS_DIR)) @$(call extract, $(HOSTTOOL-IPKG-UTILS_SOURCE), $(HOST_BUILDDIR)) @@ -66,18 +66,18 @@ $(STATEDIR)/hosttool-ipkg-utils.extract: $(hosttool-ipkg-utils_extract_deps) # Prepare # ---------------------------------------------------------------------------- -hosttool-ipkg-utils_prepare: $(STATEDIR)/hosttool-ipkg-utils.prepare +host-ipkg-utils_prepare: $(STATEDIR)/host-ipkg-utils.prepare # # dependencies # -hosttool-ipkg-utils_prepare_deps = \ - $(STATEDIR)/hosttool-ipkg-utils.extract +host-ipkg-utils_prepare_deps = \ + $(STATEDIR)/host-ipkg-utils.extract HOSTTOOL-IPKG-UTILS_PATH = PATH=$(CROSS_PATH) HOSTTOOL-IPKG-UTILS_ENV = $(CROSS_ENV) -$(STATEDIR)/hosttool-ipkg-utils.prepare: $(hosttool-ipkg-utils_prepare_deps) +$(STATEDIR)/host-ipkg-utils.prepare: $(host-ipkg-utils_prepare_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -85,11 +85,11 @@ $(STATEDIR)/hosttool-ipkg-utils.prepare: $(hosttool-ipkg-utils_prepare_deps) # Compile # ---------------------------------------------------------------------------- -hosttool-ipkg-utils_compile: $(STATEDIR)/hosttool-ipkg-utils.compile +host-ipkg-utils_compile: $(STATEDIR)/host-ipkg-utils.compile -hosttool-ipkg-utils_compile_deps = $(STATEDIR)/hosttool-ipkg-utils.prepare +host-ipkg-utils_compile_deps = $(STATEDIR)/host-ipkg-utils.prepare -$(STATEDIR)/hosttool-ipkg-utils.compile: $(hosttool-ipkg-utils_compile_deps) +$(STATEDIR)/host-ipkg-utils.compile: $(host-ipkg-utils_compile_deps) @$(call targetinfo, $@) cd $(HOSTTOOL-IPKG-UTILS_DIR) && $(HOSTTOOL-IPKG-UTILS_ENV) $(HOSTTOOL-IPKG-UTILS_PATH) make @$(call touch, $@) @@ -98,9 +98,9 @@ $(STATEDIR)/hosttool-ipkg-utils.compile: $(hosttool-ipkg-utils_compile_deps) # Install # ---------------------------------------------------------------------------- -hosttool-ipkg-utils_install: $(STATEDIR)/hosttool-ipkg-utils.install +host-ipkg-utils_install: $(STATEDIR)/host-ipkg-utils.install -$(STATEDIR)/hosttool-ipkg-utils.install: $(STATEDIR)/hosttool-ipkg-utils.compile +$(STATEDIR)/host-ipkg-utils.install: $(STATEDIR)/host-ipkg-utils.compile @$(call targetinfo, $@) mkdir -p $(PTXCONF_HOST_PREFIX)/usr/bin # ipkg.py is forgotten by MAKE_INSTALL, so we copy it manually @@ -114,11 +114,11 @@ $(STATEDIR)/hosttool-ipkg-utils.install: $(STATEDIR)/hosttool-ipkg-utils.compile # Target-Install # ---------------------------------------------------------------------------- -hosttool-ipkg-utils_targetinstall: $(STATEDIR)/hosttool-ipkg-utils.targetinstall +host-ipkg-utils_targetinstall: $(STATEDIR)/host-ipkg-utils.targetinstall -hosttool-ipkg-utils_targetinstall_deps = $(STATEDIR)/hosttool-ipkg-utils.install +host-ipkg-utils_targetinstall_deps = $(STATEDIR)/host-ipkg-utils.install -$(STATEDIR)/hosttool-ipkg-utils.targetinstall: $(hosttool-ipkg-utils_targetinstall_deps) +$(STATEDIR)/host-ipkg-utils.targetinstall: $(host-ipkg-utils_targetinstall_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -126,8 +126,8 @@ $(STATEDIR)/hosttool-ipkg-utils.targetinstall: $(hosttool-ipkg-utils_targetinsta # Clean # ---------------------------------------------------------------------------- -hosttool-ipkg-utils_clean: - rm -rf $(STATEDIR)/hosttool-ipkg-utils.* +host-ipkg-utils_clean: + rm -rf $(STATEDIR)/host-ipkg-utils.* rm -rf $(HOSTTOOL-IPKG-UTILS_DIR) # vim: syntax=make diff --git a/rules/host-ipkg.make b/rules/host-ipkg.make index 5e3fb09fc..923415ff3 100644 --- a/rules/host-ipkg.make +++ b/rules/host-ipkg.make @@ -12,18 +12,18 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_HOSTTOOL_IPKG) += hosttool-ipkg +HOST_PACKAGES-$(PTXCONF_HOST_IPKG) += host-ipkg # # Paths and names # -HOSTTOOL_IPKG_VERSION = 0.99.154 -HOSTTOOL_IPKG = ipkg-$(HOSTTOOL_IPKG_VERSION) -HOSTTOOL_IPKG_SUFFIX = tar.gz -HOSTTOOL_IPKG_URL = http://www.handhelds.org/download/packages/ipkg/$(HOSTTOOL_IPKG).$(HOSTTOOL_IPKG_SUFFIX) -HOSTTOOL_IPKG_SOURCE = $(SRCDIR)/$(HOSTTOOL_IPKG).$(HOSTTOOL_IPKG_SUFFIX) -HOSTTOOL_IPKG_DIR = $(HOST_BUILDDIR)/$(HOSTTOOL_IPKG) +HOST_IPKG_VERSION = 0.99.154 +HOST_IPKG = ipkg-$(HOST_IPKG_VERSION) +HOST_IPKG_SUFFIX = tar.gz +HOST_IPKG_URL = http://www.handhelds.org/download/packages/ipkg/$(HOST_IPKG).$(HOST_IPKG_SUFFIX) +HOST_IPKG_SOURCE = $(SRCDIR)/$(HOST_IPKG).$(HOST_IPKG_SUFFIX) +HOST_IPKG_DIR = $(HOST_BUILDDIR)/$(HOST_IPKG) include $(call package_depfile) @@ -31,28 +31,28 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-ipkg_get: $(STATEDIR)/hosttool-ipkg.get +host-ipkg_get: $(STATEDIR)/host-ipkg.get -hosttool-ipkg_get_deps = $(HOSTTOOL_IPKG_SOURCE) +host-ipkg_get_deps = $(HOST_IPKG_SOURCE) -$(STATEDIR)/hosttool-ipkg.get: $(hosttool-ipkg_get_deps) +$(STATEDIR)/host-ipkg.get: $(host-ipkg_get_deps) @$(call targetinfo, $@) - @$(call get_patches, $(HOSTTOOL_IPKG)) + @$(call get_patches, $(HOST_IPKG)) @$(call touch, $@) # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -hosttool-ipkg_extract: $(STATEDIR)/hosttool-ipkg.extract +host-ipkg_extract: $(STATEDIR)/host-ipkg.extract -hosttool-ipkg_extract_deps = $(STATEDIR)/hosttool-ipkg.get +host-ipkg_extract_deps = $(STATEDIR)/host-ipkg.get -$(STATEDIR)/hosttool-ipkg.extract: $(hosttool-ipkg_extract_deps) +$(STATEDIR)/host-ipkg.extract: $(host-ipkg_extract_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_IPKG_DIR)) - @$(call extract, $(HOSTTOOL_IPKG_SOURCE), $(HOST_BUILDDIR)) - @$(call patchin, $(HOSTTOOL_IPKG), $(HOSTTOOL_IPKG_DIR)) + @$(call clean, $(HOST_IPKG_DIR)) + @$(call extract, $(HOST_IPKG_SOURCE), $(HOST_BUILDDIR)) + @$(call patchin, $(HOST_IPKG), $(HOST_IPKG_DIR)) @$(call touch, $@) @@ -60,63 +60,63 @@ $(STATEDIR)/hosttool-ipkg.extract: $(hosttool-ipkg_extract_deps) # Prepare # ---------------------------------------------------------------------------- -hosttool-ipkg_prepare: $(STATEDIR)/hosttool-ipkg.prepare +host-ipkg_prepare: $(STATEDIR)/host-ipkg.prepare # # dependencies # -hosttool-ipkg_prepare_deps = \ - $(STATEDIR)/hosttool-ipkg.extract +host-ipkg_prepare_deps = \ + $(STATEDIR)/host-ipkg.extract -HOSTTOOL_IPKG_PATH = PATH=$(CROSS_PATH) -HOSTTOOL_IPKG_ENV = $(HOSTCC_ENV) +HOST_IPKG_PATH = PATH=$(CROSS_PATH) +HOST_IPKG_ENV = $(HOSTCC_ENV) # # autoconf # -HOSTTOOL_IPKG_AUTOCONF = $(HOST_AUTOCONF) +HOST_IPKG_AUTOCONF = $(HOST_AUTOCONF) -$(STATEDIR)/hosttool-ipkg.prepare: $(hosttool-ipkg_prepare_deps) +$(STATEDIR)/host-ipkg.prepare: $(host-ipkg_prepare_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_IPKG_DIR)/config.cache) - cd $(HOSTTOOL_IPKG_DIR) && \ - $(HOSTTOOL_IPKG_PATH) $(HOSTTOOL_IPKG_ENV) \ - ./configure $(HOSTTOOL_IPKG_AUTOCONF) + @$(call clean, $(HOST_IPKG_DIR)/config.cache) + cd $(HOST_IPKG_DIR) && \ + $(HOST_IPKG_PATH) $(HOST_IPKG_ENV) \ + ./configure $(HOST_IPKG_AUTOCONF) @$(call touch, $@) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -hosttool-ipkg_compile: $(STATEDIR)/hosttool-ipkg.compile +host-ipkg_compile: $(STATEDIR)/host-ipkg.compile -hosttool-ipkg_compile_deps = $(STATEDIR)/hosttool-ipkg.prepare +host-ipkg_compile_deps = $(STATEDIR)/host-ipkg.prepare -$(STATEDIR)/hosttool-ipkg.compile: $(hosttool-ipkg_compile_deps) +$(STATEDIR)/host-ipkg.compile: $(host-ipkg_compile_deps) @$(call targetinfo, $@) - cd $(HOSTTOOL_IPKG_DIR) && $(HOSTTOOL_IPKG_ENV) $(HOSTTOOL_IPKG_PATH) make + cd $(HOST_IPKG_DIR) && $(HOST_IPKG_ENV) $(HOST_IPKG_PATH) make @$(call touch, $@) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -hosttool-ipkg_install: $(STATEDIR)/hosttool-ipkg.install +host-ipkg_install: $(STATEDIR)/host-ipkg.install -$(STATEDIR)/hosttool-ipkg.install: $(STATEDIR)/hosttool-ipkg.compile +$(STATEDIR)/host-ipkg.install: $(STATEDIR)/host-ipkg.compile @$(call targetinfo, $@) - @$(call install, HOSTTOOL_IPKG,,h) + @$(call install, HOST_IPKG,,h) @$(call touch, $@) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -hosttool-ipkg_targetinstall: $(STATEDIR)/hosttool-ipkg.targetinstall +host-ipkg_targetinstall: $(STATEDIR)/host-ipkg.targetinstall -hosttool-ipkg_targetinstall_deps = $(STATEDIR)/hosttool-ipkg.install +host-ipkg_targetinstall_deps = $(STATEDIR)/host-ipkg.install -$(STATEDIR)/hosttool-ipkg.targetinstall: $(hosttool-ipkg_targetinstall_deps) +$(STATEDIR)/host-ipkg.targetinstall: $(host-ipkg_targetinstall_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -124,8 +124,8 @@ $(STATEDIR)/hosttool-ipkg.targetinstall: $(hosttool-ipkg_targetinstall_deps) # Clean # ---------------------------------------------------------------------------- -hosttool-ipkg_clean: - rm -rf $(STATEDIR)/hosttool-ipkg.* - rm -rf $(HOSTTOOL_IPKG_DIR) +host-ipkg_clean: + rm -rf $(STATEDIR)/host-ipkg.* + rm -rf $(HOST_IPKG_DIR) # vim: syntax=make diff --git a/rules/host-ksymoops.make b/rules/host-ksymoops.make index b05ec278a..8828bb669 100644 --- a/rules/host-ksymoops.make +++ b/rules/host-ksymoops.make @@ -11,7 +11,7 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_KSYMOOPS) += hosttool-ksymoops +HOST_PACKAGES-$(PTXCONF_KSYMOOPS) += host-ksymoops # # Paths and names @@ -27,9 +27,9 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-ksymoops_get: $(STATEDIR)/hosttool-ksymoops.get +host-ksymoops_get: $(STATEDIR)/host-ksymoops.get -$(STATEDIR)/hosttool-ksymoops.get: $(KSYMOOPS_SOURCE) +$(STATEDIR)/host-ksymoops.get: $(KSYMOOPS_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -41,9 +41,9 @@ $(KSYMOOPS_SOURCE): # Extract # ---------------------------------------------------------------------------- -hosttool-ksymoops_extract: $(STATEDIR)/hosttool-ksymoops.extract +host-ksymoops_extract: $(STATEDIR)/host-ksymoops.extract -$(STATEDIR)/hosttool-ksymoops.extract: $(STATEDIR)/hosttool-ksymoops.get +$(STATEDIR)/host-ksymoops.extract: $(STATEDIR)/host-ksymoops.get @$(call targetinfo, $@) @$(call clean, $(KSYMOOPS_DIR)) @$(call extract, $(KSYMOOPS_SOURCE)) @@ -53,7 +53,7 @@ $(STATEDIR)/hosttool-ksymoops.extract: $(STATEDIR)/hosttool-ksymoops.get # Prepare # ---------------------------------------------------------------------------- -hosttool-ksymoops_prepare: $(STATEDIR)/hosttool-ksymoops.prepare +host-ksymoops_prepare: $(STATEDIR)/host-ksymoops.prepare KSYMOOPS_MAKEVARS = \ CROSS=$(PTXCONF_GNU_TARGET)- \ @@ -61,19 +61,19 @@ KSYMOOPS_MAKEVARS = \ BFD_PREFIX=$(PTXCONF_PREFIX)/$(GNU_HOST)/$(PTXCONF_GNU_TARGET) \ DEF_TARGET='\"elf32-$(call remove_quotes,$(PTXCONF_ARCH))\"' -$(STATEDIR)/hosttool-ksymoops.prepare: +$(STATEDIR)/host-ksymoops.prepare: @$(call touch, $@) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -hosttool-ksymoops_compile: $(STATEDIR)/hosttool-ksymoops.compile +host-ksymoops_compile: $(STATEDIR)/host-ksymoops.compile -hosttool-ksymoops_compile_deps = \ - $(STATEDIR)/hosttool-ksymoops.extract +host-ksymoops_compile_deps = \ + $(STATEDIR)/host-ksymoops.extract -$(STATEDIR)/hosttool-ksymoops.compile: $(hosttool-ksymoops_compile_deps) +$(STATEDIR)/host-ksymoops.compile: $(host-ksymoops_compile_deps) @$(call targetinfo, $@) make -C $(KSYMOOPS_DIR) $(KSYMOOPS_MAKEVARS) @$(call touch, $@) @@ -82,9 +82,9 @@ $(STATEDIR)/hosttool-ksymoops.compile: $(hosttool-ksymoops_compile_deps) # Install # ---------------------------------------------------------------------------- -hosttool-ksymoops_install: $(STATEDIR)/hosttool-ksymoops.install +host-ksymoops_install: $(STATEDIR)/host-ksymoops.install -$(STATEDIR)/hosttool-ksymoops.install: $(STATEDIR)/hosttool-ksymoops.compile +$(STATEDIR)/host-ksymoops.install: $(STATEDIR)/host-ksymoops.compile @$(call targetinfo, $@) make -C $(KSYMOOPS_DIR) $(KSYMOOPS_MAKEVARS) install # @@ -92,7 +92,7 @@ $(STATEDIR)/hosttool-ksymoops.install: $(STATEDIR)/hosttool-ksymoops.compile # e.g.: arm-linux-gcc -> arm-unknown-linux-gnu-gcc # cd $(PTXCONF_PREFIX)/bin && \ - for FILE in hosttool-ksymoops; do \ + for FILE in host-ksymoops; do \ ln -sf $(PTXCONF_GNU_TARGET)-$$FILE $(SHORT_TARGET)-linux-$$FILE; \ done @$(call touch, $@) @@ -101,9 +101,9 @@ $(STATEDIR)/hosttool-ksymoops.install: $(STATEDIR)/hosttool-ksymoops.compile # Target-Install # ---------------------------------------------------------------------------- -hosttool-ksymoops_targetinstall: $(STATEDIR)/hosttool-ksymoops.targetinstall +host-ksymoops_targetinstall: $(STATEDIR)/host-ksymoops.targetinstall -$(STATEDIR)/hosttool-ksymoops.targetinstall: $(STATEDIR)/hosttool-ksymoops.install +$(STATEDIR)/host-ksymoops.targetinstall: $(STATEDIR)/host-ksymoops.install @$(call targetinfo, $@) @$(call touch, $@) @@ -111,7 +111,7 @@ $(STATEDIR)/hosttool-ksymoops.targetinstall: $(STATEDIR)/hosttool-ksymoops.insta # Clean # ---------------------------------------------------------------------------- -hosttool-ksymoops_clean: - rm -rf $(STATEDIR)/hosttool-ksymoops.* $(KSYMOOPS_DIR) +host-ksymoops_clean: + rm -rf $(STATEDIR)/host-ksymoops.* $(KSYMOOPS_DIR) # vim: syntax=make diff --git a/rules/host-mknbi.make b/rules/host-mknbi.make index b383733c0..e5533d924 100644 --- a/rules/host-mknbi.make +++ b/rules/host-mknbi.make @@ -11,18 +11,18 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_HOSTTOOL_MKNBI) += hosttool-mknbi +HOST_PACKAGES-$(PTXCONF_HOST_MKNBI) += host-mknbi # # Paths and names # -HOSTTOOL_MKNBI_VERSION = 1.4.4 -HOSTTOOL_MKNBI = mknbi-$(HOSTTOOL_MKNBI_VERSION) -HOSTTOOL_MKNBI_SUFFIX = tar.gz -HOSTTOOL_MKNBI_URL = $(PTXCONF_SETUP_SFMIRROR)/etherboot/$(HOSTTOOL_MKNBI).$(HOSTTOOL_MKNBI_SUFFIX) -HOSTTOOL_MKNBI_SOURCE = $(SRCDIR)/$(HOSTTOOL_MKNBI).$(HOSTTOOL_MKNBI_SUFFIX) -HOSTTOOL_MKNBI_DIR = $(HOST_BUILDDIR)/$(HOSTTOOL_MKNBI) -HOSTTOOL_MKNBI_FLAGS = BUILD_ROOT=$(PTXCONF_PREFIX) +HOST_MKNBI_VERSION = 1.4.4 +HOST_MKNBI = mknbi-$(HOST_MKNBI_VERSION) +HOST_MKNBI_SUFFIX = tar.gz +HOST_MKNBI_URL = $(PTXCONF_SETUP_SFMIRROR)/etherboot/$(HOST_MKNBI).$(HOST_MKNBI_SUFFIX) +HOST_MKNBI_SOURCE = $(SRCDIR)/$(HOST_MKNBI).$(HOST_MKNBI_SUFFIX) +HOST_MKNBI_DIR = $(HOST_BUILDDIR)/$(HOST_MKNBI) +HOST_MKNBI_FLAGS = BUILD_ROOT=$(PTXCONF_PREFIX) include $(call package_depfile) @@ -30,49 +30,49 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-mknbi_get: $(STATEDIR)/hosttool-mknbi.get +host-mknbi_get: $(STATEDIR)/host-mknbi.get -hosttool-mknbi_get_deps = $(HOSTTOOL_MKNBI_SOURCE) +host-mknbi_get_deps = $(HOST_MKNBI_SOURCE) -$(STATEDIR)/hosttool-mknbi.get: $(hosttool-mknbi_get_deps) +$(STATEDIR)/host-mknbi.get: $(host-mknbi_get_deps) @$(call targetinfo, $@) - @$(call get_patches, $(HOSTTOOL_MKNBI)) + @$(call get_patches, $(HOST_MKNBI)) @$(call touch, $@) -$(HOSTTOOL_MKNBI_SOURCE): +$(HOST_MKNBI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOSTTOOL_MKNBI_URL)) + @$(call get, $(HOST_MKNBI_URL)) # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -hosttool-mknbi_extract: $(STATEDIR)/hosttool-mknbi.extract +host-mknbi_extract: $(STATEDIR)/host-mknbi.extract -hosttool-mknbi_extract_deps = $(STATEDIR)/hosttool-mknbi.get +host-mknbi_extract_deps = $(STATEDIR)/host-mknbi.get -$(STATEDIR)/hosttool-mknbi.extract: $(hosttool-mknbi_extract_deps) +$(STATEDIR)/host-mknbi.extract: $(host-mknbi_extract_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_MKNBI_DIR)) - @$(call extract, $(HOSTTOOL_MKNBI_SOURCE), $(HOST_BUILDDIR)) - @$(call patchin, $(HOSTTOOL_MKNBI), $(HOSTTOOL_MKNBI_DIR) ) + @$(call clean, $(HOST_MKNBI_DIR)) + @$(call extract, $(HOST_MKNBI_SOURCE), $(HOST_BUILDDIR)) + @$(call patchin, $(HOST_MKNBI), $(HOST_MKNBI_DIR) ) @$(call touch, $@) # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -hosttool-mknbi_prepare: $(STATEDIR)/hosttool-mknbi.prepare +host-mknbi_prepare: $(STATEDIR)/host-mknbi.prepare # # dependencies # -hosttool-mknbi_prepare_deps = $(STATEDIR)/hosttool-mknbi.extract +host-mknbi_prepare_deps = $(STATEDIR)/host-mknbi.extract -HOSTTOOL_MKNBI_MAKEVARS = CC=$(HOSTCC) -HOSTTOOL_MKNBI_ENV = CFLAGS=-I$(PTXCONF_PREFIX)/include PREFIX=$(PTXCONF_PREFIX)/usr/local +HOST_MKNBI_MAKEVARS = CC=$(HOSTCC) +HOST_MKNBI_ENV = CFLAGS=-I$(PTXCONF_PREFIX)/include PREFIX=$(PTXCONF_PREFIX)/usr/local -$(STATEDIR)/hosttool-mknbi.prepare: $(hosttool-mknbi_prepare_deps) +$(STATEDIR)/host-mknbi.prepare: $(host-mknbi_prepare_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -80,35 +80,35 @@ $(STATEDIR)/hosttool-mknbi.prepare: $(hosttool-mknbi_prepare_deps) # Compile # ---------------------------------------------------------------------------- -hosttool-mknbi_compile: $(STATEDIR)/hosttool-mknbi.compile +host-mknbi_compile: $(STATEDIR)/host-mknbi.compile -hosttool-mknbi_compile_deps = $(STATEDIR)/hosttool-mknbi.prepare +host-mknbi_compile_deps = $(STATEDIR)/host-mknbi.prepare -$(STATEDIR)/hosttool-mknbi.compile: $(hosttool-mknbi_compile_deps) +$(STATEDIR)/host-mknbi.compile: $(host-mknbi_compile_deps) @$(call targetinfo, $@) - cd $(HOSTTOOL_MKNBI_DIR) && $(HOSTTOOL_MKNBI_ENV) make $(HOSTTOOL_MKNBI_MAKEVARS) + cd $(HOST_MKNBI_DIR) && $(HOST_MKNBI_ENV) make $(HOST_MKNBI_MAKEVARS) @$(call touch, $@) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -hosttool-mknbi_install: $(STATEDIR)/hosttool-mknbi.install +host-mknbi_install: $(STATEDIR)/host-mknbi.install -$(STATEDIR)/hosttool-mknbi.install: $(STATEDIR)/hosttool-mknbi.compile +$(STATEDIR)/host-mknbi.install: $(STATEDIR)/host-mknbi.compile @$(call targetinfo, $@) - @$(call install, HOSTTOOL_MKNBI) + @$(call install, HOST_MKNBI) @$(call touch, $@) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -hosttool-mknbi_targetinstall: $(STATEDIR)/hosttool-mknbi.targetinstall +host-mknbi_targetinstall: $(STATEDIR)/host-mknbi.targetinstall -hosttool-mknbi_targetinstall_deps = $(STATEDIR)/hosttool-mknbi.install +host-mknbi_targetinstall_deps = $(STATEDIR)/host-mknbi.install -$(STATEDIR)/hosttool-mknbi.targetinstall: $(hosttool-mknbi_targetinstall_deps) +$(STATEDIR)/host-mknbi.targetinstall: $(host-mknbi_targetinstall_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -116,8 +116,8 @@ $(STATEDIR)/hosttool-mknbi.targetinstall: $(hosttool-mknbi_targetinstall_deps) # Clean # ---------------------------------------------------------------------------- -hosttool-mknbi_clean: - rm -rf $(STATEDIR)/hosttool-mknbi.* - rm -rf $(HOSTTOOL_MKNBI_DIR) +host-mknbi_clean: + rm -rf $(STATEDIR)/host-mknbi.* + rm -rf $(HOST_MKNBI_DIR) # vim: syntax=make diff --git a/rules/host-module-init-tools.make b/rules/host-module-init-tools.make index 9e010e5da..a4fffbd77 100644 --- a/rules/host-module-init-tools.make +++ b/rules/host-module-init-tools.make @@ -12,12 +12,12 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_HOSTTOOL_MODULE_INIT_TOOLS) += hosttool-module-init-tools +HOST_PACKAGES-$(PTXCONF_HOST_MODULE_INIT_TOOLS) += host-module-init-tools # # Paths and names # -HOSTTOOL_MODULE_INIT_TOOLS_DIR = $(HOST_BUILDDIR)/$(MODULE_INIT_TOOLS) +HOST_MODULE_INIT_TOOLS_DIR = $(HOST_BUILDDIR)/$(MODULE_INIT_TOOLS) include $(call package_depfile) @@ -25,11 +25,11 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-module-init-tools_get: $(STATEDIR)/hosttool-module-init-tools.get +host-module-init-tools_get: $(STATEDIR)/host-module-init-tools.get -hosttool-module-init-tools_get_deps = $(STATEDIR)/module-init-tools.get +host-module-init-tools_get_deps = $(STATEDIR)/module-init-tools.get -$(STATEDIR)/hosttool-module-init-tools.get: $(hosttool-module-init-tools_get_deps) +$(STATEDIR)/host-module-init-tools.get: $(host-module-init-tools_get_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -37,79 +37,79 @@ $(STATEDIR)/hosttool-module-init-tools.get: $(hosttool-module-init-tools_get_dep # Extract # ---------------------------------------------------------------------------- -hosttool-module-init-tools_extract: $(STATEDIR)/hosttool-module-init-tools.extract +host-module-init-tools_extract: $(STATEDIR)/host-module-init-tools.extract -hosttool-module-init-tools_extract_deps = $(STATEDIR)/hosttool-module-init-tools.get +host-module-init-tools_extract_deps = $(STATEDIR)/host-module-init-tools.get -$(STATEDIR)/hosttool-module-init-tools.extract: $(hosttool-module-init-tools_extract_deps) +$(STATEDIR)/host-module-init-tools.extract: $(host-module-init-tools_extract_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_MODULE_INIT_TOOLS_DIR)) + @$(call clean, $(HOST_MODULE_INIT_TOOLS_DIR)) @$(call extract, $(MODULE_INIT_TOOLS_SOURCE), $(HOST_BUILDDIR)) - @$(call patchin, $(MODULE_INIT_TOOLS), $(HOSTTOOL_MODULE_INIT_TOOLS_DIR)) + @$(call patchin, $(MODULE_INIT_TOOLS), $(HOST_MODULE_INIT_TOOLS_DIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -hosttool-module-init-tools_prepare: $(STATEDIR)/hosttool-module-init-tools.prepare +host-module-init-tools_prepare: $(STATEDIR)/host-module-init-tools.prepare # # dependencies # -hosttool-module-init-tools_prepare_deps = $(STATEDIR)/hosttool-module-init-tools.extract +host-module-init-tools_prepare_deps = $(STATEDIR)/host-module-init-tools.extract -HOSTTOOL_MODULE_INIT_TOOLS_PATH = PATH=$(CROSS_PATH) -HOSTTOOL_MODULE_INIT_TOOLS_ENV = $(HOSTCC_ENV) -HOSTTOOL_MODULE_INIT_TOOLS_MAKEVARS = MAN5='' -HOSTTOOL_MODULE_INIT_TOOLS_AUTOCONF = $(HOST_AUTOCONF) +HOST_MODULE_INIT_TOOLS_PATH = PATH=$(CROSS_PATH) +HOST_MODULE_INIT_TOOLS_ENV = $(HOSTCC_ENV) +HOST_MODULE_INIT_TOOLS_MAKEVARS = MAN5='' +HOST_MODULE_INIT_TOOLS_AUTOCONF = $(HOST_AUTOCONF) -$(STATEDIR)/hosttool-module-init-tools.prepare: $(hosttool-module-init-tools_prepare_deps) +$(STATEDIR)/host-module-init-tools.prepare: $(host-module-init-tools_prepare_deps) @$(call targetinfo, $@) - cd $(HOSTTOOL_MODULE_INIT_TOOLS_DIR) && \ - $(HOSTTOOL_MODULE_INIT_TOOLS_PATH) $(HOSTTOOL_MODULE_INIT_TOOLS_ENV) \ - ./configure $(HOSTTOOL_MODULE_INIT_TOOLS_AUTOCONF) + cd $(HOST_MODULE_INIT_TOOLS_DIR) && \ + $(HOST_MODULE_INIT_TOOLS_PATH) $(HOST_MODULE_INIT_TOOLS_ENV) \ + ./configure $(HOST_MODULE_INIT_TOOLS_AUTOCONF) @$(call touch, $@) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -hosttool-module-init-tools_compile: $(STATEDIR)/hosttool-module-init-tools.compile +host-module-init-tools_compile: $(STATEDIR)/host-module-init-tools.compile -hosttool-module-init-tools_compile_deps = $(STATEDIR)/hosttool-module-init-tools.prepare +host-module-init-tools_compile_deps = $(STATEDIR)/host-module-init-tools.prepare -$(STATEDIR)/hosttool-module-init-tools.compile: $(hosttool-module-init-tools_compile_deps) +$(STATEDIR)/host-module-init-tools.compile: $(host-module-init-tools_compile_deps) @$(call targetinfo, $@) - cd $(HOSTTOOL_MODULE_INIT_TOOLS_DIR) && \ - $(HOSTTOOL_MODULE_INIT_TOOLS_PATH) make \ - $(HOSTTOOL_MODULE_INIT_TOOLS_MAKEVARS) + cd $(HOST_MODULE_INIT_TOOLS_DIR) && \ + $(HOST_MODULE_INIT_TOOLS_PATH) make \ + $(HOST_MODULE_INIT_TOOLS_MAKEVARS) @$(call touch, $@) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -hosttool-module-init-tools_install: $(STATEDIR)/hosttool-module-init-tools.install +host-module-init-tools_install: $(STATEDIR)/host-module-init-tools.install -hosttool-module-init-tools_install_deps = $(STATEDIR)/hosttool-module-init-tools.compile +host-module-init-tools_install_deps = $(STATEDIR)/host-module-init-tools.compile ifdef PTXCONF_KERNEL_2_4 -hosttool-module-init-tools_install_deps += $(STATEDIR)/hosttool-modutils.install +host-module-init-tools_install_deps += $(STATEDIR)/host-modutils.install endif -$(STATEDIR)/hosttool-module-init-tools.install: $(hosttool-module-init-tools_install_deps) +$(STATEDIR)/host-module-init-tools.install: $(host-module-init-tools_install_deps) @$(call targetinfo, $@) - @$(call install, HOSTTOOL_MODULE_INIT_TOOLS,,h) + @$(call install, HOST_MODULE_INIT_TOOLS,,h) @$(call touch, $@) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -hosttool-module-init-tools_targetinstall: $(STATEDIR)/hosttool-module-init-tools.targetinstall +host-module-init-tools_targetinstall: $(STATEDIR)/host-module-init-tools.targetinstall -hosttool-module-init-tools_targetinstall_deps = $(STATEDIR)/hosttool-module-init-tools.install +host-module-init-tools_targetinstall_deps = $(STATEDIR)/host-module-init-tools.install -$(STATEDIR)/hosttool-module-init-tools.targetinstall: $(hosttool-module-init-tools_targetinstall_deps) +$(STATEDIR)/host-module-init-tools.targetinstall: $(host-module-init-tools_targetinstall_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -117,8 +117,8 @@ $(STATEDIR)/hosttool-module-init-tools.targetinstall: $(hosttool-module-init-too # Clean # ---------------------------------------------------------------------------- -hosttool-module-init-tools_clean: - rm -rf $(STATEDIR)/hosttool-module-init-tools.* - rm -rf $(HOSTTOOL_MODULE_INIT_TOOLS_DIR) +host-module-init-tools_clean: + rm -rf $(STATEDIR)/host-module-init-tools.* + rm -rf $(HOST_MODULE_INIT_TOOLS_DIR) # vim: syntax=make diff --git a/rules/host-modutils.make b/rules/host-modutils.make index deff575dd..f60efba14 100644 --- a/rules/host-modutils.make +++ b/rules/host-modutils.make @@ -12,17 +12,17 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_HOSTTOOL_MODUTILS) += hosttool-modutils +HOST_PACKAGES-$(PTXCONF_HOST_MODUTILS) += host-modutils # # Paths and names # -HOSTTOOL_MODUTILS_VERSION = 2.4.27 -HOSTTOOL_MODUTILS = modutils-$(HOSTTOOL_MODUTILS_VERSION) -HOSTTOOL_MODUTILS_SUFFIX = tar.bz2 -HOSTTOOL_MODUTILS_URL = http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/$(HOSTTOOL_MODUTILS).$(HOSTTOOL_MODUTILS_SUFFIX) -HOSTTOOL_MODUTILS_SOURCE = $(SRCDIR)/$(HOSTTOOL_MODUTILS).$(HOSTTOOL_MODUTILS_SUFFIX) -HOSTTOOL_MODUTILS_DIR = $(HOST_BUILDDIR)/$(HOSTTOOL_MODUTILS) +HOST_MODUTILS_VERSION = 2.4.27 +HOST_MODUTILS = modutils-$(HOST_MODUTILS_VERSION) +HOST_MODUTILS_SUFFIX = tar.bz2 +HOST_MODUTILS_URL = http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/$(HOST_MODUTILS).$(HOST_MODUTILS_SUFFIX) +HOST_MODUTILS_SOURCE = $(SRCDIR)/$(HOST_MODUTILS).$(HOST_MODUTILS_SUFFIX) +HOST_MODUTILS_DIR = $(HOST_BUILDDIR)/$(HOST_MODUTILS) include $(call package_depfile) @@ -30,104 +30,104 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-modutils_get: $(STATEDIR)/hosttool-modutils.get +host-modutils_get: $(STATEDIR)/host-modutils.get -hosttool-modutils_get_deps = $(HOSTTOOL_MODUTILS_SOURCE) +host-modutils_get_deps = $(HOST_MODUTILS_SOURCE) -$(STATEDIR)/hosttool-modutils.get: $(hosttool-modutils_get_deps) +$(STATEDIR)/host-modutils.get: $(host-modutils_get_deps) @$(call targetinfo, $@) - @$(call get_patches, $(HOSTTOOL_MODUTILS)) + @$(call get_patches, $(HOST_MODUTILS)) @$(call touch, $@) -$(HOSTTOOL_MODUTILS_SOURCE): +$(HOST_MODUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOSTTOOL_MODUTILS_URL)) + @$(call get, $(HOST_MODUTILS_URL)) # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -hosttool-modutils_extract: $(STATEDIR)/hosttool-modutils.extract +host-modutils_extract: $(STATEDIR)/host-modutils.extract -hosttool-modutils_extract_deps = $(STATEDIR)/hosttool-modutils.get +host-modutils_extract_deps = $(STATEDIR)/host-modutils.get -$(STATEDIR)/hosttool-modutils.extract: $(hosttool-modutils_extract_deps) +$(STATEDIR)/host-modutils.extract: $(host-modutils_extract_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_MODUTILS_DIR)) - @$(call extract, $(HOSTTOOL_MODUTILS_SOURCE), $(HOST_BUILDDIR)) - @$(call patchin, $(HOSTTOOL_MODUTILS), $(HOSTTOOL_MODUTILS_DIR)) + @$(call clean, $(HOST_MODUTILS_DIR)) + @$(call extract, $(HOST_MODUTILS_SOURCE), $(HOST_BUILDDIR)) + @$(call patchin, $(HOST_MODUTILS), $(HOST_MODUTILS_DIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -hosttool-modutils_prepare: $(STATEDIR)/hosttool-modutils.prepare +host-modutils_prepare: $(STATEDIR)/host-modutils.prepare # # dependencies # -hosttool-modutils_prepare_deps = \ - $(STATEDIR)/hosttool-flex254.install \ - $(STATEDIR)/hosttool-modutils.extract +host-modutils_prepare_deps = \ + $(STATEDIR)/host-flex254.install \ + $(STATEDIR)/host-modutils.extract -HOSTTOOL_MODUTILS_PATH = PATH=$(CROSS_PATH) -HOSTTOOL_MODUTILS_ENV = CC=$(HOSTCC) +HOST_MODUTILS_PATH = PATH=$(CROSS_PATH) +HOST_MODUTILS_ENV = CC=$(HOSTCC) # # autoconf # -HOSTTOOL_MODUTILS_AUTOCONF = $(HOST_AUTOCONF) +HOST_MODUTILS_AUTOCONF = $(HOST_AUTOCONF) -$(STATEDIR)/hosttool-modutils.prepare: $(hosttool-modutils_prepare_deps) +$(STATEDIR)/host-modutils.prepare: $(host-modutils_prepare_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_MODUTILS_DIR)/config.cache) - cd $(HOSTTOOL_MODUTILS_DIR) && \ - $(HOSTTOOL_MODUTILS_PATH) $(HOSTTOOL_MODUTILS_ENV) \ - ./configure $(HOSTTOOL_MODUTILS_AUTOCONF) + @$(call clean, $(HOST_MODUTILS_DIR)/config.cache) + cd $(HOST_MODUTILS_DIR) && \ + $(HOST_MODUTILS_PATH) $(HOST_MODUTILS_ENV) \ + ./configure $(HOST_MODUTILS_AUTOCONF) @$(call touch, $@) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -hosttool-modutils_compile: $(STATEDIR)/hosttool-modutils.compile +host-modutils_compile: $(STATEDIR)/host-modutils.compile -hosttool-modutils_compile_deps = $(STATEDIR)/hosttool-modutils.prepare +host-modutils_compile_deps = $(STATEDIR)/host-modutils.prepare -$(STATEDIR)/hosttool-modutils.compile: $(hosttool-modutils_compile_deps) +$(STATEDIR)/host-modutils.compile: $(host-modutils_compile_deps) @$(call targetinfo, $@) - cd $(HOSTTOOL_MODUTILS_DIR) && \ - $(HOSTTOOL_MODUTILS_PATH) make -C $(HOSTTOOL_MODUTILS_DIR) + cd $(HOST_MODUTILS_DIR) && \ + $(HOST_MODUTILS_PATH) make -C $(HOST_MODUTILS_DIR) @$(call touch, $@) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -hosttool-modutils_install: $(STATEDIR)/hosttool-modutils.install +host-modutils_install: $(STATEDIR)/host-modutils.install -$(STATEDIR)/hosttool-modutils.install: $(STATEDIR)/hosttool-modutils.compile +$(STATEDIR)/host-modutils.install: $(STATEDIR)/host-modutils.compile @$(call targetinfo, $@) # FIXME -# @$(call install, HOSTTOOL_MODUTILS,,h) +# @$(call install, HOST_MODUTILS,,h) mkdir -p $(PTXCONF_PREFIX)/bin - install -D -m755 $(HOSTTOOL_MODUTILS_DIR)/insmod/insmod \ + install -D -m755 $(HOST_MODUTILS_DIR)/insmod/insmod \ $(PTXCONF_PREFIX)/sbin/$(PTXCONF_GNU_TARGET)-insmod.old - install -D -m755 $(HOSTTOOL_MODUTILS_DIR)/insmod/modinfo \ + install -D -m755 $(HOST_MODUTILS_DIR)/insmod/modinfo \ $(PTXCONF_PREFIX)/sbin/$(PTXCONF_GNU_TARGET)-modinfo.old - install -D -m755 $(HOSTTOOL_MODUTILS_DIR)/insmod/insmod_ksymoops_clean \ + install -D -m755 $(HOST_MODUTILS_DIR)/insmod/insmod_ksymoops_clean \ $(PTXCONF_PREFIX)/sbin/$(PTXCONF_GNU_TARGET)-insmod_ksymoops_clean.old - install -D -m755 $(HOSTTOOL_MODUTILS_DIR)/insmod/kernelversion \ + install -D -m755 $(HOST_MODUTILS_DIR)/insmod/kernelversion \ $(PTXCONF_PREFIX)/sbin/$(PTXCONF_GNU_TARGET)-kernelversion.old for FILE in ksyms kallsyms; do \ ln -sf $(PTXCONF_GNU_TARGET)-insmod.old \ $(PTXCONF_PREFIX)/sbin/$(PTXCONF_GNU_TARGET)-$$FILE.old; \ done; - install -D -m755 $(HOSTTOOL_MODUTILS_DIR)/genksyms/genksyms \ + install -D -m755 $(HOST_MODUTILS_DIR)/genksyms/genksyms \ $(PTXCONF_PREFIX)/sbin/$(PTXCONF_GNU_TARGET)-genksyms.old - install -D -m755 $(HOSTTOOL_MODUTILS_DIR)/depmod/depmod \ + install -D -m755 $(HOST_MODUTILS_DIR)/depmod/depmod \ $(PTXCONF_PREFIX)/sbin/$(PTXCONF_GNU_TARGET)-depmod.old @$(call touch, $@) @@ -135,11 +135,11 @@ $(STATEDIR)/hosttool-modutils.install: $(STATEDIR)/hosttool-modutils.compile # Target-Install # ---------------------------------------------------------------------------- -hosttool-modutils_targetinstall: $(STATEDIR)/hosttool-modutils.targetinstall +host-modutils_targetinstall: $(STATEDIR)/host-modutils.targetinstall -hosttool-modutils_targetinstall_deps = $(STATEDIR)/hosttool-modutils.compile +host-modutils_targetinstall_deps = $(STATEDIR)/host-modutils.compile -$(STATEDIR)/hosttool-modutils.targetinstall: $(hosttool-modutils_targetinstall_deps) +$(STATEDIR)/host-modutils.targetinstall: $(host-modutils_targetinstall_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -147,8 +147,8 @@ $(STATEDIR)/hosttool-modutils.targetinstall: $(hosttool-modutils_targetinstall_d # Clean # ---------------------------------------------------------------------------- -hosttool-modutils_clean: - rm -rf $(STATEDIR)/hosttool-modutils.* - rm -rf $(HOSTTOOL_MODUTILS_DIR) +host-modutils_clean: + rm -rf $(STATEDIR)/host-modutils.* + rm -rf $(HOST_MODUTILS_DIR) # vim: syntax=make diff --git a/rules/host-mtd.make b/rules/host-mtd.make index 87df6e6de..e81b20266 100644 --- a/rules/host-mtd.make +++ b/rules/host-mtd.make @@ -12,14 +12,14 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_HOSTTOOL_MTD) += hosttool-mtd +HOST_PACKAGES-$(PTXCONF_HOST_MTD) += host-mtd # # Paths and names # -HOSTTOOL_MTD = $(MTD) -HOSTTOOL_MTD_SOURCE = $(MTD_SOURCE) -HOSTTOOL_MTD_DIR = $(HOST_BUILDDIR)/$(HOSTTOOL_MTD) +HOST_MTD = $(MTD) +HOST_MTD_SOURCE = $(MTD_SOURCE) +HOST_MTD_DIR = $(HOST_BUILDDIR)/$(HOST_MTD) include $(call package_depfile) @@ -27,49 +27,49 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-mtd_get: $(STATEDIR)/hosttool-mtd.get +host-mtd_get: $(STATEDIR)/host-mtd.get -hosttool-mtd_get_deps = $(STATEDIR)/mtd.get +host-mtd_get_deps = $(STATEDIR)/mtd.get -$(STATEDIR)/hosttool-mtd.get: $(hosttool-mtd_get_deps) +$(STATEDIR)/host-mtd.get: $(host-mtd_get_deps) @$(call targetinfo, $@) - @$(call get_patches, $(HOSTTOOL_MTD)) + @$(call get_patches, $(HOST_MTD)) @$(call touch, $@) # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -hosttool-mtd_extract: $(STATEDIR)/hosttool-mtd.extract +host-mtd_extract: $(STATEDIR)/host-mtd.extract -hosttool-mtd_extract_deps = $(STATEDIR)/hosttool-mtd.get +host-mtd_extract_deps = $(STATEDIR)/host-mtd.get -$(STATEDIR)/hosttool-mtd.extract: $(hosttool-mtd_extract_deps) +$(STATEDIR)/host-mtd.extract: $(host-mtd_extract_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_MTD_DIR)) - @$(call extract, $(HOSTTOOL_MTD_SOURCE), $(HOST_BUILDDIR)) - @$(call patchin, $(HOSTTOOL_MTD), $(HOSTTOOL_MTD_DIR)) + @$(call clean, $(HOST_MTD_DIR)) + @$(call extract, $(HOST_MTD_SOURCE), $(HOST_BUILDDIR)) + @$(call patchin, $(HOST_MTD), $(HOST_MTD_DIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -hosttool-mtd_prepare: $(STATEDIR)/hosttool-mtd.prepare +host-mtd_prepare: $(STATEDIR)/host-mtd.prepare # # dependencies # -hosttool-mtd_prepare_deps = \ - $(STATEDIR)/hosttool-zlib.install \ - $(STATEDIR)/hosttool-mtd.extract +host-mtd_prepare_deps = \ + $(STATEDIR)/host-zlib.install \ + $(STATEDIR)/host-mtd.extract -HOSTTOOL_MTD_MAKEVARS = \ +HOST_MTD_MAKEVARS = \ $(HOSTCC_ENV) \ - CFLAGS="-I$(PTXCONF_PREFIX)/include -I$(HOSTTOOL_MTD_DIR)/include" \ + CFLAGS="-I$(PTXCONF_PREFIX)/include -I$(HOST_MTD_DIR)/include" \ LDFLAGS=-L$(PTXCONF_PREFIX)/lib -$(STATEDIR)/hosttool-mtd.prepare: $(hosttool-mtd_prepare_deps) +$(STATEDIR)/host-mtd.prepare: $(host-mtd_prepare_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -77,23 +77,23 @@ $(STATEDIR)/hosttool-mtd.prepare: $(hosttool-mtd_prepare_deps) # Compile # ---------------------------------------------------------------------------- -hosttool-mtd_compile: $(STATEDIR)/hosttool-mtd.compile +host-mtd_compile: $(STATEDIR)/host-mtd.compile -hosttool-mtd_compile_deps = $(STATEDIR)/hosttool-mtd.prepare +host-mtd_compile_deps = $(STATEDIR)/host-mtd.prepare -$(STATEDIR)/hosttool-mtd.compile: $(hosttool-mtd_compile_deps) +$(STATEDIR)/host-mtd.compile: $(host-mtd_compile_deps) @$(call targetinfo, $@) -ifdef PTXCONF_HOSTTOOL_MTD_MKJFFS - cd $(HOSTTOOL_MTD_DIR)/util && make mkfs.jffs $(HOSTTOOL_MTD_MAKEVARS) +ifdef PTXCONF_HOST_MTD_MKJFFS + cd $(HOST_MTD_DIR)/util && make mkfs.jffs $(HOST_MTD_MAKEVARS) endif -ifdef PTXCONF_HOSTTOOL_MTD_MKJFFS2 - cd $(HOSTTOOL_MTD_DIR)/util && make mkfs.jffs2 $(HOSTTOOL_MTD_MAKEVARS) +ifdef PTXCONF_HOST_MTD_MKJFFS2 + cd $(HOST_MTD_DIR)/util && make mkfs.jffs2 $(HOST_MTD_MAKEVARS) endif -ifdef PTXCONF_HOSTTOOL_MTD_JFFS_DUMP - cd $(HOSTTOOL_MTD_DIR)/util && make jffs-dump $(HOSTTOOL_MTD_MAKEVARS) +ifdef PTXCONF_HOST_MTD_JFFS_DUMP + cd $(HOST_MTD_DIR)/util && make jffs-dump $(HOST_MTD_MAKEVARS) endif -ifdef PTXCONF_HOSTTOOL_MTD_JFFS2_DUMP - cd $(HOSTTOOL_MTD_DIR)/util && make jffs2dump $(HOSTTOOL_MTD_MAKEVARS) +ifdef PTXCONF_HOST_MTD_JFFS2_DUMP + cd $(HOST_MTD_DIR)/util && make jffs2dump $(HOST_MTD_MAKEVARS) endif @$(call touch, $@) @@ -101,23 +101,23 @@ endif # Install # ---------------------------------------------------------------------------- -hosttool-mtd_install: $(STATEDIR)/hosttool-mtd.install +host-mtd_install: $(STATEDIR)/host-mtd.install -$(STATEDIR)/hosttool-mtd.install: $(STATEDIR)/hosttool-mtd.compile +$(STATEDIR)/host-mtd.install: $(STATEDIR)/host-mtd.compile @$(call targetinfo, $@) mkdir -p $(PTXCONF_PREFIX)/bin -ifdef PTXCONF_HOSTTOOL_MTD_MKJFFS - install $(HOSTTOOL_MTD_DIR)/util/mkfs.jffs $(PTXCONF_PREFIX)/bin +ifdef PTXCONF_HOST_MTD_MKJFFS + install $(HOST_MTD_DIR)/util/mkfs.jffs $(PTXCONF_PREFIX)/bin endif -ifdef PTXCONF_HOSTTOOL_MTD_MKJFFS2 - install $(HOSTTOOL_MTD_DIR)/util/mkfs.jffs2 $(PTXCONF_PREFIX)/bin +ifdef PTXCONF_HOST_MTD_MKJFFS2 + install $(HOST_MTD_DIR)/util/mkfs.jffs2 $(PTXCONF_PREFIX)/bin endif -ifdef PTXCONF_HOSTTOOL_MTD_JFFS_DUMP - install $(HOSTTOOL_MTD_DIR)/util/jffs-dump $(PTXCONF_PREFIX)/bin +ifdef PTXCONF_HOST_MTD_JFFS_DUMP + install $(HOST_MTD_DIR)/util/jffs-dump $(PTXCONF_PREFIX)/bin endif -ifdef PTXCONF_HOSTTOOL_MTD_JFFS2_DUMP - install $(HOSTTOOL_MTD_DIR)/util/jffs2dump $(PTXCONF_PREFIX)/bin +ifdef PTXCONF_HOST_MTD_JFFS2_DUMP + install $(HOST_MTD_DIR)/util/jffs2dump $(PTXCONF_PREFIX)/bin endif @$(call touch, $@) @@ -125,11 +125,11 @@ endif # Target-Install # ---------------------------------------------------------------------------- -hosttool-mtd_targetinstall: $(STATEDIR)/hosttool-mtd.targetinstall +host-mtd_targetinstall: $(STATEDIR)/host-mtd.targetinstall -hosttool-mtd_targetinstall_deps = $(STATEDIR)/hosttool-mtd.install +host-mtd_targetinstall_deps = $(STATEDIR)/host-mtd.install -$(STATEDIR)/hosttool-mtd.targetinstall: $(hosttool-mtd_targetinstall_deps) +$(STATEDIR)/host-mtd.targetinstall: $(host-mtd_targetinstall_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -137,8 +137,8 @@ $(STATEDIR)/hosttool-mtd.targetinstall: $(hosttool-mtd_targetinstall_deps) # Clean # ---------------------------------------------------------------------------- -hosttool-mtd_clean: - rm -rf $(STATEDIR)/hosttool-mtd.* - rm -rf $(HOSTTOOL_MTD_DIR) +host-mtd_clean: + rm -rf $(STATEDIR)/host-mtd.* + rm -rf $(HOST_MTD_DIR) # vim: syntax=make diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make index 4409258d2..572411029 100644 --- a/rules/host-umkimage.make +++ b/rules/host-umkimage.make @@ -11,17 +11,17 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_HOSTTOOL_UMKIMAGE) += hosttool-umkimage +HOST_PACKAGES-$(PTXCONF_HOST_UMKIMAGE) += host-umkimage # # Paths and names # -HOSTTOOL_UMKIMAGE_VERSION = 1.1.2 -HOSTTOOL_UMKIMAGE = u-boot-mkimage-$(HOSTTOOL_UMKIMAGE_VERSION) -HOSTTOOL_UMKIMAGE_SUFFIX = tar.gz -HOSTTOOL_UMKIMAGE_URL = http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOSTTOOL_UMKIMAGE).$(HOSTTOOL_UMKIMAGE_SUFFIX) -HOSTTOOL_UMKIMAGE_SOURCE = $(SRCDIR)/$(HOSTTOOL_UMKIMAGE).$(HOSTTOOL_UMKIMAGE_SUFFIX) -HOSTTOOL_UMKIMAGE_DIR = $(HOST_BUILDDIR)/$(HOSTTOOL_UMKIMAGE) +HOST_UMKIMAGE_VERSION = 1.1.2 +HOST_UMKIMAGE = u-boot-mkimage-$(HOST_UMKIMAGE_VERSION) +HOST_UMKIMAGE_SUFFIX = tar.gz +HOST_UMKIMAGE_URL = http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOST_UMKIMAGE).$(HOST_UMKIMAGE_SUFFIX) +HOST_UMKIMAGE_SOURCE = $(SRCDIR)/$(HOST_UMKIMAGE).$(HOST_UMKIMAGE_SUFFIX) +HOST_UMKIMAGE_DIR = $(HOST_BUILDDIR)/$(HOST_UMKIMAGE) include $(call package_depfile) @@ -29,48 +29,48 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-umkimage_get: $(STATEDIR)/hosttool-umkimage.get +host-umkimage_get: $(STATEDIR)/host-umkimage.get -hosttool-umkimage_get_deps = $(HOSTTOOL_UMKIMAGE_SOURCE) +host-umkimage_get_deps = $(HOST_UMKIMAGE_SOURCE) -$(STATEDIR)/hosttool-umkimage.get: $(hosttool-umkimage_get_deps) +$(STATEDIR)/host-umkimage.get: $(host-umkimage_get_deps) @$(call targetinfo, $@) @$(call touch, $@) -$(HOSTTOOL_UMKIMAGE_SOURCE): +$(HOST_UMKIMAGE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOSTTOOL_UMKIMAGE_URL)) + @$(call get, $(HOST_UMKIMAGE_URL)) # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -hosttool-umkimage_extract: $(STATEDIR)/hosttool-umkimage.extract +host-umkimage_extract: $(STATEDIR)/host-umkimage.extract -hosttool-umkimage_extract_deps = $(STATEDIR)/hosttool-umkimage.get +host-umkimage_extract_deps = $(STATEDIR)/host-umkimage.get -$(STATEDIR)/hosttool-umkimage.extract: $(hosttool-umkimage_extract_deps) +$(STATEDIR)/host-umkimage.extract: $(host-umkimage_extract_deps) @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_UMKIMAGE_DIR)) - @$(call extract, $(HOSTTOOL_UMKIMAGE_SOURCE), $(HOST_BUILDDIR)) + @$(call clean, $(HOST_UMKIMAGE_DIR)) + @$(call extract, $(HOST_UMKIMAGE_SOURCE), $(HOST_BUILDDIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -hosttool-umkimage_prepare: $(STATEDIR)/hosttool-umkimage.prepare +host-umkimage_prepare: $(STATEDIR)/host-umkimage.prepare # # dependencies # -hosttool-umkimage_prepare_deps = $(STATEDIR)/hosttool-umkimage.extract -hosttool-umkimage_prepare_deps += $(STATEDIR)/hosttool-zlib.install +host-umkimage_prepare_deps = $(STATEDIR)/host-umkimage.extract +host-umkimage_prepare_deps += $(STATEDIR)/host-zlib.install -HOSTTOOL_UMKIMAGE_MAKEVARS = CC=$(HOSTCC) -HOSTTOOL_UMKIMAGE_ENV = CFLAGS=-I$(PTXCONF_PREFIX)/include +HOST_UMKIMAGE_MAKEVARS = CC=$(HOSTCC) +HOST_UMKIMAGE_ENV = CFLAGS=-I$(PTXCONF_PREFIX)/include -$(STATEDIR)/hosttool-umkimage.prepare: $(hosttool-umkimage_prepare_deps) +$(STATEDIR)/host-umkimage.prepare: $(host-umkimage_prepare_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -78,37 +78,37 @@ $(STATEDIR)/hosttool-umkimage.prepare: $(hosttool-umkimage_prepare_deps) # Compile # ---------------------------------------------------------------------------- -hosttool-umkimage_compile: $(STATEDIR)/hosttool-umkimage.compile +host-umkimage_compile: $(STATEDIR)/host-umkimage.compile -hosttool-umkimage_compile_deps = $(STATEDIR)/hosttool-umkimage.prepare +host-umkimage_compile_deps = $(STATEDIR)/host-umkimage.prepare -$(STATEDIR)/hosttool-umkimage.compile: $(hosttool-umkimage_compile_deps) +$(STATEDIR)/host-umkimage.compile: $(host-umkimage_compile_deps) @$(call targetinfo, $@) - $(HOSTTOOL_UMKIMAGE_ENV) make -C $(HOSTTOOL_UMKIMAGE_DIR) $(HOSTTOOL_UMKIMAGE_MAKEVARS) + $(HOST_UMKIMAGE_ENV) make -C $(HOST_UMKIMAGE_DIR) $(HOST_UMKIMAGE_MAKEVARS) @$(call touch, $@) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -hosttool-umkimage_install: $(STATEDIR)/hosttool-umkimage.install +host-umkimage_install: $(STATEDIR)/host-umkimage.install -$(STATEDIR)/hosttool-umkimage.install: $(STATEDIR)/hosttool-umkimage.compile +$(STATEDIR)/host-umkimage.install: $(STATEDIR)/host-umkimage.compile @$(call targetinfo, $@) # FIXME mkdir -p $(PTXCONF_PREFIX)/usr/bin - install $(HOSTTOOL_UMKIMAGE_DIR)/mkimage $(PTXCONF_PREFIX)/bin/u-boot-mkimage + install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_PREFIX)/bin/u-boot-mkimage @$(call touch, $@) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -hosttool-umkimage_targetinstall: $(STATEDIR)/hosttool-umkimage.targetinstall +host-umkimage_targetinstall: $(STATEDIR)/host-umkimage.targetinstall -hosttool-umkimage_targetinstall_deps = $(STATEDIR)/hosttool-umkimage.install +host-umkimage_targetinstall_deps = $(STATEDIR)/host-umkimage.install -$(STATEDIR)/hosttool-umkimage.targetinstall: $(hosttool-umkimage_targetinstall_deps) +$(STATEDIR)/host-umkimage.targetinstall: $(host-umkimage_targetinstall_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -116,8 +116,8 @@ $(STATEDIR)/hosttool-umkimage.targetinstall: $(hosttool-umkimage_targetinstall_d # Clean # ---------------------------------------------------------------------------- -hosttool-umkimage_clean: - rm -rf $(STATEDIR)/hosttool-umkimage.* - rm -rf $(HOSTTOOL_UMKIMAGE_DIR) +host-umkimage_clean: + rm -rf $(STATEDIR)/host-umkimage.* + rm -rf $(HOST_UMKIMAGE_DIR) # vim: syntax=make diff --git a/rules/host-util-linux.make b/rules/host-util-linux.make index c612d13fd..abfc0c6d7 100644 --- a/rules/host-util-linux.make +++ b/rules/host-util-linux.make @@ -13,9 +13,9 @@ # Paths and names # -HOSTPACKAGES-$(HOSTTOOL_UTIL-LINUX) += hosttool-util-linux +HOSTPACKAGES-$(HOST_UTIL-LINUX) += host-util-linux -HOSTTOOL_UTIL-LINUX_DIR = $(HOST_BUILDDIR)/$(UTIL-LINUX) +HOST_UTIL-LINUX_DIR = $(HOST_BUILDDIR)/$(UTIL-LINUX) include $(call package_depfile) @@ -23,31 +23,31 @@ include $(call package_depfile) # Hosttool Extract # ---------------------------------------------------------------------------- -hosttool-util-linux_extract: $(STATEDIR)/hosttool-util-linux.extract +host-util-linux_extract: $(STATEDIR)/host-util-linux.extract -hosttool-util-linux_extract_deps = $(STATEDIR)/util-linux.get +host-util-linux_extract_deps = $(STATEDIR)/util-linux.get -$(STATEDIR)/hosttool-util-linux.extract: $(hosttool-util-linux_extract_deps) +$(STATEDIR)/host-util-linux.extract: $(host-util-linux_extract_deps) @$(call targetinfo, $@) @$(call clean, $(UTIL-LINUX_DIR)) @$(call extract, $(UTIL-LINUX_SOURCE), $(HOST_BUILDDIR)) - @$(call patchin, $(UTIL-LINUX),$(HOSTTOOL_UTIL-LINUX_DIR)) + @$(call patchin, $(UTIL-LINUX),$(HOST_UTIL-LINUX_DIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- # Hosttool Prepare # ---------------------------------------------------------------------------- -hosttool-util-linux_prepare: $(STATEDIR)/hosttool-util-linux.prepare +host-util-linux_prepare: $(STATEDIR)/host-util-linux.prepare # # dependencies # -hosttool-util-linux_prepare_deps = $(STATEDIR)/hosttool-util-linux.extract +host-util-linux_prepare_deps = $(STATEDIR)/host-util-linux.extract -$(STATEDIR)/hosttool-util-linux.prepare: $(hosttool-util-linux_prepare_deps) +$(STATEDIR)/host-util-linux.prepare: $(host-util-linux_prepare_deps) @$(call targetinfo, $@) - cd $(HOSTTOOL_UTIL-LINUX_DIR) && \ + cd $(HOST_UTIL-LINUX_DIR) && \ $(HOSTCC_ENV) ./configure @$(call touch, $@) @@ -55,48 +55,48 @@ $(STATEDIR)/hosttool-util-linux.prepare: $(hosttool-util-linux_prepare_deps) # Hosttool Compile # ---------------------------------------------------------------------------- -hosttool-util-linux_compile: $(STATEDIR)/hosttool-util-linux.compile +host-util-linux_compile: $(STATEDIR)/host-util-linux.compile -hosttool-util-linux_compile_deps = $(STATEDIR)/hosttool-util-linux.prepare +host-util-linux_compile_deps = $(STATEDIR)/host-util-linux.prepare -$(STATEDIR)/hosttool-util-linux.compile: $(hosttool-util-linux_compile_deps) +$(STATEDIR)/host-util-linux.compile: $(host-util-linux_compile_deps) @$(call targetinfo, $@) ifdef PTXCONF_UTLNX_SFDISK - $(UTIL-LINUX_PATH) make -C $(HOSTTOOL_UTIL-LINUX_DIR)/fdisk sfdisk + $(UTIL-LINUX_PATH) make -C $(HOST_UTIL-LINUX_DIR)/fdisk sfdisk endif ifdef PTXCONF_UTLNX_FDISK - $(UTIL-LINUX_PATH) make -C $(HOSTTOOL_UTIL-LINUX_DIR)/fdisk fdisk + $(UTIL-LINUX_PATH) make -C $(HOST_UTIL-LINUX_DIR)/fdisk fdisk endif ifdef PTXCONF_UTLNX_CFFDISK - $(UTIL-LINUX_PATH) make -C $(HOSTTOOL_UTIL-LINUX_DIR)/fdisk cfdisk + $(UTIL-LINUX_PATH) make -C $(HOST_UTIL-LINUX_DIR)/fdisk cfdisk endif # ---------------------------------------------------------------------------- # Hosttool Install # ---------------------------------------------------------------------------- -hosttool-util-linux_install: $(STATEDIR)/hosttool-util-linux.install +host-util-linux_install: $(STATEDIR)/host-util-linux.install -$(STATEDIR)/hosttool-util-linux.install: $(STATEDIR)/hosttool-util-linux.compile +$(STATEDIR)/host-util-linux.install: $(STATEDIR)/host-util-linux.compile @$(call targetinfo, $@) # FIXME: packetize ifdef PTXCONF_UTLNX_SFDISK - install -D $(HOSTTOOL_UTIL-LINUX_DIR)/fdisk/sfdisk \ + install -D $(HOST_UTIL-LINUX_DIR)/fdisk/sfdisk \ $(PTXCONF_PREFIX)/sbin/sfdisk endif ifdef PTXCONF_UTLNX_FDISK - install -D $(HOSTTOOL_UTIL-LINUX_DIR)/fdisk/sfdisk \ + install -D $(HOST_UTIL-LINUX_DIR)/fdisk/sfdisk \ $(PTXCONF_PREFIX)/sbin/sfdisk endif ifdef PTXCONF_UTLNX_CFFDISK - install -D $(HOSTTOOL_UTIL-LINUX_DIR)/fdisk/sfdisk \ + install -D $(HOST_UTIL-LINUX_DIR)/fdisk/sfdisk \ $(PTXCONF_PREFIX)/sbin/sfdisk endif @@ -106,8 +106,8 @@ endif # Hosttool Clean # ---------------------------------------------------------------------------- -hosttool-util-linux_clean: - rm -rf $(STATEDIR)/hosttool-util-linux.* - rm -rf $(HOSTTOOL_UTIL-LINUX_DIR) +host-util-linux_clean: + rm -rf $(STATEDIR)/host-util-linux.* + rm -rf $(HOST_UTIL-LINUX_DIR) # vim: syntax=make diff --git a/rules/host-zlib.make b/rules/host-zlib.make index 787262235..d71bc6550 100644 --- a/rules/host-zlib.make +++ b/rules/host-zlib.make @@ -9,12 +9,12 @@ # -HOST_PACKAGES-$(HOSTTOOL_ZLIB) += hosttool-zlib +HOST_PACKAGES-$(HOST_ZLIB) += host-zlib # # Paths and names # -HOSTTOOL_ZLIB_BUILDDIR = $(HOST_BUILDDIR)/$(ZLIB) +HOST_ZLIB_BUILDDIR = $(HOST_BUILDDIR)/$(ZLIB) include $(call package_depfile) @@ -22,9 +22,9 @@ include $(call package_depfile) # Get # ---------------------------------------------------------------------------- -hosttool-zlib_get: $(STATEDIR)/hosttool-zlib.get +host-zlib_get: $(STATEDIR)/host-zlib.get -$(STATEDIR)/hosttool-zlib.get: $(STATEDIR)/zlib.get +$(STATEDIR)/host-zlib.get: $(STATEDIR)/zlib.get @$(call targetinfo, $@) @$(call touch, $@) @@ -32,11 +32,11 @@ $(STATEDIR)/hosttool-zlib.get: $(STATEDIR)/zlib.get # Extract # ---------------------------------------------------------------------------- -hosttool-zlib_extract: $(STATEDIR)/hosttool-zlib.extract +host-zlib_extract: $(STATEDIR)/host-zlib.extract -$(STATEDIR)/hosttool-zlib.extract: $(STATEDIR)/hosttool-zlib.get +$(STATEDIR)/host-zlib.extract: $(STATEDIR)/host-zlib.get @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_ZLIB_BUILDDIR)) + @$(call clean, $(HOST_ZLIB_BUILDDIR)) @$(call extract, $(ZLIB_SOURCE), $(HOST_BUILDDIR)) @$(call touch, $@) @@ -44,50 +44,50 @@ $(STATEDIR)/hosttool-zlib.extract: $(STATEDIR)/hosttool-zlib.get # Prepare # ---------------------------------------------------------------------------- -hosttool-zlib_prepare: $(STATEDIR)/hosttool-zlib.prepare +host-zlib_prepare: $(STATEDIR)/host-zlib.prepare # # autoconf without automake :-( # -HOSTTOOL_ZLIB_AUTOCONF = --prefix=$(PTXCONF_HOST_PREFIX)/usr -HOSTTOOL_ZLIB_AUTOCOHF += --shared -HOSTTOOL_ZLIB_MAKEVARS = $(HOSTCC_ENV) +HOST_ZLIB_AUTOCONF = --prefix=$(PTXCONF_HOST_PREFIX)/usr +HOST_ZLIB_AUTOCOHF += --shared +HOST_ZLIB_MAKEVARS = $(HOSTCC_ENV) -$(STATEDIR)/hosttool-zlib.prepare: $(STATEDIR)/hosttool-zlib.extract +$(STATEDIR)/host-zlib.prepare: $(STATEDIR)/host-zlib.extract @$(call targetinfo, $@) - cd $(HOSTTOOL_ZLIB_BUILDDIR) && \ - ./configure $(HOSTTOOL_ZLIB_AUTOCONF) + cd $(HOST_ZLIB_BUILDDIR) && \ + ./configure $(HOST_ZLIB_AUTOCONF) @$(call touch, $@) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -hosttool-zlib_compile: $(STATEDIR)/hosttool-zlib.compile +host-zlib_compile: $(STATEDIR)/host-zlib.compile -$(STATEDIR)/hosttool-zlib.compile: $(STATEDIR)/hosttool-zlib.prepare +$(STATEDIR)/host-zlib.compile: $(STATEDIR)/host-zlib.prepare @$(call targetinfo, $@) - cd $(HOSTTOOL_ZLIB_BUILDDIR) && make $(HOSTTOOL_ZLIB_MAKEVARS) + cd $(HOST_ZLIB_BUILDDIR) && make $(HOST_ZLIB_MAKEVARS) @$(call touch, $@) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -hosttool-zlib_install: $(STATEDIR)/hosttool-zlib.install +host-zlib_install: $(STATEDIR)/host-zlib.install -$(STATEDIR)/hosttool-zlib.install: $(STATEDIR)/hosttool-zlib.compile +$(STATEDIR)/host-zlib.install: $(STATEDIR)/host-zlib.compile @$(call targetinfo, $@) - @$(call install, HOSTTOOL_ZLIB, $(HOSTTOOL_ZLIB_BUILDDIR),h) + @$(call install, HOST_ZLIB, $(HOST_ZLIB_BUILDDIR),h) @$(call touch, $@) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -hosttool-zlib_targetinstall: $(STATEDIR)/hosttool-zlib.targetinstall +host-zlib_targetinstall: $(STATEDIR)/host-zlib.targetinstall -$(STATEDIR)/hosttool-zlib.targetinstall: $(STATEDIR)/hosttool-zlib.install +$(STATEDIR)/host-zlib.targetinstall: $(STATEDIR)/host-zlib.install @$(call targetinfo, $@) @$(call touch, $@) @@ -95,8 +95,8 @@ $(STATEDIR)/hosttool-zlib.targetinstall: $(STATEDIR)/hosttool-zlib.install # Clean # ---------------------------------------------------------------------------- -hosttool-zlib_clean: - rm -rf $(STATEDIR)/hosttool-zlib.* - rm -rf $(HOSTTOOL_ZLIB_BUILDDIR) +host-zlib_clean: + rm -rf $(STATEDIR)/host-zlib.* + rm -rf $(HOST_ZLIB_BUILDDIR) # vim: syntax=make diff --git a/rules/kernel-native.make b/rules/kernel-native.make index ac16291bb..43c23c28f 100644 --- a/rules/kernel-native.make +++ b/rules/kernel-native.make @@ -368,7 +368,7 @@ kernel_prepare: $(STATEDIR)/kernel.prepare kernel_prepare_deps = $(STATEDIR)/virtual-xchain.install kernel_prepare_deps += $(STATEDIR)/kernel.extract -kernel_prepare_deps += $(STATEDIR)/hosttool-module-init-tools.install +kernel_prepare_deps += $(STATEDIR)/host-module-init-tools.install KERNEL_HOST_PATH = PATH=$(CROSS_PATH) KERNEL_HOST_MAKEVARS = HOSTCC=$(HOSTCC) diff --git a/rules/kernel.make b/rules/kernel.make index 1634f2a34..ecb71328d 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -431,9 +431,9 @@ kernel_prepare_deps = $(STATEDIR)/virtual-xchain.install kernel_prepare_deps += $(STATEDIR)/kernel.extract ifdef PTXCONF_COMPILE_KERNEL ifdef PTXCONF_KERNEL_2_4 -kernel_prepare_deps += $(STATEDIR)/hosttool-modutils.install +kernel_prepare_deps += $(STATEDIR)/host-modutils.install else -kernel_prepare_deps += $(STATEDIR)/hosttool-module-init-tools.install +kernel_prepare_deps += $(STATEDIR)/host-module-init-tools.install endif ifdef PTXCONF_KLIBC kernel_prepare_deps += $(STATEDIR)/klibc.install @@ -532,7 +532,7 @@ kernel_compile: $(STATEDIR)/kernel.compile kernel_compile_deps = $(STATEDIR)/kernel.prepare ifdef PTXCONF_COMPILE_KERNEL ifdef PTXCONF_KERNEL_IMAGE_U -kernel_compile_deps += $(STATEDIR)/hosttool-umkimage.install +kernel_compile_deps += $(STATEDIR)/host-umkimage.install endif endif ifdef PTXCONF_KLIBC -- cgit v1.2.3