diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-05-21 11:15:37 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-05-21 11:15:37 +0000 |
commit | 5eb4112c371331d05acae3a82f2a34431299c1c4 (patch) | |
tree | 29a5b6199c6b121b67af87241ba309931c703a09 | |
parent | bf6f2fa496802660a140ab17307138b21a53df4c (diff) | |
download | ptxdist-5eb4112c371331d05acae3a82f2a34431299c1c4.tar.gz ptxdist-5eb4112c371331d05acae3a82f2a34431299c1c4.tar.xz |
* liboop.in, liboop.make, lsh.make, Kconfig:
unbreak lsh, liboop
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8194 33e552b5-05e3-0310-8538-816dae2090ed
-rw-r--r-- | rules/Kconfig | 1 | ||||
-rw-r--r-- | rules/liboop.in | 5 | ||||
-rw-r--r-- | rules/liboop.make | 65 | ||||
-rw-r--r-- | rules/lsh.make | 90 |
4 files changed, 92 insertions, 69 deletions
diff --git a/rules/Kconfig b/rules/Kconfig index 0f427c3c4..95469204a 100644 --- a/rules/Kconfig +++ b/rules/Kconfig @@ -172,6 +172,7 @@ source "rules/liblist.in" source "rules/libmqueue.in" source "rules/libnetpbm.in" source "rules/liboil.in" +source "rules/liboop.in" source "rules/libpopt.in" source "rules/librn.in" source "rules/libsigcpp.in" diff --git a/rules/liboop.in b/rules/liboop.in new file mode 100644 index 000000000..a53413a5c --- /dev/null +++ b/rules/liboop.in @@ -0,0 +1,5 @@ +config LIBOOP + bool + prompt "liboop" + help + FIXME diff --git a/rules/liboop.make b/rules/liboop.make new file mode 100644 index 000000000..c6359e404 --- /dev/null +++ b/rules/liboop.make @@ -0,0 +1,65 @@ +# -*-makefile-*- +# $Id: template-make 8008 2008-04-15 07:39:46Z mkl $ +# +# Copyright (C) 2008 by Marc Kleine-Budde <mkl@pengutronix.de> +# +# 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 +# +PACKAGES-$(PTXCONF_LIBOOP) += liboop + +# +# Paths and names +# +LIBOOP_VERSION := 1.0 +LIBOOP := liboop-$(LIBOOP_VERSION) +LIBOOP_SUFFIX := tar.bz2 +LIBOOP_URL := http://download.ofb.net/liboop/$(LIBOOP).$(LIBOOP_SUFFIX) +LIBOOP_SOURCE := $(SRCDIR)/$(LIBOOP).$(LIBOOP_SUFFIX) +LIBOOP_DIR := $(BUILDDIR)/$(LIBOOP) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +$(LIBOOP_SOURCE): + @$(call targetinfo) + @$(call get, LIBOOP) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +LIBOOP_PATH := PATH=$(CROSS_PATH) +LIBOOP_ENV := $(CROSS_ENV) + +# +# autoconf +# +LIBOOP_AUTOCONF := $(CROSS_AUTOCONF_USR) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/liboop.targetinstall: + @$(call targetinfo) +# only static libs for now + @$(call touch) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +liboop_clean: + rm -rf $(STATEDIR)/liboop.* + rm -rf $(IMAGEDIR)/liboop_* + rm -rf $(LIBOOP_DIR) + +# vim: syntax=make diff --git a/rules/lsh.make b/rules/lsh.make index fea1a3358..2a090673a 100644 --- a/rules/lsh.make +++ b/rules/lsh.make @@ -1,8 +1,8 @@ # -*-makefile-*- # $Id$ # -# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany -# +# Copyright (C) 2002-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 @@ -17,55 +17,34 @@ PACKAGES-$(PTXCONF_LSH) += lsh # # Paths and names # -LSH_VERSION = 2.0.1 -LSH = lsh-$(LSH_VERSION) -LSH_SUFFIX = tar.gz -LSH_URL = http://www.lysator.liu.se/~nisse/archive/$(LSH).$(LSH_SUFFIX) -LSH_SOURCE = $(SRCDIR)/$(LSH).$(LSH_SUFFIX) -LSH_DIR = $(BUILDDIR)/$(LSH) +LSH_VERSION := 2.0.4 +LSH := lsh-$(LSH_VERSION) +LSH_SUFFIX := tar.gz +LSH_URL := http://www.lysator.liu.se/~nisse/archive/$(LSH).$(LSH_SUFFIX) +LSH_SOURCE := $(SRCDIR)/$(LSH).$(LSH_SUFFIX) +LSH_DIR := $(BUILDDIR)/$(LSH) # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- -lsh_get: $(STATEDIR)/lsh.get - -$(STATEDIR)/lsh.get: $(lsh_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(LSH_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, LSH) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -lsh_extract: $(STATEDIR)/lsh.extract - -$(STATEDIR)/lsh.extract: $(lsh_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(LSH_DIR)) - @$(call extract, LSH) - @$(call patchin, LSH) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -lsh_prepare: $(STATEDIR)/lsh.prepare - -LSH_PATH = PATH=$(CROSS_PATH) -LSH_ENV = $(CROSS_ENV) +LSH_PATH := PATH=$(CROSS_PATH) +LSH_ENV := $(CROSS_ENV) # # autoconf # -LSH_AUTOCONF = $(CROSS_AUTOCONF_USR) -LSH_AUTOCONF += \ +LSH_AUTOCONF := \ + $(CROSS_AUTOCONF_ROOT) \ --sysconfdir=/etc/lsh \ --disable-kerberos \ --disable-pam \ @@ -76,44 +55,12 @@ LSH_AUTOCONF += \ --disable-utmp \ --without-system-argp - -$(STATEDIR)/lsh.prepare: $(lsh_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(LSH_DIR)/config.cache) - cd $(LSH_DIR) && \ - $(LSH_PATH) $(LSH_ENV) \ - $(LSH_DIR)/configure $(LSH_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -lsh_compile: $(STATEDIR)/lsh.compile - -$(STATEDIR)/lsh.compile: $(lsh_compile_deps_default) - @$(call targetinfo, $@) - $(LSH_PATH) make -C $(LSH_DIR) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -lsh_install: $(STATEDIR)/lsh.install - -$(STATEDIR)/lsh.install: $(lsh_install_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -lsh_targetinstall: $(STATEDIR)/lsh.targetinstall - -$(STATEDIR)/lsh.targetinstall: $(lsh_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/lsh.targetinstall: + @$(call targetinfo) @$(call install_init, lsh) @$(call install_fixup, lsh,PACKAGE,lsh) @@ -127,23 +74,28 @@ $(STATEDIR)/lsh.targetinstall: $(lsh_targetinstall_deps_default) ifdef PTXCONF_LSH_EXECUV @$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/lsh-execuv, /sbin/lsh-execuv) endif + ifdef PTXCONF_LSH_LSHD @$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/lshd, /sbin/lshd) endif + ifdef PTXCONF_LSH_SFTPD @$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/sftp/sftp-server, /sbin/sftp-server) endif + ifdef PTXCONF_LSH_MAKESEED @$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/lsh-make-seed, /bin/lsh-make-seed) endif + ifdef PTXCONF_LSH_WRITEKEY @$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/lsh-writekey, /sbin/lsh-writekey) endif + ifdef PTXCONF_LSH_KEYGEN @$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/lsh-keygen, /sbin/lsh-keygen) endif @$(call install_finish, lsh) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |