diff options
| -rw-r--r-- | patches/utelnetd-0.1.9/generic/adapt-makefile-for-arch-specific-build.patch | 35 | ||||
| -rw-r--r-- | patches/utelnetd-0.1.9/generic/series | 1 | ||||
| -rw-r--r-- | rules/utelnetd.make | 85 |
3 files changed, 25 insertions, 96 deletions
diff --git a/patches/utelnetd-0.1.9/generic/adapt-makefile-for-arch-specific-build.patch b/patches/utelnetd-0.1.9/generic/adapt-makefile-for-arch-specific-build.patch deleted file mode 100644 index f05cb21cc..000000000 --- a/patches/utelnetd-0.1.9/generic/adapt-makefile-for-arch-specific-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Remy Bohmer <linux@bohmer.net> -Subject: utelnetd: add EXTRA_CFLAGS - -This patch makes utelnetd use the EXTRA_CFLAGS during compilation -of the package. This is required for some architectures to pass flags like -CPU-type to the compilation. - -Signed-off-by: Remy Bohmer <linux@bohmer.net> - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: utelnetd-0.1.9/Makefile -=================================================================== ---- utelnetd-0.1.9.orig/Makefile 2003-08-08 09:25:18.000000000 +0200 -+++ utelnetd-0.1.9/Makefile 2007-08-29 12:54:35.000000000 +0200 -@@ -35,7 +35,7 @@ OBJS = utelnetd.o - CC = $(CROSS)gcc - INSTALL = install - --CFLAGS += -I. -pipe -DSHELLPATH=\"$(LOGIN)\" -Wall -+CFLAGS += $(EXTRA_CFLAGS) -I. -pipe -DSHELLPATH=\"$(LOGIN)\" -Wall - - ifneq ("","$(DEBUG)") - CFLAGS += -DDEBUG -g -Os -@@ -53,7 +53,7 @@ endif - all: $(PROGS) - - $(PROGS): $(OBJS) -- $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ -+ $(CC) $(LDFLAGS) $(EXTRA_CFLAGS) $^ $(LDLIBS) -o $@ - $(STRIP) --remove-section=.comment --remove-section=.note $@ - - .PHONY: install diff --git a/patches/utelnetd-0.1.9/generic/series b/patches/utelnetd-0.1.9/generic/series deleted file mode 100644 index 45d2cc462..000000000 --- a/patches/utelnetd-0.1.9/generic/series +++ /dev/null @@ -1 +0,0 @@ -adapt-makefile-for-arch-specific-build.patch diff --git a/rules/utelnetd.make b/rules/utelnetd.make index d0df7ae78..965116667 100644 --- a/rules/utelnetd.make +++ b/rules/utelnetd.make @@ -1,7 +1,7 @@ # -*-makefile-*- # $Id$ # -# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany +# Copyright (C) 2002, 2003, 2008 by Pengutronix e.K., Hildesheim, Germany # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -16,83 +16,48 @@ PACKAGES-$(PTXCONF_UTELNETD) += utelnetd # # Paths and names # -UTELNETD_VERSION = 0.1.9 -UTELNETD = utelnetd-$(UTELNETD_VERSION) -UTELNETD_URL = http://www.pengutronix.de/software/utelnetd/$(UTELNETD).tar.gz -UTELNETD_SOURCE = $(SRCDIR)/$(UTELNETD).tar.gz -UTELNETD_DIR = $(BUILDDIR)/$(UTELNETD) +UTELNETD_VERSION := 0.1.10 +UTELNETD := utelnetd-$(UTELNETD_VERSION) +UTELNETD_URL := http://www.pengutronix.de/software/utelnetd/$(UTELNETD).tar.gz +UTELNETD_SOURCE := $(SRCDIR)/$(UTELNETD).tar.gz +UTELNETD_DIR := $(BUILDDIR)/$(UTELNETD) # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- -utelnetd_get: $(STATEDIR)/utelnetd.get - -$(STATEDIR)/utelnetd.get: $(utelnetd_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(UTELNETD_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, UTELNETD) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -utelnetd_extract: $(STATEDIR)/utelnetd.extract - -$(STATEDIR)/utelnetd.extract: $(utelnetd_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(UTELNETS_DIR)) - @$(call extract, UTELNETD) - @$(call patchin, UTELNETD) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -utelnetd_prepare: $(STATEDIR)/utelnetd.prepare - -$(STATEDIR)/utelnetd.prepare: $(utelnetd_prepare_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) +$(STATEDIR)/utelnetd.prepare: + @$(call targetinfo) + @$(call touch) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -utelnetd_compile: $(STATEDIR)/utelnetd.compile - -UTELNETD_ENVIRONMENT += PATH=$(CROSS_PATH) -UTELNETD_MAKEVARS += CROSS=$(COMPILER_PREFIX) \ - EXTRA_CFLAGS='$(call remove_quotes,$(TARGET_CFLAGS))' - -$(STATEDIR)/utelnetd.compile: $(utelnetd_compile_deps_default) - @$(call targetinfo, $@) - $(UTELNETD_ENVIRONMENT) make -C $(UTELNETD_DIR) $(UTELNETD_MAKEVARS) - @$(call touch, $@) +UTELNETD_PATH := PATH=$(CROSS_PATH) +UTELNETD_ENV := PATH=$(CROSS_PATH) -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -utelnetd_install: $(STATEDIR)/utelnetd.install +UTELNETD_COMPILE_ENV := \ + CROSS_COMPILE=$(COMPILER_PREFIX) \ + $(CROSS_ENV_FLAGS) -$(STATEDIR)/utelnetd.install: $(utelnetd_install_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) +UTELNETD_MAKEVARS := INSTDIR=/sbin # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -utelnetd_targetinstall: $(STATEDIR)/utelnetd.targetinstall - -$(STATEDIR)/utelnetd.targetinstall: $(utelnetd_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/utelnetd.targetinstall: + @$(call targetinfo) @$(call install_init, utelnetd) @$(call install_fixup, utelnetd,PACKAGE,utelnetd) @@ -106,40 +71,40 @@ $(STATEDIR)/utelnetd.targetinstall: $(utelnetd_targetinstall_deps_default) # # Install the startup script on request only # -ifdef PTXCONF_ROOTFS_ETC_INITD_UTELNETD ifdef PTXCONF_ROOTFS_ETC_INITD_UTELNETD_DEFAULT # install the generic one @$(call install_copy, utelnetd, 0, 0, 0755, \ $(PTXDIST_TOPDIR)/generic/etc/init.d/telnetd, \ /etc/init.d/telnetd, n) endif + ifdef PTXCONF_ROOTFS_ETC_INITD_UTELNETD_USER # install users one @$(call install_copy, utelnetd, 0, 0, 0755, \ ${PTXDIST_WORKSPACE}/projectroot/etc/init.d/utelnetd, \ /etc/init.d/telnetd, n) endif -# -# FIXME: Is this packet the right location for the link? -# + ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK),"") @$(call install_copy, utelnetd, 0, 0, 0755, /etc/rc.d) @$(call install_link, utelnetd, ../init.d/telnetd, \ /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK)) endif -endif + @$(call install_copy, utelnetd, 0, 0, 0755, $(UTELNETD_DIR)/utelnetd, \ /sbin/utelnetd) @$(call install_finish, utelnetd) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean # ---------------------------------------------------------------------------- utelnetd_clean: - rm -rf $(STATEDIR)/utelnetd.* $(UTELNETD_DIR) + rm -rf $(STATEDIR)/utelnetd.* + rm -rf $(PKGDIR)/utelnetd_* + rm -rf $(UTELNETD_DIR) # vim: syntax=make |