diff options
| -rw-r--r-- | rules/Kconfig | 4 | ||||
| -rw-r--r-- | rules/host-checkinstall.in | 7 | ||||
| -rw-r--r-- | rules/host-checkinstall.make | 109 | ||||
| -rw-r--r-- | rules/images.in | 13 | ||||
| -rw-r--r-- | rules/pre/Rules.make | 25 | ||||
| -rw-r--r-- | rules/pre/Virtual.make | 4 |
6 files changed, 0 insertions, 162 deletions
diff --git a/rules/Kconfig b/rules/Kconfig index 66d27673f..a126699eb 100644 --- a/rules/Kconfig +++ b/rules/Kconfig @@ -241,10 +241,6 @@ source "rules/gail.in" source "rules/gmp3.in" source "rules/gmp4.in" source "rules/gtk1210.in" -# these host in-files are probably not broken, -# please check why they are not included anywhere... -source "rules/host-checkinstall.in" -# --- source "rules/konq-e.in" source "rules/libart.in" source "rules/libgd.in" diff --git a/rules/host-checkinstall.in b/rules/host-checkinstall.in deleted file mode 100644 index 770cb6397..000000000 --- a/rules/host-checkinstall.in +++ /dev/null @@ -1,7 +0,0 @@ -config HOST_IMAGE_DEB - bool - depends on BROKEN - prompt "HOST_IMAGE_DEB [BROKEN]" - help - FIXME: This item needs to be documented - diff --git a/rules/host-checkinstall.make b/rules/host-checkinstall.make deleted file mode 100644 index 8426f763f..000000000 --- a/rules/host-checkinstall.make +++ /dev/null @@ -1,109 +0,0 @@ -# -*-makefile-*- -# $Id$ -# -# Copyright (C) 2005 by Robert Schwebel -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -HOST_PACKAGES-$(PTXCONF_HOST_IMAGE_DEB) += host-checkinstall - -# -# Paths and names -# -HOST_CHECKINSTALL = $(CHECKINSTALL) -HOST_CHECKINSTALL_DIR = $(HOST_BUILDDIR)/$(HOST_CHECKINSTALL) - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -host-checkinstall_get: $(STATEDIR)/host-checkinstall.get - -$(STATEDIR)/host-checkinstall.get: $(STATEDIR)/checkinstall.get - @$(call targetinfo, $@) - @$(call touch, $@) - -$(HOST_CHECKINSTALL_SOURCE): - @$(call targetinfo, $@) - @$(call get, HOST_CHECKINSTALL) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -host-checkinstall_extract: $(STATEDIR)/host-checkinstall.extract - -$(STATEDIR)/host-checkinstall.extract: $(host-checkinstall_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(HOST_CHECKINSTALL_DIR)) - @$(call extract, CHECKINSTALL, $(HOST_BUILDDIR)) - @$(call patchin, CHECKINSTALL, $(HOST_CHECKINSTALL_DIR)) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -host-checkinstall_prepare: $(STATEDIR)/host-checkinstall.prepare - -HOST_CHECKINSTALL_PATH = PATH=$(HOST_PATH) -HOST_CHECKINSTALL_ENV = $(HOSTCC_ENV) - -# -# autoconf -# -HOST_CHECKINSTALL_AUTOCONF = $(HOST_AUTOCONF) - -$(STATEDIR)/host-checkinstall.prepare: $(host-checkinstall_prepare_deps_default) - @$(call targetinfo, $@) -# @$(call clean, $(HOST_CHECKINSTALL_DIR)/config.cache) -# cd $(HOST_CHECKINSTALL_DIR) && \ -# $(HOST_CHECKINSTALL_PATH) $(HOST_CHECKINSTALL_ENV) \ -# ./configure $(HOST_CHECKINSTALL_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -host-checkinstall_compile: $(STATEDIR)/host-checkinstall.compile - -$(STATEDIR)/host-checkinstall.compile: $(host-checkinstall_compile_deps_default) - @$(call targetinfo, $@) - cd $(HOST_CHECKINSTALL_DIR)/installwatch-* && $(HOST_CHECKINSTALL_ENV) $(HOST_CHECKINSTALL_PATH) make - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -host-checkinstall_install: $(STATEDIR)/host-checkinstall.install - -$(STATEDIR)/host-checkinstall.install: $(host-checkinstall_install_deps_default) - @$(call targetinfo, $@) - # manual installation, make sure the directories exist - mkdir -p $(PTXCONF_PREFIX)/lib - mkdir -p $(PTXCONF_PREFIX)/bin - cd $(HOST_CHECKINSTALL_DIR)/installwatch-* && make install PREFIX=$(PTXCONF_PREFIX) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Targetinstall -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -host-checkinstall_clean: - rm -rf $(STATEDIR)/host-checkinstall.* - rm -rf $(HOST_CHECKINSTALL_DIR) - -# vim: syntax=make diff --git a/rules/images.in b/rules/images.in index f867b134d..99950fa5a 100644 --- a/rules/images.in +++ b/rules/images.in @@ -272,16 +272,3 @@ config IMAGE_EXT2_GZIP help FIXME: This item needs to be documented -############################################################################## -comment "Image Creation for Host" -############################################################################## - -config IMAGE_HOST_DEB - bool - prompt "Create Debian packets for host components" - help - Usually the host side code is being installed during the - "install" stages with "make install". If this option is - checked, Debian .deb packets are created. - - diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index 0a813e988..7b94fff89 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -59,14 +59,6 @@ PARALLELMFLAGS ?= -j$(shell if [ -r /proc/cpuinfo ]; \ FAKEROOT = $(PTXCONF_HOST_PREFIX)/bin/fakeroot -ifdef PTXCONF_IMAGE_HOST_DEB -CHECKINSTALL = INSTALLWATCH_PREFIX=$(PTXCONF_PREFIX) -CHECKINSTALL += $(HOST_CHECKINSTALL_DIR)/checkinstall -CHECKINSTALL += -D -y -else -CHECKINSTALL = -endif - CHECK_PIPE_STATUS = \ for i in "$${PIPESTATUS[@]}"; do [ $$i -gt 0 ] && { \ echo; \ @@ -589,22 +581,6 @@ get_option_ext = \ # # FIXME: if we don't use --install=no we can make one packet. # -ifdef PTXCONF_IMAGE_HOST_DEB -install = \ - BUILDDIR="$($(strip $(1)_DIR))"; \ - [ "$(strip $(2))" != "" ] && BUILDDIR="$(strip $(2))"; \ - [ "$(strip $(3))" != "h" ] && DESTDIR="$(SYSROOT)"; \ - cd $$BUILDDIR && \ - $($(strip $(1))_ENV) \ - $($(strip $(1))_PATH) \ - INSTALLWATCH_PREFIX=$(PTXCONF_PREFIX) \ - $(HOST_CHECKINSTALL_DIR)/checkinstall \ - -D -y -pakdir=$(IMAGEDIR) --install=no -nodoc \ - make install $(4) \ - $($(strip $(1))_MAKEVARS) \ - DESTDIR=$$DESTDIR; \ - #dpkg-deb -x blablabla $(SYSROOT) -else install = \ BUILDDIR="$($(strip $(1))_DIR)"; \ [ "$(strip $(2))" != "" ] && BUILDDIR="$(strip $(2))"; \ @@ -634,7 +610,6 @@ install = \ fi; \ done; \ done -endif # diff --git a/rules/pre/Virtual.make b/rules/pre/Virtual.make index 7365bcb0a..8feea7858 100644 --- a/rules/pre/Virtual.make +++ b/rules/pre/Virtual.make @@ -11,10 +11,6 @@ virtual-cross-tools_install: $(STATEDIR)/virtual-cross-tools.install -ifdef PTXCONF_IMAGE_HOST_DEB -$(STATEDIR)/virtual-cross-tools.install: $(STATEDIR)/host-checkinstall.install -endif - ifdef PTXCONF_IMAGE_JFFS2 $(STATEDIR)/virtual-cross-tools.install: $(STATEDIR)/host-mtd-utils.install endif |