Hallo Casten, can you please review this patch.
Cheers, Marc >From 1965b25f2370320c6a925b9a0eaca81f527046c4 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <[email protected]> Date: Wed, 3 Feb 2010 11:15:21 +0100 Subject: [PATCH] [ipkg] use install alternative for ipkg.conf Almost evey config file uses install_alternative, ipkg.conf doesn't. This patch changes that. Also the _GENERIC_ is removed from the config options. Signed-off-by: Marc Kleine-Budde <[email protected]> --- rules/ipkg.in | 47 ++++++++++++++++++++++++----------------------- rules/ipkg.make | 9 ++++----- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/rules/ipkg.in b/rules/ipkg.in index a62459b..1f93af3 100644 --- a/rules/ipkg.in +++ b/rules/ipkg.in @@ -33,38 +33,39 @@ config IPKG_LOG_WRAPPER If selected, ipkg will be installed with a wrapper script which provides basic logging facilities -config IPKG_GENERIC_IPKG_CONF +config IPKG_IPKG_CONF bool prompt "install /etc/ipkg.conf" default y - depends on ROOTFS help Installs a generic /etc/ipkg.conf file. - config IPKG_GENERIC_IPKG_CONF_HOST - depends on IPKG_GENERIC_IPKG_CONF - prompt "IPKG Update Site Host" - default "www.example.org" - string - help - Enter the hostname of your update site here. You can - use it as part of the ipkg.conf URL below. + Important: To make ipkg work at runtime, you must install this + configuration file. Without it you can't install new packages. - config IPKG_GENERIC_IPKG_CONF_URL - depends on IPKG_GENERIC_IPKG_CONF - string - prompt "IPKG Update Site URL" - default "src ptxdist http://${PTXCONF_IPKG_GENERIC_IPKG_CONF_HOST}/ptxdist/${PTXCONF_PROJECT}/dists/${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}"; - help - This path is put into the /etc/ipkg.conf file and specifies - where to find an IPKG packet feed. +if IPKG_IPKG_CONF - Note: Keep the "src" in front of the URL, its required if the - URL should be used. +config IPKG_IPKG_CONF_HOST + prompt "IPKG Update Site Host" + default "www.example.org" + string + help + Enter the hostname of your update site here. You can + use it as part of the ipkg.conf URL below. + +config IPKG_IPKG_CONF_URL + string + prompt "IPKG Update Site URL" + default "src ptxdist http://${PTXCONF_IPKG_IPKG_CONF_HOST}/ptxdist/${PTXCONF_PROJECT}/dists/${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}"; + help + This path is put into the /etc/ipkg.conf file and specifies + where to find an IPKG packet feed. - If you don't want to use this feature, keep the whole entry empty. + Note: Keep the "src" in front of the URL, its required if the + URL should be used. - Important: To make ipkg work at runtime, you must install this - configuration file. Without it you can't install new packages. + If you don't want to use this feature, keep the whole entry empty. + +endif endif diff --git a/rules/ipkg.make b/rules/ipkg.make index 3c7ad5d..cdef5b9 100644 --- a/rules/ipkg.make +++ b/rules/ipkg.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2005 by Robert Schwebel +# 2010 by Marc Kleine-Budde <[email protected]> # # See CREDITS for details about who has contributed to this project. # @@ -23,7 +24,6 @@ IPKG_URL := http://handhelds.org/download/packages/ipkg/$(IPKG).$(IPKG_SUFFIX) IPKG_SOURCE := $(SRCDIR)/$(IPKG).$(IPKG_SUFFIX) IPKG_DIR := $(BUILDDIR)/$(IPKG) - # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- @@ -85,11 +85,10 @@ ifdef PTXCONF_IPKG_HASH_TEST /usr/bin/ipkg_hash_test) endif -ifdef PTXCONF_IPKG_GENERIC_IPKG_CONF - @$(call install_copy, ipkg, 0, 0, 0644, \ - $(PTXDIST_TOPDIR)/generic/etc/ipkg.conf, /etc/ipkg.conf, n) +ifdef PTXCONF_IPKG_IPKG_CONF + @$(call install_alternative, ipkg, 0, 0, 0644, /etc/ipkg.conf) @$(call install_replace, ipkg, /etc/ipkg.conf, @SRC@, \ - $(PTXCONF_IPKG_GENERIC_IPKG_CONF_URL)) + $(PTXCONF_IPKG_IPKG_CONF_URL)) @$(call install_replace, ipkg, /etc/ipkg.conf, @ARCH@, \ $(PTXDIST_IPKG_ARCH_STRING)) endif -- 1.6.6.1 -- ptxdist mailing list [email protected]
