* Re: [fix-isi-udev PATCH 0/3] Improve udev with isi
From: Alexander Kanavin @ 2010-10-08 8:45 UTC (permalink / raw)
To: ofono
In-Reply-To: <1286480461.9665.558.camel@tucson.research.nokia.com>
[-- Attachment #1: Type: text/plain, Size: 558 bytes --]
On 07.10.2010 22:41, ext Aki Niemi wrote:
>> [fix-isi-udev PATCH 3/3] ofono.rules: assign isigen driver by USB ids
>
> This one was left dangling; let's see if we can come up with a better
> way to match the modems driven by cdc_phonet. (Although, admittedly this
> same approach is already used with some AT modems.)
I suppose you could match by usb interface class and subclass? (02 and 254
respectively - the first is standardized, but the second seems to be just
made up by Nokia at some point, so we better keep the vendor id too)
Alex
^ permalink raw reply
* Problem regarding splitting and merging of bio's in dm target
From: nishant mungse @ 2010-10-08 8:45 UTC (permalink / raw)
To: dm-devel
[-- Attachment #1.1: Type: text/plain, Size: 937 bytes --]
I'm new to kernel coding and I have this doubt. I'm trying to write a
simple dm-target which will concatenate devices and perform io
operations on it.
There are a couple of things that I'm stuck up with......any help is
appreciated ...
hi all,
1. What do the presuspend and postsuspend fields in struct target_type mean
?
2. A bio request for read is split into no. of bios (here we're also
splitting bvec's wherever necessary) for reading from different
devices. For splitting the bvec's we are using the function split_bvec
(drivers/md/dm.c).
Now, after read completion, we've multiple bios with data in pages
pointed by bvec. For satisfying the read request, we want to merge the
data available in bios (Because we have splitted one bvec from
original bio into no. of bios).
How can we merge these bvec's into one bvec for original bio?
Does the function dm_merge_bvec (dm.c) serve the same purpose?
Thanks and Regards,
Nishant
[-- Attachment #1.2: Type: text/html, Size: 1058 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply
* Re: [PATCH 15/18] fs: introduce a per-cpu last_ino allocator
From: Christoph Hellwig @ 2010-10-08 8:44 UTC (permalink / raw)
To: Andi Kleen; +Cc: Dave Chinner, linux-fsdevel, linux-kernel
In-Reply-To: <87d3rl5c1h.fsf@basil.nowhere.org>
On Fri, Oct 08, 2010 at 10:22:34AM +0200, Andi Kleen wrote:
> Dave Chinner <david@fromorbit.com> writes:
>
> > From: Eric Dumazet <eric.dumazet@gmail.com>
> >
> > new_inode() dirties a contended cache line to get increasing
> > inode numbers. This limits performance on workloads that cause
> > significant parallel inode allocation.
> >
> > Solve this problem by using a per_cpu variable fed by the shared
> > last_ino in batches of 1024 allocations. This reduces contention on
> > the shared last_ino, and give same spreading ino numbers than before
> > (i.e. same wraparound after 2^32 allocations).
>
> This doesn't help for Unix disk file systems, so not fully sure why you
> need it for XFS.
Currently i_ino is assigned for every inode allocated using new_inode.
It's pretty stupid as most callers simply don't need it. But Dave
didn't want to make this series even more complicated than nessecary
and leave sorting this out for later.
^ permalink raw reply
* Re: Configuration of nestedhvm
From: Christoph Egger @ 2010-10-08 8:44 UTC (permalink / raw)
To: xen-devel; +Cc: Dong, Eddie, Keir Fraser
In-Reply-To: <1A42CE6F5F474C41B63392A5F80372B22DBEA36C@shsmsx501.ccr.corp.intel.com>
[-- Attachment #1: Type: text/plain, Size: 4683 bytes --]
Eddie,
you can simplify the second patch with attached patch merged
and is correct for AMD side.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Christoph
On Friday 08 October 2010 06:34:14 Dong, Eddie wrote:
> Keir:
> Despite of the negotioatiom of nested virtualization wrapper, here
> comes with the global configuration parameter and the CR4 layout handling
> between SVM & VMX. These are wrapper neutral IMO.
>
> Thx, Eddie
>
>
>
> ===Patch1
>
> Nested virtualization usage model is emerging, however we must guarantee it
> won't impact the performance of simple virtualization. This patch add an
> boot parameter for nested virtualization, which is disabled by default for
> now.
>
> Signed-off-by: Eddie Dong <eddie.dong@intel.com>
>
>
> diff -r 1385b15e168f xen/arch/x86/hvm/hvm.c
> --- a/xen/arch/x86/hvm/hvm.c Wed Oct 06 17:38:15 2010 +0100
> +++ b/xen/arch/x86/hvm/hvm.c Fri Oct 08 10:29:38 2010 +0800
> @@ -66,6 +66,9 @@ unsigned int opt_hvm_debug_level __read_
> unsigned int opt_hvm_debug_level __read_mostly;
> integer_param("hvm_debug", opt_hvm_debug_level);
>
> +unsigned int enable_nested_hvm __read_mostly;
> +integer_param("nested_hvm", enable_nested_hvm);
> +
> struct hvm_function_table hvm_funcs __read_mostly;
>
> /* I/O permission bitmap is globally shared by all HVM guests. */
> diff -r 1385b15e168f xen/include/asm-x86/hvm/hvm.h
> --- a/xen/include/asm-x86/hvm/hvm.h Wed Oct 06 17:38:15 2010 +0100
> +++ b/xen/include/asm-x86/hvm/hvm.h Fri Oct 08 10:35:03 2010 +0800
> @@ -250,6 +250,9 @@ hvm_set_segment_register(struct vcpu *v,
> #define is_viridian_domain(_d)
> \ (is_hvm_domain(_d) && ((_d)->arch.hvm_domain.params[HVM_PARAM_VIRIDIAN]))
>
> +/* TODO: handle per domain configuration */
> +#define is_nestedhvm(_d) (enable_nested_hvm && is_hvm_domain(_d))
> +
> void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx,
> unsigned int *ecx, unsigned int *edx);
> void hvm_migrate_timers(struct vcpu *v);
>
>
> ===Patch2
>
> This patch solves the CR4 bit (VMXE) format difference between AMD & Intel
> processor.
>
> Signed-off-by: Qing He <qing.he@intel.com>
> Signed-off-by: Eddie Dong <eddie.dong@intel.com>
>
> diff -r 1385b15e168f xen/arch/x86/hvm/hvm.c
> --- a/xen/arch/x86/hvm/hvm.c Wed Oct 06 17:38:15 2010 +0100
> +++ b/xen/arch/x86/hvm/hvm.c Fri Oct 08 10:46:55 2010 +0800
> @@ -630,6 +630,11 @@ static int hvm_load_cpu_ctxt(struct doma
> struct hvm_hw_cpu ctxt;
> struct segment_register seg;
> struct vcpu_guest_context *vc;
> + unsigned long rsv_bits = HVM_CR4_GUEST_RESERVED_BITS;
> +
> + if ( !is_nestedhvm(d) ||
> + boot_cpu_data.x86_vendor == X86_VENDOR_AMD )
> + rsv_bits |= X86_CR4_VMXE;
>
> /* Which vcpu is this? */
> vcpuid = hvm_load_instance(h);
> @@ -662,7 +667,7 @@ static int hvm_load_cpu_ctxt(struct doma
> return -EINVAL;
> }
>
> - if ( ctxt.cr4 & HVM_CR4_GUEST_RESERVED_BITS )
> + if ( ctxt.cr4 & rsv_bits )
> {
> gdprintk(XENLOG_ERR, "HVM restore: bad CR4 0x%"PRIx64"\n",
> ctxt.cr4);
> @@ -1243,8 +1248,12 @@ int hvm_set_cr4(unsigned long value)
> {
> struct vcpu *v = current;
> unsigned long old_cr;
> -
> - if ( value & HVM_CR4_GUEST_RESERVED_BITS )
> + unsigned long rsv_bits = HVM_CR4_GUEST_RESERVED_BITS;
> +
> + if ( !is_nestedhvm(v->domain) ||
> + boot_cpu_data.x86_vendor == X86_VENDOR_AMD )
> + rsv_bits |= X86_CR4_VMXE;
> + if ( value & rsv_bits )
> {
> HVM_DBG_LOG(DBG_LEVEL_1,
> "Guest attempts to set reserved bit in CR4: %lx",
> diff -r 1385b15e168f xen/include/asm-x86/hvm/hvm.h
> --- a/xen/include/asm-x86/hvm/hvm.h Wed Oct 06 17:38:15 2010 +0100
> +++ b/xen/include/asm-x86/hvm/hvm.h Fri Oct 08 10:46:35 2010 +0800
> @@ -291,7 +291,8 @@ static inline int hvm_do_pmu_interrupt(s
> X86_CR4_DE | X86_CR4_PSE | X86_CR4_PAE | \
> X86_CR4_MCE | X86_CR4_PGE | X86_CR4_PCE | \
> X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT | \
> - (cpu_has_xsave ? X86_CR4_OSXSAVE : 0))))
> + (cpu_has_xsave ? X86_CR4_OSXSAVE : 0))) | \
> + X86_CR4_VMXE)
>
> /* These exceptions must always be intercepted. */
> #define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U <<
> TRAP_invalid_op))
--
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
[-- Attachment #2: xen_vmx_enable.diff --]
[-- Type: text/x-diff, Size: 988 bytes --]
diff -r b1ace8d2143c -r 325392ae335f xen/include/asm-x86/cpufeature.h
--- a/xen/include/asm-x86/cpufeature.h
+++ b/xen/include/asm-x86/cpufeature.h
@@ -201,6 +201,8 @@
#define cpu_has_svm boot_cpu_has(X86_FEATURE_SVME)
+#define cpu_has_vmx boot_cpu_has(X86_FEATURE_VMXE)
+
#endif /* __ASM_I386_CPUFEATURE_H */
/*
diff -r b1ace8d2143c -r 325392ae335f xen/include/asm-x86/hvm/hvm.h
--- a/xen/include/asm-x86/hvm/hvm.h
+++ b/xen/include/asm-x86/hvm/hvm.h
@@ -315,7 +315,8 @@ static inline int hvm_do_pmu_interrupt(s
X86_CR4_DE | X86_CR4_PSE | X86_CR4_PAE | \
X86_CR4_MCE | X86_CR4_PGE | X86_CR4_PCE | \
X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT | \
- (cpu_has_xsave ? X86_CR4_OSXSAVE : 0))))
+ (cpu_has_xsave ? X86_CR4_OSXSAVE : 0) | \
+ (cpu_has_vmx ? X86_CR4_VMXE : 0))))
/* These exceptions must always be intercepted. */
#define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op))
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply
* [Buildroot] buildroot not support c++ compliing
From: Thomas Petazzoni @ 2010-10-08 8:44 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286525870.3703.16.camel@olyvine-desktop.logiways-sz.cn>
On Fri, 08 Oct 2010 16:17:50 +0800
"olyvine.chen at logiways.com.cn" <olyvine.chen@logiways.com.cn> wrote:
> STLinux's sh4-linux-
Does this toolchain supports C++ ? Is this toolchain publicly available
so that I can test and see what's wrong ?
Thanks,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 9/9] thttpd: convert to autotargets
From: Martin Banky @ 2010-10-08 8:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286527389-29983-1-git-send-email-Martin.Banky@gmail.com>
^ permalink raw reply
* [Buildroot] [PATCH 9/9] thttpd: convert to autotargets
From: Martin Banky @ 2010-10-08 8:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286527389-29983-1-git-send-email-Martin.Banky@gmail.com>
Also, changed the site to Debian, to get the latest patches
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/thttpd/thttpd.mk | 101 +++++++++++++++++----------------------------
1 files changed, 38 insertions(+), 63 deletions(-)
diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk
index d32462e..80eba3a 100644
--- a/package/thttpd/thttpd.mk
+++ b/package/thttpd/thttpd.mk
@@ -3,64 +3,48 @@
# thttpd
#
#############################################################
-THTTPD_VERSION:=2.25b
-THTTPD_SOURCE:=thttpd-$(THTTPD_VERSION).tar.gz
-THTTPD_SITE:=http://www.acme.com/software/thttpd/
-THTTPD_DIR:=$(BUILD_DIR)/thttpd-$(THTTPD_VERSION)
-THTTPD_CAT:=$(ZCAT)
-THTTPD_BINARY:=thttpd
-THTTPD_TARGET_BINARY:=sbin/thttpd
-THTTPD_ROOT:=/var
-THTTPD_WEB_DIR:=$(THTTPD_ROOT)/www
-
-$(DL_DIR)/$(THTTPD_SOURCE):
- $(call DOWNLOAD,$(THTTPD_SITE),$(THTTPD_SOURCE))
-
-thttpd-source: $(DL_DIR)/$(THTTPD_SOURCE)
-
-$(THTTPD_DIR)/.unpacked: $(DL_DIR)/$(THTTPD_SOURCE)
- $(THTTPD_CAT) $(DL_DIR)/$(THTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(THTTPD_DIR)/.unpacked
+THTTPD_VERSION = 2.25b
+THTTPD_SOURCE = thttpd_$(THTTPD_VERSION).orig.tar.gz
+THTTPD_PATCH = thttpd_$(THTTPD_VERSION)-11.diff.gz
+THTTPD_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/t/thttpd/
+
+ifneq ($(THTTPD_PATCH),)
+define THTTPD_DEBIAN_PATCHES
+ if [ -d $(@D)/debian/patches ]; then \
+ toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+ fi
+endef
+endif
-$(THTTPD_DIR)/.configured: $(THTTPD_DIR)/.unpacked
- (cd $(THTTPD_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=$(THTTPD_ROOT) \
- )
- touch $(THTTPD_DIR)/.configured
+THTTPD_POST_PATCH_HOOKS = THTTPD_DEBIAN_PATCHES
-$(THTTPD_DIR)/$(THTTPD_BINARY): $(THTTPD_DIR)/.configured
- $(MAKE1) -C $(THTTPD_DIR)
+THTTPD_MAKE=$(MAKE1)
-$(TARGET_DIR)/$(THTTPD_TARGET_BINARY): $(THTTPD_DIR)/$(THTTPD_BINARY)
- install -D $(THTTPD_DIR)/$(THTTPD_BINARY) $(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
- install -D $(THTTPD_DIR)/extras/htpasswd $(TARGET_DIR)/bin/htpasswd
- install -D $(THTTPD_DIR)/extras/makeweb $(TARGET_DIR)/bin/makeweb
- install -D $(THTTPD_DIR)/extras/syslogtocern $(TARGET_DIR)/bin/syslogtocern
- install -D $(THTTPD_DIR)/scripts/thttpd_wrapper $(TARGET_DIR)/sbin/thttpd_wrapper
- install -D $(THTTPD_DIR)/scripts/thttpd.sh $(TARGET_DIR)/etc/init.d/S90thttpd
+define THTTPD_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/thttpd $(TARGET_DIR)/sbin/thttpd
+ $(INSTALL) -D -m 0755 $(@D)/extras/htpasswd $(TARGET_DIR)/bin/htpasswd
+ $(INSTALL) -D -m 0755 $(@D)/extras/makeweb $(TARGET_DIR)/bin/makeweb
+ $(INSTALL) -D -m 0755 $(@D)/extras/syslogtocern $(TARGET_DIR)/bin/syslogtocern
+ $(INSTALL) -D -m 0755 $(@D)/scripts/thttpd_wrapper $(TARGET_DIR)/sbin/thttpd_wrapper
+ $(INSTALL) -D -m 0755 $(@D)/scripts/thttpd.sh $(TARGET_DIR)/etc/init.d/S90thttpd
cp $(TARGET_DIR)/etc/init.d/S90thttpd $(TARGET_DIR)/etc/init.d/S90thttpd.in
cp $(TARGET_DIR)/sbin/thttpd_wrapper $(TARGET_DIR)/sbin/thttpd_wrapper.in
- sed -e "s:/usr/local/sbin:/sbin:g" -e "s:/usr/local/www:$(THTTPD_WEB_DIR):g" < $(TARGET_DIR)/sbin/thttpd_wrapper.in > $(TARGET_DIR)/sbin/thttpd_wrapper
- sed -e "s:/usr/local/sbin:/sbin:g" < $(TARGET_DIR)/etc/init.d/S90thttpd.in > $(TARGET_DIR)/etc/init.d/S90thttpd
+ sed -e "s:/usr/local/sbin:/sbin:g" -e "s:/usr/local/www:/var/www:g" \
+ < $(TARGET_DIR)/sbin/thttpd_wrapper.in > $(TARGET_DIR)/sbin/thttpd_wrapper
+ sed -e "s:/usr/local/sbin:/sbin:g" < $(TARGET_DIR)/etc/init.d/S90thttpd.in \
+ > $(TARGET_DIR)/etc/init.d/S90thttpd
rm -f $(TARGET_DIR)/etc/init.d/S90thttpd.in $(TARGET_DIR)/sbin/thttpd_wrapper.in
- install -d $(TARGET_DIR)$(THTTPD_WEB_DIR)/data
- install -d $(TARGET_DIR)$(THTTPD_WEB_DIR)/logs
- echo "dir=$(THTTPD_WEB_DIR)/data" > $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
- echo 'cgipat=**.cgi' >> $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
- echo "logfile=$(THTTPD_WEB_DIR)/logs/thttpd_log" >> $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
- echo "pidfile=/var/run/thttpd.pid" >> $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
- echo "<HTML><BODY>thttpd test page</BODY></HTML>" > $(TARGET_DIR)$(THTTPD_WEB_DIR)/data/index.html
-
-thttpd: $(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
-
-thttpd-clean:
- rm -f $(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
+ $(INSTALL) -d $(TARGET_DIR)/var/www/data
+ $(INSTALL) -d $(TARGET_DIR)/var/www/logs
+ echo "dir=/var/www/data" > $(TARGET_DIR)/var/www/thttpd_config
+ echo 'cgipat=**.cgi' >> $(TARGET_DIR)/var/www/thttpd_config
+ echo "logfile=/var/www/logs/thttpd_log" >> $(TARGET_DIR)/var/www/thttpd_config
+ echo "pidfile=/var/run/thttpd.pid" >> $(TARGET_DIR)/var/www/thttpd_config
+ echo "<HTML><BODY>thttpd test page</BODY></HTML>" > $(TARGET_DIR)/var/www/data/index.html
+endef
+
+define THTTPD_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/sbin/thttpd
rm -f $(TARGET_DIR)/sbin/httpd_wrapper
rm -f $(TARGET_DIR)/sbin/thttpd_wrapper
rm -rf $(TARGET_DIR)/var/www
@@ -68,15 +52,6 @@ thttpd-clean:
rm -f $(TARGET_DIR)/bin/htpasswd
rm -f $(TARGET_DIR)/bin/makeweb
rm -f $(TARGET_DIR)/bin/syslogtocern
- -$(MAKE) -C $(THTTPD_DIR) clean
+endef
-thttpd-dirclean:
- rm -rf $(THTTPD_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_THTTPD),y)
-TARGETS+=thttpd
-endif
+$(eval $(call AUTOTARGETS,package,thttpd))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 8/9] sysvint: convert to gentargets and bump to 2.88
From: Martin Banky @ 2010-10-08 8:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286527389-29983-1-git-send-email-Martin.Banky@gmail.com>
Also, changed the site to Debian, to get the latest patches
As for the BR2_PACKAGE_UTIL_LINUX_NG variable, its in preparation for the,
hopefully soon, conversion to util-linux-ng
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/sysklogd/-sysklogd-susv3-legacy.patch | 20 ------
package/sysklogd/-sysklogd.patch | 91 -------------------------
package/sysvinit/sysvinit-2.86-gentoo.patch | 9 ---
package/sysvinit/sysvinit.mk | 71 +++++++++----------
4 files changed, 34 insertions(+), 157 deletions(-)
delete mode 100644 package/sysklogd/-sysklogd-susv3-legacy.patch
delete mode 100644 package/sysklogd/-sysklogd.patch
delete mode 100644 package/sysvinit/sysvinit-2.86-gentoo.patch
diff --git a/package/sysklogd/-sysklogd-susv3-legacy.patch b/package/sysklogd/-sysklogd-susv3-legacy.patch
deleted file mode 100644
index 7e9a294..0000000
--- a/package/sysklogd/-sysklogd-susv3-legacy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-[PATCH] replace susv3 legacy functions with modern equivalents
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- syslog.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: sysklogd-1.4.1/syslog.c
-===================================================================
---- sysklogd-1.4.1.orig/syslog.c
-+++ sysklogd-1.4.1/syslog.c
-@@ -178,7 +178,7 @@
- return;
- (void)strcat(tbuf, "\r\n");
- cnt += 2;
-- p = index(tbuf, '>') + 1;
-+ p = strchr(tbuf, '>') + 1;
- (void)write(fd, p, cnt - (p - tbuf));
- (void)close(fd);
- }
diff --git a/package/sysklogd/-sysklogd.patch b/package/sysklogd/-sysklogd.patch
deleted file mode 100644
index 393a1a3..0000000
--- a/package/sysklogd/-sysklogd.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- sysklogd-1.4.1/module.h.orig 1970-01-01 10:00:00.000000000 +1000
-+++ sysklogd-1.4.1/module.h 2005-11-24 01:40:09.000000000 +1000
-@@ -0,0 +1,62 @@
-+/* this file eliminates the need to include <kernel/module.h> */
-+/* Module definitions for klogd's module support */
-+struct kernel_sym
-+{
-+ unsigned long value;
-+ char name[60];
-+};
-+
-+struct module_symbol
-+{
-+ unsigned long value;
-+ const char *name;
-+};
-+
-+struct module_ref
-+{
-+ struct module *dep; /* "parent" pointer */
-+ struct module *ref; /* "child" pointer */
-+ struct module_ref *next_ref;
-+};
-+
-+struct module_info
-+{
-+ unsigned long addr;
-+ unsigned long size;
-+ unsigned long flags;
-+ long usecount;
-+};
-+
-+
-+typedef struct { volatile int counter; } atomic_t;
-+
-+struct module
-+{
-+ unsigned long size_of_struct; /* == sizeof(module) */
-+ struct module *next;
-+ const char *name;
-+ unsigned long size;
-+
-+ union
-+ {
-+ atomic_t usecount;
-+ long pad;
-+ } uc; /* Needs to keep its size - so says rth */
-+
-+ unsigned long flags; /* AUTOCLEAN et al */
-+
-+ unsigned nsyms;
-+ unsigned ndeps;
-+
-+ struct module_symbol *syms;
-+ struct module_ref *deps;
-+ struct module_ref *refs;
-+ int (*init)(void);
-+ void (*cleanup)(void);
-+ const struct exception_table_entry *ex_table_start;
-+ const struct exception_table_entry *ex_table_end;
-+#ifdef __alpha__
-+ unsigned long gp;
-+#endif
-+};
-+
-
---- sysklogd-1.4.1/ksym_mod.c.orig 2005-11-24 23:15:01.000000000 +1000
-+++ sysklogd-1.4.1/ksym_mod.c 2005-11-24 23:11:54.000000000 +1000
-@@ -89,17 +89,21 @@
- #include <errno.h>
- #include <sys/fcntl.h>
- #include <sys/stat.h>
-+#include <linux/version.h>
- #if !defined(__GLIBC__)
- #include <linux/time.h>
- #include <linux/module.h>
- #else /* __GLIBC__ */
-+#if LINUX_VERSION_CODE >= 0x20500
-+#include "module.h"
-+#else
- #include <linux/module.h>
-+#endif
- extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
- extern int get_kernel_syms __P ((struct kernel_sym *__table));
- #endif /* __GLIBC__ */
- #include <stdarg.h>
- #include <paths.h>
--#include <linux/version.h>
-
- #include "klogd.h"
- #include "ksyms.h"
diff --git a/package/sysvinit/sysvinit-2.86-gentoo.patch b/package/sysvinit/sysvinit-2.86-gentoo.patch
deleted file mode 100644
index 06b9e15..0000000
--- a/package/sysvinit/sysvinit-2.86-gentoo.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- sysvinit/src/Makefile
-+++ sysvinit/src/Makefile
-@@ -10,5 +10,3 @@
-
--CC = gcc
--CFLAGS = -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
--LDFLAGS = -s
-+CFLAGS += -Wall -D_GNU_SOURCE
- STATIC =
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index ef7c713..9d0a6d1 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -3,50 +3,47 @@
# sysvinit
#
#############################################################
-SYSVINIT_VERSION:=2.86
-SYSVINIT_SOURCE:=sysvinit-$(SYSVINIT_VERSION).tar.gz
-SYSVINIT_SITE:=ftp://ftp.cistron.nl/pub/people/miquels/software
-SYSVINIT_DIR:=$(BUILD_DIR)/sysvinit-$(SYSVINIT_VERSION)
-SYSVINIT_CAT:=$(ZCAT)
-SYSVINIT_BINARY:=src/init
-SYSVINIT_TARGET_BINARY:=sbin/init
-
-$(DL_DIR)/$(SYSVINIT_SOURCE):
- $(call DOWNLOAD,$(SYSVINIT_SITE),$(SYSVINIT_SOURCE))
-
-sysvinit-unpacked: $(SYSVINIT_DIR)/.unpacked
-$(SYSVINIT_DIR)/.unpacked: $(DL_DIR)/$(SYSVINIT_SOURCE)
- $(SYSVINIT_CAT) $(DL_DIR)/$(SYSVINIT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(SYSVINIT_DIR) package/sysvinit/ sysvinit-\*.patch
- touch $@
-
-$(SYSVINIT_DIR)/$(SYSVINIT_BINARY): $(SYSVINIT_DIR)/.unpacked
+SYSVINIT_VERSION = 2.88
+SYSVINIT_SOURCE = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
+SYSVINIT_PATCH = sysvinit_$(SYSVINIT_VERSION)dsf-12.diff.gz
+SYSVINIT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysvinit
+
+# Add util-linux-ng as dependency so shutdown is the sysvinit version
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_NG),y)
+SYSVINIT_DEPENDENCIES = util-linux-ng
+endif
+
+ifneq ($(SYSVINIT_PATCH),)
+define SYSVINIT_DEBIAN_PATCHES
+ if [ -d $(@D)/debian/patches ]; then \
+ toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+ fi
+endef
+endif
+
+SYSVINIT_POST_PATCH_HOOKS = SYSVINIT_DEBIAN_PATCHES
+
+define SYSVINIT_BUILD_CMDS
# Force sysvinit to link against libcrypt as it otherwise
# use an incorrect test to see if it's available
- CFLAGS="$(TARGET_CFLAGS)" $(MAKE) CC="$(TARGET_CC)" LCRYPT="-lcrypt" -C $(SYSVINIT_DIR)/src
+ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" LCRYPT="-lcrypt" -C $(@D)/src
+endef
-$(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY): $(SYSVINIT_DIR)/$(SYSVINIT_BINARY)
+define SYSVINIT_INSTALL_TARGET_CMDS
for x in halt init shutdown; do \
- install -D $(SYSVINIT_DIR)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \
+ install -D -m 0755 $(@D)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \
done
+endef
-sysvinit: $(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY)
-
-sysvinit-source: $(DL_DIR)/$(SYSVINIT_SOURCE)
-
-sysvinit-clean:
+define SYSVINIT_UNINSTALL_TARGET_CMDS
for x in halt init shutdown; do \
rm -f $(TARGET_DIR)/sbin/$$x || exit 1; \
done
- -$(MAKE) -C $(SYSVINIT_DIR) clean
+endef
-sysvinit-dirclean:
- rm -rf $(SYSVINIT_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SYSVINIT),y)
-TARGETS+=sysvinit
-endif
+define SYSVINIT_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
+
+$(eval $(call GENTARGETS,package,sysvinit))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 7/9] sysklogd: convert to gentargets and bump to 1.5
From: Martin Banky @ 2010-10-08 8:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286527389-29983-1-git-send-email-Martin.Banky@gmail.com>
Also, changed the site to Debian, to get the latest patches
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/sysklogd/-sysklogd-susv3-legacy.patch | 20 ++++++
package/sysklogd/-sysklogd.patch | 91 +++++++++++++++++++++++++
package/sysklogd/sysklogd-susv3-legacy.patch | 20 ------
package/sysklogd/sysklogd.mk | 85 +++++++++++------------
package/sysklogd/sysklogd.patch | 91 -------------------------
5 files changed, 151 insertions(+), 156 deletions(-)
create mode 100644 package/sysklogd/-sysklogd-susv3-legacy.patch
create mode 100644 package/sysklogd/-sysklogd.patch
delete mode 100644 package/sysklogd/sysklogd-susv3-legacy.patch
delete mode 100644 package/sysklogd/sysklogd.patch
diff --git a/package/sysklogd/-sysklogd-susv3-legacy.patch b/package/sysklogd/-sysklogd-susv3-legacy.patch
new file mode 100644
index 0000000..7e9a294
--- /dev/null
+++ b/package/sysklogd/-sysklogd-susv3-legacy.patch
@@ -0,0 +1,20 @@
+[PATCH] replace susv3 legacy functions with modern equivalents
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ syslog.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: sysklogd-1.4.1/syslog.c
+===================================================================
+--- sysklogd-1.4.1.orig/syslog.c
++++ sysklogd-1.4.1/syslog.c
+@@ -178,7 +178,7 @@
+ return;
+ (void)strcat(tbuf, "\r\n");
+ cnt += 2;
+- p = index(tbuf, '>') + 1;
++ p = strchr(tbuf, '>') + 1;
+ (void)write(fd, p, cnt - (p - tbuf));
+ (void)close(fd);
+ }
diff --git a/package/sysklogd/-sysklogd.patch b/package/sysklogd/-sysklogd.patch
new file mode 100644
index 0000000..393a1a3
--- /dev/null
+++ b/package/sysklogd/-sysklogd.patch
@@ -0,0 +1,91 @@
+--- sysklogd-1.4.1/module.h.orig 1970-01-01 10:00:00.000000000 +1000
++++ sysklogd-1.4.1/module.h 2005-11-24 01:40:09.000000000 +1000
+@@ -0,0 +1,62 @@
++/* this file eliminates the need to include <kernel/module.h> */
++/* Module definitions for klogd's module support */
++struct kernel_sym
++{
++ unsigned long value;
++ char name[60];
++};
++
++struct module_symbol
++{
++ unsigned long value;
++ const char *name;
++};
++
++struct module_ref
++{
++ struct module *dep; /* "parent" pointer */
++ struct module *ref; /* "child" pointer */
++ struct module_ref *next_ref;
++};
++
++struct module_info
++{
++ unsigned long addr;
++ unsigned long size;
++ unsigned long flags;
++ long usecount;
++};
++
++
++typedef struct { volatile int counter; } atomic_t;
++
++struct module
++{
++ unsigned long size_of_struct; /* == sizeof(module) */
++ struct module *next;
++ const char *name;
++ unsigned long size;
++
++ union
++ {
++ atomic_t usecount;
++ long pad;
++ } uc; /* Needs to keep its size - so says rth */
++
++ unsigned long flags; /* AUTOCLEAN et al */
++
++ unsigned nsyms;
++ unsigned ndeps;
++
++ struct module_symbol *syms;
++ struct module_ref *deps;
++ struct module_ref *refs;
++ int (*init)(void);
++ void (*cleanup)(void);
++ const struct exception_table_entry *ex_table_start;
++ const struct exception_table_entry *ex_table_end;
++#ifdef __alpha__
++ unsigned long gp;
++#endif
++};
++
+
+--- sysklogd-1.4.1/ksym_mod.c.orig 2005-11-24 23:15:01.000000000 +1000
++++ sysklogd-1.4.1/ksym_mod.c 2005-11-24 23:11:54.000000000 +1000
+@@ -89,17 +89,21 @@
+ #include <errno.h>
+ #include <sys/fcntl.h>
+ #include <sys/stat.h>
++#include <linux/version.h>
+ #if !defined(__GLIBC__)
+ #include <linux/time.h>
+ #include <linux/module.h>
+ #else /* __GLIBC__ */
++#if LINUX_VERSION_CODE >= 0x20500
++#include "module.h"
++#else
+ #include <linux/module.h>
++#endif
+ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
+ extern int get_kernel_syms __P ((struct kernel_sym *__table));
+ #endif /* __GLIBC__ */
+ #include <stdarg.h>
+ #include <paths.h>
+-#include <linux/version.h>
+
+ #include "klogd.h"
+ #include "ksyms.h"
diff --git a/package/sysklogd/sysklogd-susv3-legacy.patch b/package/sysklogd/sysklogd-susv3-legacy.patch
deleted file mode 100644
index 7e9a294..0000000
--- a/package/sysklogd/sysklogd-susv3-legacy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-[PATCH] replace susv3 legacy functions with modern equivalents
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- syslog.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: sysklogd-1.4.1/syslog.c
-===================================================================
---- sysklogd-1.4.1.orig/syslog.c
-+++ sysklogd-1.4.1/syslog.c
-@@ -178,7 +178,7 @@
- return;
- (void)strcat(tbuf, "\r\n");
- cnt += 2;
-- p = index(tbuf, '>') + 1;
-+ p = strchr(tbuf, '>') + 1;
- (void)write(fd, p, cnt - (p - tbuf));
- (void)close(fd);
- }
diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index 7333dfd..4731753 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -3,59 +3,54 @@
# sysklogd
#
#############################################################
-SYSKLOGD_VERSION:=1.4.1
-SYSKLOGD_SOURCE:=sysklogd-$(SYSKLOGD_VERSION).tar.gz
-SYSKLOGD_SITE:=http://www.infodrom.org/projects/sysklogd/download
-SYSKLOGD_DIR:=$(BUILD_DIR)/sysklogd-$(SYSKLOGD_VERSION)
-SYSKLOGD_SYSLOGD_BINARY:=syslogd
-SYSKLOGD_KLOGD_BINARY:=klogd
-SYSKLOGD_BINARY:=$(SYSKLOGD_KLOGD_BINARY)
-SYSKLOGD_SYSLOGD_TARGET_BINARY:=sbin/syslogd
-SYSKLOGD_KLOGD_TARGET_BINARY:=sbin/klogd
-SYSKLOGD_TARGET_BINARY:=$(SYSKLOGD_KLOGD_TARGET_BINARY)
-
-$(DL_DIR)/$(SYSKLOGD_SOURCE):
- $(call DOWNLOAD,$(SYSKLOGD_SITE),$(SYSKLOGD_SOURCE))
-
-sysklogd-source: $(DL_DIR)/$(SYSKLOGD_SOURCE)
+SYSKLOGD_VERSION = 1.5
+SYSKLOGD_SOURCE = sysklogd_$(SYSKLOGD_VERSION).orig.tar.gz
+SYSKLOGD_PATCH = sysklogd_$(SYSKLOGD_VERSION)-5.diff.gz
+SYSKLOGD_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysklogd
+
+ifneq ($(SYSKLOGD_PATCH),)
+define SYSKLOGD_DEBIAN_PATCHES
+ if [ -d $(@D)/debian/patches ]; then \
+ toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+ fi
+endef
+endif
-$(SYSKLOGD_DIR)/.unpacked: $(DL_DIR)/$(SYSKLOGD_SOURCE)
- $(ZCAT) $(DL_DIR)/$(SYSKLOGD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(SYSKLOGD_DIR) package/sysklogd/ sysklogd\*.patch
- touch $(SYSKLOGD_DIR)/.unpacked
+SYSKLOGD_POST_PATCH_HOOKS = SYSKLOGD_DEBIAN_PATCHES
-$(SYSKLOGD_DIR)/$(SYSKLOGD_BINARY): $(SYSKLOGD_DIR)/.unpacked
- $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS)" -C $(SYSKLOGD_DIR)
- $(STRIPCMD) $(SYSKLOGD_DIR)/$(SYSKLOGD_SYSLOGD_BINARY)
- $(STRIPCMD) $(SYSKLOGD_DIR)/$(SYSKLOGD_KLOGD_BINARY)
+define SYSKLOGD_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+endef
-$(TARGET_DIR)/$(SYSKLOGD_TARGET_BINARY): $(SYSKLOGD_DIR)/$(SYSKLOGD_BINARY)
- $(INSTALL) -m 0755 -D $(SYSKLOGD_DIR)/$(SYSKLOGD_SYSLOGD_BINARY) $(TARGET_DIR)/$(SYSKLOGD_SYSLOGD_TARGET_BINARY)
- $(INSTALL) -m 0755 -D $(SYSKLOGD_DIR)/$(SYSKLOGD_KLOGD_BINARY) $(TARGET_DIR)/$(SYSKLOGD_KLOGD_TARGET_BINARY)
+define SYSKLOGD_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0500 $(@D)/syslogd $(TARGET_DIR)/usr/sbin/syslogd
+ $(INSTALL) -D -m 0500 $(@D)/klogd $(TARGET_DIR)/usr/sbin/klogd
+ $(INSTALL) -D -m 0644 $(@D)/sysklogd.8 $(TARGET_DIR)/usr/share/man/man8/sysklogd.8
+ $(INSTALL) -D -m 0644 $(@D)/syslogd.8 $(TARGET_DIR)/usr/share/man/man8/syslogd.8
+ $(INSTALL) -D -m 0644 $(@D)/syslog.conf.5 $(TARGET_DIR)/usr/share/man/man5/syslog.conf.5
+ $(INSTALL) -D -m 0644 $(@D)/klogd.8 $(TARGET_DIR)/usr/share/man/man8/klogd.8
if [ ! -f $(TARGET_DIR)/etc/init.d/S25syslog ]; then \
- $(INSTALL) -m 0755 -D package/sysklogd/S25syslog $(TARGET_DIR)/etc/init.d; \
+ $(INSTALL) -D -m 0755 package/sysklogd/S25syslog $(TARGET_DIR)/etc/init.d; \
fi
if [ ! -f $(TARGET_DIR)/etc/syslog.conf ]; then \
- $(INSTALL) -m 0644 -D package/sysklogd/syslog.conf $(TARGET_DIR)/etc/syslog.conf; \
+ $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf $(TARGET_DIR)/etc/syslog.conf; \
fi
-
-sysklogd: $(TARGET_DIR)/$(SYSKLOGD_TARGET_BINARY)
-
-sysklogd-clean:
- rm -f $(TARGET_DIR)/$(SYSKLOGD_SYSLOGD_TARGET_BINARY)
- rm -f $(TARGET_DIR)/$(SYSKLOGD_KLOGD_TARGET_BINARY)
+endef
+
+define SYSKLOGD_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/syslogd
+ rm -f $(TARGET_DIR)/usr/sbin/klogd
+ rm -f $(TARGET_DIR)/usr/share/man/man8/sysklogd.8
+ rm -f $(TARGET_DIR)/usr/share/man/man8/syslogd.8
+ rm -f $(TARGET_DIR)/usr/share/man/man5/syslog.conf.5
+ rm -f $(TARGET_DIR)/usr/share/man/man8/klogd.8
rm -f $(TARGET_DIR)/etc/init.d/S25syslogd
rm -f $(TARGET_DIR)/etc/syslog.conf
- -$(MAKE) -C $(SYSKLOGD_DIR) clean
+endef
-sysklogd-dirclean:
- rm -rf $(SYSKLOGD_DIR)
+define SYSKLOGD_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
-TARGETS+=sysklogd
-endif
+$(eval $(call GENTARGETS,package,sysklogd))
diff --git a/package/sysklogd/sysklogd.patch b/package/sysklogd/sysklogd.patch
deleted file mode 100644
index 393a1a3..0000000
--- a/package/sysklogd/sysklogd.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- sysklogd-1.4.1/module.h.orig 1970-01-01 10:00:00.000000000 +1000
-+++ sysklogd-1.4.1/module.h 2005-11-24 01:40:09.000000000 +1000
-@@ -0,0 +1,62 @@
-+/* this file eliminates the need to include <kernel/module.h> */
-+/* Module definitions for klogd's module support */
-+struct kernel_sym
-+{
-+ unsigned long value;
-+ char name[60];
-+};
-+
-+struct module_symbol
-+{
-+ unsigned long value;
-+ const char *name;
-+};
-+
-+struct module_ref
-+{
-+ struct module *dep; /* "parent" pointer */
-+ struct module *ref; /* "child" pointer */
-+ struct module_ref *next_ref;
-+};
-+
-+struct module_info
-+{
-+ unsigned long addr;
-+ unsigned long size;
-+ unsigned long flags;
-+ long usecount;
-+};
-+
-+
-+typedef struct { volatile int counter; } atomic_t;
-+
-+struct module
-+{
-+ unsigned long size_of_struct; /* == sizeof(module) */
-+ struct module *next;
-+ const char *name;
-+ unsigned long size;
-+
-+ union
-+ {
-+ atomic_t usecount;
-+ long pad;
-+ } uc; /* Needs to keep its size - so says rth */
-+
-+ unsigned long flags; /* AUTOCLEAN et al */
-+
-+ unsigned nsyms;
-+ unsigned ndeps;
-+
-+ struct module_symbol *syms;
-+ struct module_ref *deps;
-+ struct module_ref *refs;
-+ int (*init)(void);
-+ void (*cleanup)(void);
-+ const struct exception_table_entry *ex_table_start;
-+ const struct exception_table_entry *ex_table_end;
-+#ifdef __alpha__
-+ unsigned long gp;
-+#endif
-+};
-+
-
---- sysklogd-1.4.1/ksym_mod.c.orig 2005-11-24 23:15:01.000000000 +1000
-+++ sysklogd-1.4.1/ksym_mod.c 2005-11-24 23:11:54.000000000 +1000
-@@ -89,17 +89,21 @@
- #include <errno.h>
- #include <sys/fcntl.h>
- #include <sys/stat.h>
-+#include <linux/version.h>
- #if !defined(__GLIBC__)
- #include <linux/time.h>
- #include <linux/module.h>
- #else /* __GLIBC__ */
-+#if LINUX_VERSION_CODE >= 0x20500
-+#include "module.h"
-+#else
- #include <linux/module.h>
-+#endif
- extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
- extern int get_kernel_syms __P ((struct kernel_sym *__table));
- #endif /* __GLIBC__ */
- #include <stdarg.h>
- #include <paths.h>
--#include <linux/version.h>
-
- #include "klogd.h"
- #include "ksyms.h"
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 6/9] slang: convert to gentargets
From: Martin Banky @ 2010-10-08 8:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286527389-29983-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/slang/slang.mk | 93 +++++++++++++++++++++++------------------------
1 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index 43e910b..f6e6eb1 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -3,51 +3,50 @@
# slang
#
#############################################################
-SLANG_VERSION:=1.4.5
-SLANG_SOURCE=slang-$(SLANG_VERSION)-mini.tar.bz2
-SLANG_CAT:=$(BZCAT)
-SLANG_SITE:=http://www.uclibc.org/
-SLANG_DIR=$(BUILD_DIR)/slang-$(SLANG_VERSION)-mini
-
-$(DL_DIR)/$(SLANG_SOURCE):
- $(call DOWNLOAD,$(SLANG_SITE),$(SLANG_SOURCE))
-
-$(SLANG_DIR): $(DL_DIR)/$(SLANG_SOURCE)
- $(SLANG_CAT) $(DL_DIR)/$(SLANG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-
-$(SLANG_DIR)/libslang.so: $(SLANG_DIR)
- $(MAKE1) CFLAGS="-Os -g -fPIC $(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(SLANG_DIR)
-
-$(STAGING_DIR)/usr/lib/libslang.so.1: $(SLANG_DIR)/libslang.so
- cp -dpf $(SLANG_DIR)/libslang.a $(STAGING_DIR)/usr/lib
- cp -dpf $(SLANG_DIR)/libslang.so $(STAGING_DIR)/usr/lib
- cp -dpf $(SLANG_DIR)/slang.h $(STAGING_DIR)/usr/include
- cp -dpf $(SLANG_DIR)/slcurses.h $(STAGING_DIR)/usr/include
+SLANG_VERSION = 1.4.5
+SLANG_SOURCE = slang-$(SLANG_VERSION)-mini.tar.bz2
+SLANG_SITE = http://www.uclibc.org/
+SLANG_INSTALL_STAGING = YES
+
+define SLANG_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+endef
+
+define SLANG_INSTALL_STAGING_CMDS
+ $(INSTALL) -D -m 0644 $(@D)/libslang.a $(STAGING_DIR)/usr/lib/libslang.a
+ $(INSTALL) -D -m 0755 $(@D)/libslang.so $(STAGING_DIR)/usr/lib/libslang.so
+ $(INSTALL) -D -m 0644 $(@D)/slang.h $(STAGING_DIR)/usr/include/slang.h
+ $(INSTALL) -D -m 0644 $(@D)/slcurses.h $(STAGING_DIR)/usr/include/slcurses.h
(cd $(STAGING_DIR)/usr/lib; ln -fs libslang.so libslang.so.1)
- touch -c $@
-
-$(TARGET_DIR)/usr/lib/libslang.so.1: $(STAGING_DIR)/usr/lib/libslang.so.1
- cp -dpf $(STAGING_DIR)/usr/lib/libslang.so* $(TARGET_DIR)/usr/lib/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libslang.so*
-
-slang: $(STAGING_DIR)/usr/lib/libslang.so.1 $(TARGET_DIR)/usr/lib/libslang.so.1
-
-slang-source: $(DL_DIR)/$(SLANG_SOURCE)
-
-slang-clean:
- rm -f $(TARGET_DIR)/usr/lib/libslang.so* $(STAGING_DIR)/usr/lib/libslang.a \
- $(STAGING_DIR)/usr/include/slang.h \
- $(STAGING_DIR)/usr/include/slcurses.h
- -$(MAKE) -C $(SLANG_DIR) clean
-
-slang-dirclean:
- rm -rf $(SLANG_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SLANG),y)
-TARGETS+=slang
-endif
+endef
+
+define SLANG_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0644 $(@D)/libslang.a $(TARGET_DIR)/usr/lib/libslang.a
+ $(INSTALL) -D -m 0755 $(@D)/libslang.so $(TARGET_DIR)/usr/lib/libslang.so
+ $(INSTALL) -D -m 0644 $(@D)/slang.h $(TARGET_DIR)/usr/include/slang.h
+ $(INSTALL) -D -m 0644 $(@D)/slcurses.h $(TARGET_DIR)/usr/include/slcurses.h
+ (cd $(TARGET_DIR)/usr/lib; ln -fs libslang.so libslang.so.1)
+endef
+
+define SLANG_UNINSTALL_STAGING_CMDS
+ rm -f $(STAGING_DIR)/usr/lib/libslang.a
+ rm -f $(STAGING_DIR)/usr/lib/libslang.so
+ rm -f $(STAGING_DIR)/usr/lib/libslang.so.1
+ rm -f $(STAGING_DIR)/usr/include/slang.h
+ rm -f $(STAGING_DIR)/usr/include/slcurses.h
+endef
+
+define SLANG_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libslang.a
+ rm -f $(TARGET_DIR)/usr/lib/libslang.so
+ rm -f $(TARGET_DIR)/usr/lib/libslang.so.1
+ rm -f $(TARGET_DIR)/usr/include/slang.h
+ rm -f $(TARGET_DIR)/usr/include/slcurses.h
+endef
+
+define SLANG_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
+
+$(eval $(call GENTARGETS,package,slang))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 5/9] sfdisk: convert to autotargets and change to util-linux-ng v2.18 version
From: Martin Banky @ 2010-10-08 8:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286527389-29983-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/sfdisk/Config.in | 2 +
.../sfdisk/sfdisk.001.include_sys_syscalls_h.patch | 12 ---
package/sfdisk/sfdisk.005.no-llseek-fix.patch | 21 -----
package/sfdisk/sfdisk.010.index-rindex-fix-2.patch | 45 ----------
package/sfdisk/sfdisk.mk | 87 ++++++++++++--------
5 files changed, 54 insertions(+), 113 deletions(-)
delete mode 100644 package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch
delete mode 100644 package/sfdisk/sfdisk.005.no-llseek-fix.patch
delete mode 100644 package/sfdisk/sfdisk.010.index-rindex-fix-2.patch
diff --git a/package/sfdisk/Config.in b/package/sfdisk/Config.in
index d7b8fb4..a86a529 100644
--- a/package/sfdisk/Config.in
+++ b/package/sfdisk/Config.in
@@ -2,3 +2,5 @@ config BR2_PACKAGE_SFDISK
bool "sfdisk"
help
Partition table manipulator for Linux.
+
+ http://www.kernel.org/pub/linux/utils/util-linux-ng/
diff --git a/package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch b/package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch
deleted file mode 100644
index dd35951..0000000
--- a/package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- sfdisk/sfdisk.c.oorig 2006-10-09 16:24:06.000000000 +0200
-+++ sfdisk/sfdisk.c 2006-10-09 16:24:20.000000000 +0200
-@@ -47,6 +47,9 @@
- #include <sys/stat.h>
- #include <sys/utsname.h>
- #ifdef __linux__
-+#define _LIBC
-+#include <sys/syscall.h>
-+#undef _LIBC
- #include <linux/unistd.h> /* _syscall */
- #endif
- #include "nls.h"
diff --git a/package/sfdisk/sfdisk.005.no-llseek-fix.patch b/package/sfdisk/sfdisk.005.no-llseek-fix.patch
deleted file mode 100644
index 4ea571c..0000000
--- a/package/sfdisk/sfdisk.005.no-llseek-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur sfdisk_vanilla/sfdisk.c sfdisk_llseek-fix/sfdisk.c
---- sfdisk_vanilla/sfdisk.c 2004-01-13 13:03:11.000000000 +0000
-+++ sfdisk_llseek-fix/sfdisk.c 2008-04-17 08:42:35.000000000 +0000
-@@ -134,9 +137,17 @@
- * Note: we use 512-byte sectors here, irrespective of the hardware ss.
- */
- #if defined(__linux__) && !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__)
-+#if defined(_llseek)
- static
- _syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo,
- loff_t *, res, unsigned int, wh);
-+#else
-+static int _llseek (unsigned int fd, unsigned long oh,
-+ unsigned long ol, long long *result,
-+ unsigned int origin) {
-+ return syscall (__NR__llseek, fd, oh, ol, result, origin);
-+#endif
-+}
- #endif
-
- static int
diff --git a/package/sfdisk/sfdisk.010.index-rindex-fix-2.patch b/package/sfdisk/sfdisk.010.index-rindex-fix-2.patch
deleted file mode 100644
index b3ca81d..0000000
--- a/package/sfdisk/sfdisk.010.index-rindex-fix-2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru sfdisk_vanilla/sfdisk.c sfdisk_index-rindex-fix/sfdisk.c
---- sfdisk_vanilla/sfdisk.c 2004-01-13 13:03:11.000000000 +0000
-+++ sfdisk_index-rindex-fix/sfdisk.c 2008-04-17 13:44:40.000000000 +0000
-@@ -40,7 +40,7 @@
- #include <unistd.h> /* read, write */
- #include <fcntl.h> /* O_RDWR */
- #include <errno.h> /* ERANGE */
--#include <string.h> /* index() */
-+#include <string.h> /* strchr, strrchr */
- #include <ctype.h>
- #include <getopt.h>
- #include <sys/ioctl.h>
-@@ -1672,12 +1672,12 @@
- eof = 1;
- return RD_EOF;
- }
-- if (!(lp = index(lp, '\n')))
-+ if (!(lp = strchr(lp, '\n')))
- fatal(_("long or incomplete input line - quitting\n"));
- *lp = 0;
-
- /* remove comments, if any */
-- if ((lp = index(line+2, '#')) != 0)
-+ if ((lp = strchr(line+2, '#')) != 0)
- *lp = 0;
-
- /* recognize a few commands - to be expanded */
-@@ -1687,7 +1687,7 @@
- }
-
- /* dump style? - then bad input is fatal */
-- if ((ip = index(line+2, ':')) != 0) {
-+ if ((ip = strchr(line+2, ':')) != 0) {
- struct dumpfld *d;
-
- nxtfld:
-@@ -2436,7 +2436,7 @@
-
- if (argc < 1)
- fatal(_("no command?\n"));
-- if ((progn = rindex(argv[0], '/')) == NULL)
-+ if ((progn = strrchr(argv[0], '/')) == NULL)
- progn = argv[0];
- else
- progn++;
diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk
index 81c4943..00e8b4d 100644
--- a/package/sfdisk/sfdisk.mk
+++ b/package/sfdisk/sfdisk.mk
@@ -3,47 +3,64 @@
# sfdisk support
#
#############################################################
-SFDISK_VERSION:=
-SFDISK_SOURCE=sfdisk$(SFDISK_VERSION).tar.bz2
-SFDISK_CAT:=$(BZCAT)
-SFDISK_SITE:=http://www.uclibc.org/
-SFDISK_DIR=$(BUILD_DIR)/sfdisk$(SFDISK_VERSION)
+SFDISK_VERSION = 2.18
+SFDISK_SOURCE = util-linux-ng-$(SFDISK_VERSION).tar.bz2
+SFDISK_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux-ng/$(SFDISK_VERSION)
-$(DL_DIR)/$(SFDISK_SOURCE):
- $(call DOWNLOAD,$(SFDISK_SITE),$(SFDISK_SOURCE))
-
-$(SFDISK_DIR)/.patched: $(DL_DIR)/$(SFDISK_SOURCE)
- $(SFDISK_CAT) $(DL_DIR)/$(SFDISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(SFDISK_DIR) package/sfdisk/ sfdisk.\*.patch
- touch $@
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+ifeq ($(BR2_USE_WCHAR),)
+# build with non-wide ncurses, default is wide version
+SFDISK_CONF_OPT += --with-ncurses
+endif
+SFDISK_DEPENDENCIES += ncurses
+else
+# --without-ncurses disables all ncurses(w) support
+SFDISK_CONF_OPT += --without-ncurses
+endif
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+SFDISK_DEPENDENCIES += gettext libintl
+SFDISK_MAKE_OPT += LIBS=-lintl
+endif
-$(SFDISK_DIR)/sfdisk: $(SFDISK_DIR)/.patched
- $(MAKE) \
- CROSS=$(TARGET_CROSS) DEBUG=false OPTIMIZATION="$(TARGET_CFLAGS)" \
- DOLFS=$(if $(BR2_LARGEFILE),true,false) -C $(SFDISK_DIR)
- -$(STRIPCMD) $(SFDISK_DIR)/sfdisk
- touch -c $(SFDISK_DIR)/sfdisk
+ifneq ($(BR2_GCC_ENABLE_TLS),y)
+SFDISK_CONF_OPT += --disable-tls
+endif
-$(TARGET_DIR)/sbin/sfdisk: $(SFDISK_DIR)/sfdisk
- cp $(SFDISK_DIR)/sfdisk $(TARGET_DIR)/sbin/sfdisk
- touch -c $(TARGET_DIR)/sbin/sfdisk
+SFDISK_CONF_OPT += --datadir=/usr/share \
+ --localstatedir=/var \
+ --disable-rpath \
+ --disable-mount \
+ --disable-fsck \
+ --disable-libuuid \
+ --disable-uuidd \
+ --disable-libblkid \
+ --disable-libmount \
+ --disable-agetty \
+ --disable-cramfs \
+ --disable-switch_root \
+ --disable-pivot_root \
+ --disable-fallocate \
+ --disable-unshare \
+ --disable-rename \
+ --disable-schedutils \
+ --disable-login-utils \
+ --disable-partx
-sfdisk: $(TARGET_DIR)/sbin/sfdisk
+define SFDISK_BUILD_CMDS
+ (cd $(@D); \
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/fdisk sfdisk \
+ )
+endef
-sfdisk-source: $(DL_DIR)/$(SFDISK_SOURCE)
+define SFDISK_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/fdisk/sfdisk $(TARGET_DIR)/sbin/sfdisk
+ $(INSTALL) -D -m 0644 $(@D)/fdisk/sfdisk.8 $(TARGET_DIR)/usr/share/man/man8/sfdisk.8
+endef
-sfdisk-clean:
+define SFDISK_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/sbin/sfdisk
- -$(MAKE) -C $(SFDISK_DIR) clean
+ rm -f $(TARGET_DIR)/usr/share/man/man8/sfdisk.8
+endef
-sfdisk-dirclean:
- rm -rf $(SFDISK_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SFDISK),y)
-TARGETS+=sfdisk
-endif
+$(eval $(call AUTOTARGETS,package,sfdisk))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 4/9] sed: convert to autotargets
From: Martin Banky @ 2010-10-08 8:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286527389-29983-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/sed/sed.mk | 83 ++++++---------------------------------------------
1 files changed, 10 insertions(+), 73 deletions(-)
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index d6f53be..1a313eb 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -3,41 +3,11 @@
# sed
#
#############################################################
-SED_VERSION:=4.2.1
-SED_SOURCE:=sed-$(SED_VERSION).tar.gz
-SED_SITE:=$(BR2_GNU_MIRROR)/sed
-SED_CAT:=$(ZCAT)
-SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VERSION)
-SED_BINARY:=sed/sed
-SED_TARGET_BINARY:=bin/sed
-ifeq ($(BR2_LARGEFILE),y)
-SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64
-endif
+SED_VERSION = 4.2.1
+SED_SOURCE = sed-$(SED_VERSION).tar.gz
+SED_SITE = $(BR2_GNU_MIRROR)/sed
-$(DL_DIR)/$(SED_SOURCE):
- mkdir -p $(DL_DIR)
- $(call DOWNLOAD,$(SED_SITE),$(SED_SOURCE))
-
-sed-source: $(DL_DIR)/$(SED_SOURCE)
-
-$(SED_DIR2)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
- $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(CONFIG_UPDATE) $(SED_DIR2)/build-aux
- touch $@
-
-$(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
- (cd $(SED_DIR2); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- CPPFLAGS="$(SED_CPPFLAGS)" \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
+SED_CONF_OPT = --bindir=/usr/bin \
--libdir=/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
@@ -45,45 +15,12 @@ $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
--localstatedir=/var \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --include=$(STAGING_DIR)/usr/include \
- $(DISABLE_NLS) \
- )
- touch $@
-
-$(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured
- $(MAKE) -C $(SED_DIR2)
-
-# This stuff is needed to work around GNU make deficiencies
-sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
- @if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ]; then \
- rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); \
- fi
-
- @if [ ! -f $(SED_DIR2)/$(SED_BINARY) \
- -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \
- -ot $(SED_DIR2)/$(SED_BINARY) ]; then \
- set -x; \
- $(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(SED_DIR2) install; \
- mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \
- rm -rf $(TARGET_DIR)/share/locale; \
- rm -rf $(TARGET_DIR)/usr/share/doc; \
- fi
+ --include=$(STAGING_DIR)/usr/include
-sed: sed-target_binary
+define SED_MOVE_BINARY
+ mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/
+endef
-sed-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(SED_DIR2) uninstall
- -$(MAKE) -C $(SED_DIR2) clean
+SED_POST_INSTALL_TARGET_HOOKS = SED_MOVE_BINARY
-sed-dirclean:
- rm -rf $(SED_DIR2)
-
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SED),y)
-TARGETS+=sed
-endif
+$(eval $(call AUTOTARGETS,package,sed))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 3/9] proftpd: convert to autotargets and bump to 1.3.3b
From: Martin Banky @ 2010-10-08 8:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286527389-29983-1-git-send-email-Martin.Banky@gmail.com>
Also, added web site to Config.in
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/proftpd/Config.in | 1 +
| 12 ---
| 12 +++
package/proftpd/proftpd.mk | 83 +++++---------------
4 files changed, 34 insertions(+), 74 deletions(-)
delete mode 100644 package/proftpd/proftpd-1.3.1-fix-kernel-header-capability-version.patch
create mode 100644 package/proftpd/proftpd-1.3.3b-fix-kernel-header-capability-version.patch
diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in
index d495643..abdedc9 100644
--- a/package/proftpd/Config.in
+++ b/package/proftpd/Config.in
@@ -3,3 +3,4 @@ config BR2_PACKAGE_PROFTPD
help
ProFTPD, a highly configurable FTP server.
+ http://www.proftpd.org/
diff --git a/package/proftpd/proftpd-1.3.1-fix-kernel-header-capability-version.patch b/package/proftpd/proftpd-1.3.1-fix-kernel-header-capability-version.patch
deleted file mode 100644
index 2899c7f..0000000
--- a/package/proftpd/proftpd-1.3.1-fix-kernel-header-capability-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/libcap/libcap.h 2008-04-24 19:46:29.475883739 +0200
-+++ b/lib/libcap/libcap.h 2008-04-24 19:48:31.116088563 +0200
-@@ -52,7 +52,8 @@
- */
-
- #if !defined(_LINUX_CAPABILITY_VERSION) || \
-- (_LINUX_CAPABILITY_VERSION != 0x19980330)
-+ ((_LINUX_CAPABILITY_VERSION != 0x19980330) && \
-+ (_LINUX_CAPABILITY_VERSION != 0x20071026))
-
- # error "Kernel <linux/capability.h> does not match library"
- # error "file "libcap.h" --> fix and recompile libcap"
--git a/package/proftpd/proftpd-1.3.3b-fix-kernel-header-capability-version.patch b/package/proftpd/proftpd-1.3.3b-fix-kernel-header-capability-version.patch
new file mode 100644
index 0000000..4401c9a
--- /dev/null
+++ b/package/proftpd/proftpd-1.3.3b-fix-kernel-header-capability-version.patch
@@ -0,0 +1,12 @@
+--- a/lib/libcap/libcap.h 2008-08-22 19:49:48.000000000 -0700
++++ b/lib/libcap/libcap.h 2010-10-06 15:31:11.000000000 -0700
+@@ -65,7 +65,8 @@ struct _cap_struct {
+ */
+
+ #if !defined(_LINUX_CAPABILITY_VERSION_1) || \
+- (_LINUX_CAPABILITY_VERSION_1 != 0x19980330)
++ ((_LINUX_CAPABILITY_VERSION_1 != 0x19980330) && \
++ (_LINUX_CAPABILITY_VERSION_1 != 0x20071026))
+
+ # error "Kernel <linux/capability.h> does not match library"
+ # error "file "libcap.h" --> fix and recompile libcap"
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 11ef1ef..191f611 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -3,83 +3,42 @@
# proftpd
#
#############################################################
-PROFTPD_VERSION:=1.3.1
-PROFTPD_SOURCE:=proftpd-$(PROFTPD_VERSION).tar.bz2
-PROFTPD_SITE:=ftp://ftp.proftpd.org/distrib/source/
-PROFTPD_DIR:=$(BUILD_DIR)/proftpd-$(PROFTPD_VERSION)
-PROFTPD_CAT:=$(BZCAT)
-PROFTPD_BINARY:=proftpd
-PROFTPD_TARGET_BINARY:=usr/sbin/proftpd
+PROFTPD_VERSION = 1.3.3b
+PROFTPD_SOURCE = proftpd-$(PROFTPD_VERSION).tar.bz2
+PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source/
-ifeq ($(BR2_INET_IPV6),y)
-ENABLE_IPV6:=--enable-ipv6
-endif
+PROFTPD_CONF_ENV = ac_cv_func_setpgrp_void=yes \
+ ac_cv_func_setgrent_void=yes
-$(DL_DIR)/$(PROFTPD_SOURCE):
- $(call DOWNLOAD,$(PROFTPD_SITE),$(PROFTPD_SOURCE))
-
-proftpd-source: $(DL_DIR)/$(PROFTPD_SOURCE)
-
-$(PROFTPD_DIR)/.unpacked: $(DL_DIR)/$(PROFTPD_SOURCE)
- $(PROFTPD_CAT) $(DL_DIR)/$(PROFTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(CONFIG_UPDATE) $(PROFTPD_DIR)
- toolchain/patch-kernel.sh $(PROFTPD_DIR) package/proftpd/ proftpd-$(PROFTPD_VERSION)\*.patch;
- touch $@
-
-$(PROFTPD_DIR)/.configured: $(PROFTPD_DIR)/.unpacked
- (cd $(PROFTPD_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ac_cv_func_setpgrp_void=yes \
- ac_cv_func_setgrent_void=yes \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var/run \
+PROFTPD_CONF_OPT = --localstatedir=/var/run \
--disable-static \
--disable-curses \
--disable-ncurses \
--disable-facl \
--disable-dso \
--enable-shadow \
- $(DISABLE_LARGEFILE) \
- $(ENABLE_IPV6) \
- --with-gnu-ld \
- )
- touch $@
+ --with-gnu-ld
-$(PROFTPD_DIR)/$(PROFTPD_BINARY): $(PROFTPD_DIR)/.configured
- $(MAKE1) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" \
- -C $(PROFTPD_DIR)/lib/libcap _makenames
- $(MAKE1) -C $(PROFTPD_DIR)
+define PROFTPD_MAKENAMES
+ $(MAKE1) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" -C $(@D)/lib/libcap _makenames
+endef
-$(TARGET_DIR)/$(PROFTPD_TARGET_BINARY): $(PROFTPD_DIR)/$(PROFTPD_BINARY)
- cp -dpf $(PROFTPD_DIR)/$(PROFTPD_BINARY) \
- $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY)
+PROFTPD_POST_CONFIGURE_HOOKS = PROFTPD_MAKENAMES
+
+PROFTPD_MAKE=$(MAKE1)
+
+define PROFTPD_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd
@if [ ! -f $(TARGET_DIR)/etc/proftpd.conf ]; then \
- $(INSTALL) -m 0644 -D $(PROFTPD_DIR)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \
+ $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \
fi
$(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d
+endef
-proftpd: $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY)
-
-proftpd-clean:
+define PROFTPD_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY)
rm -f $(TARGET_DIR)/etc/init.d/S50proftpd
rm -f $(TARGET_DIR)/etc/proftpd.conf
- -$(MAKE) -C $(PROFTPD_DIR) clean
+endef
-proftpd-dirclean:
- rm -rf $(PROFTPD_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_PROFTPD),y)
-TARGETS+=proftpd
-endif
+$(eval $(call AUTOTARGETS,package,proftpd))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 2/9] pptp-linux: convert to gentargets and bump to 1.7.2
From: Martin Banky @ 2010-10-08 8:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286527389-29983-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
.../pptp-linux-1.7.0-001-susv3-legacy.patch | 24 ------
...tp-linux-1.7.2-000-remove-stropts-include.patch | 15 ++++
.../pptp-linux-1.7.2-001-susv3-legacy.patch | 24 ++++++
package/pptp-linux/pptp-linux.mk | 86 +++++--------------
4 files changed, 62 insertions(+), 87 deletions(-)
delete mode 100644 package/pptp-linux/pptp-linux-1.7.0-001-susv3-legacy.patch
create mode 100644 package/pptp-linux/pptp-linux-1.7.2-000-remove-stropts-include.patch
create mode 100644 package/pptp-linux/pptp-linux-1.7.2-001-susv3-legacy.patch
diff --git a/package/pptp-linux/pptp-linux-1.7.0-001-susv3-legacy.patch b/package/pptp-linux/pptp-linux-1.7.0-001-susv3-legacy.patch
deleted file mode 100644
index f41b63f..0000000
--- a/package/pptp-linux/pptp-linux-1.7.0-001-susv3-legacy.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rdup pptp-linux-1.7.0/pptp_callmgr.c pptp-linux-1.7.0.orig/pptp_callmgr.c
---- pptp-linux-1.7.0/pptp_callmgr.c 2005-07-28 03:15:11.000000000 +0200
-+++ pptp-linux-1.7.0.orig/pptp_callmgr.c 2007-08-24 09:20:39.000000000 +0200
-@@ -314,7 +314,7 @@ int open_inetsock(struct in_addr inetadd
- return s;
- }
- if (localbind.s_addr != INADDR_NONE) {
-- bzero(&src, sizeof(src));
-+ memset(&src, 0, sizeof(src));
- src.sin_family = AF_INET;
- src.sin_addr = localbind;
- if (bind(s, (struct sockaddr *) &src, sizeof(src)) != 0) {
-diff -rdup pptp-linux-1.7.0/pptp_gre.c pptp-linux-1.7.0.orig/pptp_gre.c
---- pptp-linux-1.7.0/pptp_gre.c 2005-07-28 03:15:11.000000000 +0200
-+++ pptp-linux-1.7.0.orig/pptp_gre.c 2007-08-24 09:20:56.000000000 +0200
-@@ -81,7 +81,7 @@ int pptp_gre_bind(struct in_addr inetadd
- int s = socket(AF_INET, SOCK_RAW, PPTP_PROTO);
- if (s < 0) { warn("socket: %s", strerror(errno)); return -1; }
- if (localbind.s_addr != INADDR_NONE) {
-- bzero(&loc_addr, sizeof(loc_addr));
-+ memset(&loc_addr, 0, sizeof(loc_addr));
- loc_addr.sin_family = AF_INET;
- loc_addr.sin_addr = localbind;
- if (bind(s, (struct sockaddr *) &loc_addr, sizeof(loc_addr)) != 0) {
diff --git a/package/pptp-linux/pptp-linux-1.7.2-000-remove-stropts-include.patch b/package/pptp-linux/pptp-linux-1.7.2-000-remove-stropts-include.patch
new file mode 100644
index 0000000..ec38fbe
--- /dev/null
+++ b/package/pptp-linux/pptp-linux-1.7.2-000-remove-stropts-include.patch
@@ -0,0 +1,15 @@
+Removed erronous inclusion of stropts.h.
+
+uClibc does not provide support for streaming, and the inclusion of stropts.h
+is not needed anyway.
+
+--- a/pptp_compat.c 2008-05-13 23:33:55.000000000 -0700
++++ b/pptp_compat.c 2010-10-06 12:11:39.000000000 -0700
+@@ -7,7 +7,6 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <stropts.h>
+ #include <stdlib.h>
+ #include <strings.h>
+ #include "pptp_compat.h"
diff --git a/package/pptp-linux/pptp-linux-1.7.2-001-susv3-legacy.patch b/package/pptp-linux/pptp-linux-1.7.2-001-susv3-legacy.patch
new file mode 100644
index 0000000..f41b63f
--- /dev/null
+++ b/package/pptp-linux/pptp-linux-1.7.2-001-susv3-legacy.patch
@@ -0,0 +1,24 @@
+diff -rdup pptp-linux-1.7.0/pptp_callmgr.c pptp-linux-1.7.0.orig/pptp_callmgr.c
+--- pptp-linux-1.7.0/pptp_callmgr.c 2005-07-28 03:15:11.000000000 +0200
++++ pptp-linux-1.7.0.orig/pptp_callmgr.c 2007-08-24 09:20:39.000000000 +0200
+@@ -314,7 +314,7 @@ int open_inetsock(struct in_addr inetadd
+ return s;
+ }
+ if (localbind.s_addr != INADDR_NONE) {
+- bzero(&src, sizeof(src));
++ memset(&src, 0, sizeof(src));
+ src.sin_family = AF_INET;
+ src.sin_addr = localbind;
+ if (bind(s, (struct sockaddr *) &src, sizeof(src)) != 0) {
+diff -rdup pptp-linux-1.7.0/pptp_gre.c pptp-linux-1.7.0.orig/pptp_gre.c
+--- pptp-linux-1.7.0/pptp_gre.c 2005-07-28 03:15:11.000000000 +0200
++++ pptp-linux-1.7.0.orig/pptp_gre.c 2007-08-24 09:20:56.000000000 +0200
+@@ -81,7 +81,7 @@ int pptp_gre_bind(struct in_addr inetadd
+ int s = socket(AF_INET, SOCK_RAW, PPTP_PROTO);
+ if (s < 0) { warn("socket: %s", strerror(errno)); return -1; }
+ if (localbind.s_addr != INADDR_NONE) {
+- bzero(&loc_addr, sizeof(loc_addr));
++ memset(&loc_addr, 0, sizeof(loc_addr));
+ loc_addr.sin_family = AF_INET;
+ loc_addr.sin_addr = localbind;
+ if (bind(s, (struct sockaddr *) &loc_addr, sizeof(loc_addr)) != 0) {
diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index 8de0832..fd7d118 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -3,76 +3,36 @@
# pptp-linux
#
#############################################################
-PPTP_LINUX_VERSION:=1.7.0
-PPTP_LINUX_SOURCE:=pptp-linux_$(PPTP_LINUX_VERSION).orig.tar.gz
-#PPTP_LINUX_PATCH:=pptp-linux_$(PPTP_LINUX_VERSION)-2.diff.gz
-PPTP_LINUX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/p/pptp-linux
-PPTP_LINUX_DIR:=$(BUILD_DIR)/pptp-linux-$(PPTP_LINUX_VERSION).orig
-PPTP_LINUX_CAT:=$(ZCAT)
-PPTP_LINUX_BINARY:=pptp
-PPTP_LINUX_TARGET_BINARY:=usr/sbin/pptp
+PPTP_LINUX_VERSION = 1.7.2
+PPTP_LINUX_SOURCE = pptp-linux_$(PPTP_LINUX_VERSION).orig.tar.gz
+#PPTP_LINUX_PATCH = pptp-linux_$(PPTP_LINUX_VERSION)-6.diff.gz
+PPTP_LINUX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/p/pptp-linux
-$(DL_DIR)/$(PPTP_LINUX_SOURCE):
- $(call DOWNLOAD,$(PPTP_LINUX_SITE),$(PPTP_LINUX_SOURCE))
-
-ifneq ($(PPTP_LINUX_PATCH),)
-PPTP_LINUX_PATCH_FILE:=$(DL_DIR)/$(PPTP_LINUX_PATCH)
-$(PPTP_LINUX_PATCH_FILE):
- $(call DOWNLOAD,$(PPTP_LINUX_SITE),$(PPTP_LINUX_PATCH))
-endif
-
-$(PPTP_LINUX_DIR)/.unpacked: $(DL_DIR)/$(PPTP_LINUX_SOURCE) $(PPTP_LINUX_PATCH_FILE)
- $(PPTP_LINUX_CAT) $(DL_DIR)/$(PPTP_LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifneq ($(PPTP_LINUX_PATCH),)
- (cd $(PPTP_LINUX_DIR) && $(PPTP_LINUX_CAT) $(DL_DIR)/$(PPTP_LINUX_PATCH) | patch -p1)
- if [ -d $(PPTP_LINUX_DIR)/debian/patches ]; then \
- toolchain/patch-kernel.sh $(PPTP_LINUX_DIR) $(PPTP_LINUX_DIR)/debian/patches \*.patch; \
+define PPTP_LINUX_DEBIAN_PATCHES
+ if [ -d $(@D)/debian/patches ]; then \
+ toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.diff; \
fi
+endef
endif
- toolchain/patch-kernel.sh $(PPTP_LINUX_DIR) package/pptp-linux/ pptp-linux\*.patch
- touch $@
-
-$(PPTP_LINUX_DIR)/.configured: $(PPTP_LINUX_DIR)/.unpacked
- (cd $(PPTP_LINUX_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- $(DISABLE_LARGEFILE) \
- )
- touch $@
-$(PPTP_LINUX_DIR)/$(PPTP_LINUX_BINARY): $(PPTP_LINUX_DIR)/.unpacked
- $(MAKE) $(TARGET_CONFIGURE_OPTS) OPTIMIZE="$(TARGET_CFLAGS)" \
- -C $(PPTP_LINUX_DIR)
+PPTP_LINUX_POST_PATCH_HOOKS = PPTP_LINUX_DEBIAN_PATCHES
-$(TARGET_DIR)/$(PPTP_LINUX_TARGET_BINARY): $(PPTP_LINUX_DIR)/$(PPTP_LINUX_BINARY)
- cp -dpf $(PPTP_LINUX_DIR)/$(PPTP_LINUX_BINARY) $@
-ifeq ($(BR2_HAVE_DOCUMENTATION),y)
- mkdir -p $(TARGET_DIR)/usr/share/man/man8
- $(INSTALL) -m 644 $(PPTP_LINUX_DIR)/pptp.8 $(TARGET_DIR)/usr/share/man/man8/pptp.8
-endif
- $(STRIPCMD) $(STRIP_STRIP_ALL) $@
+define PPTP_LINUX_BUILD_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) OPTIMIZE="$(TARGET_CFLAGS)" -C $(@D)
+endef
-pptp-linux: $(TARGET_DIR)/$(PPTP_LINUX_TARGET_BINARY)
+define PPTP_LINUX_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 755 $(@D)/pptp $(TARGET_DIR)/usr/sbin/pptp
+ $(INSTALL) -D -m 644 $(@D)/pptp.8 $(TARGET_DIR)/usr/share/man/man8/pptp.8
+endef
-pptp-linux-source: $(DL_DIR)/$(PPTP_LINUX_SOURCE) $(PPTP_LINUX_PATCH_FILE)
+define PPTP_LINUX_UNINSTALL_TARGET_CMDS
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
+endef
-pptp-linux-clean:
- -$(MAKE) -C $(PPTP_LINUX_DIR) distclean
- rm -f $(TARGET_DIR)/$(PPTP_LINUX_TARGET_BINARY) \
- $(TARGET_DIR)/usr/share/man/man8/pptp.8*
+define PPTP_LINUX_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
-pptp-linux-dirclean:
- rm -rf $(PPTP_LINUX_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_PPTP_LINUX),y)
-TARGETS+=pptp-linux
-endif
+$(eval $(call GENTARGETS,package,pptp-linux))
--
1.7.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 1/9] portmap: convert to gentargets and bump to 6.0.0
From: Martin Banky @ 2010-10-08 8:43 UTC (permalink / raw)
To: buildroot
portmap has a new maintainer, Neil Brown, who has made some updates to portmap.
Also, changed the download location to Debian to get the latest patches.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/portmap/Config.in | 2 +-
package/portmap/portmap-01-5beta.patch | 80 -----
package/portmap/portmap-02-4.0-malloc.patch | 338 --------------------
package/portmap/portmap-4.0-cleanup.patch | 85 -----
package/portmap/portmap-4.0-rpc_user.patch | 59 ----
package/portmap/portmap-4.0-sigpipe.patch | 12 -
package/portmap/portmap-5b-include-errno_h.patch | 18 -
package/portmap/portmap-5b-optional-tcpd.patch | 38 ---
package/portmap/portmap-6.0.0-no-tcp-wrapper.patch | 36 ++
package/portmap/portmap.mk | 86 +++---
10 files changed, 82 insertions(+), 672 deletions(-)
delete mode 100644 package/portmap/portmap-01-5beta.patch
delete mode 100644 package/portmap/portmap-02-4.0-malloc.patch
delete mode 100644 package/portmap/portmap-4.0-cleanup.patch
delete mode 100644 package/portmap/portmap-4.0-rpc_user.patch
delete mode 100644 package/portmap/portmap-4.0-sigpipe.patch
delete mode 100644 package/portmap/portmap-5b-include-errno_h.patch
delete mode 100644 package/portmap/portmap-5b-optional-tcpd.patch
create mode 100644 package/portmap/portmap-6.0.0-no-tcp-wrapper.patch
diff --git a/package/portmap/Config.in b/package/portmap/Config.in
index 41b38e9..1f22ab6 100644
--- a/package/portmap/Config.in
+++ b/package/portmap/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_PORTMAP
help
The standard portmapper for RPC services.
- ftp://ftp.porcupine.org/pub/security/index.html
+ http://neil.brown.name/portmap/
comment "portmap requires a toolchain with 'Enable RPC' selected"
depends on !BR2_INET_RPC
diff --git a/package/portmap/portmap-01-5beta.patch b/package/portmap/portmap-01-5beta.patch
deleted file mode 100644
index 7681822..0000000
--- a/package/portmap/portmap-01-5beta.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- p/from_local.c
-+++ p/from_local.c 2000/02/28 15:10:25
-@@ -46,6 +46,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <netdb.h>
- #include <netinet/in.h>
- #include <net/if.h>
---- p/Makefile
-+++ p/Makefile 2000/02/28 15:10:25
-@@ -8,7 +8,7 @@
- # if you disagree. See `man 3 syslog' for examples. Some syslog versions
- # do not provide this flexibility.
- #
--FACILITY=LOG_MAIL
-+FACILITY=LOG_AUTH
-
- # To disable tcp-wrapper style access control, comment out the following
- # macro definitions. Access control can also be turned off by providing
-@@ -71,7 +71,7 @@
- # With verbose logging on, HP-UX 9.x and AIX 4.1 leave zombies behind when
- # SIGCHLD is not ignored. Enable next macro for a fix.
- #
--# ZOMBIES = -DIGNORE_SIGCHLD # AIX 4.x, HP-UX 9.x
-+ZOMBIES = -DIGNORE_SIGCHLD # AIX 4.x, HP-UX 9.x
-
- # Uncomment the following macro if your system does not have u_long.
- #
-@@ -81,11 +81,15 @@
- # libwrap.a object library. WRAP_DIR should specify the directory with
- # that library.
-
--WRAP_DIR= ../tcp_wrappers
-+WRAP_DIR= /usr/lib
-
- # Auxiliary object files that may be missing from your C library.
- #
--AUX = daemon.o strerror.o
-+AUX = # daemon.o strerror.o
-+
-+LIBS = -lwrap -lutil
-+NSARCHS =
-+O = -Wall -O2 -pipe
-
- # NEXTSTEP is a little different. The following seems to work with NS 3.2
- #
-@@ -99,7 +103,7 @@
-
- # Comment out if your compiler talks ANSI and understands const
- #
--CONST = -Dconst=
-+#CONST = -Dconst=
-
- ### End of configurable stuff.
- ##############################
-@@ -109,7 +113,7 @@
- COPT = $(CONST) -Dperror=xperror $(HOSTS_ACCESS) $(CHECK_PORT) \
- $(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN) \
- $(LOOPBACK) $(SETPGRP)
--CFLAGS = $(COPT) -O $(NSARCHS)
-+CFLAGS = $(COPT) $(O) $(NSARCHS)
- OBJECTS = portmap.o pmap_check.o from_local.o $(AUX)
-
- all: portmap pmap_dump pmap_set
---- p/portmap.c
-+++ p/portmap.c 2000/02/28 15:10:25
-@@ -182,9 +182,8 @@
- exit(1);
- }
-
--#ifdef LOG_MAIL
-- openlog("portmap", debugging ? LOG_PID | LOG_PERROR : LOG_PID,
-- FACILITY);
-+#ifdef FACILITY
-+ openlog("portmap", debugging ? LOG_PID | LOG_PERROR : LOG_PID, FACILITY);
- #else
- openlog("portmap", debugging ? LOG_PID | LOG_PERROR : LOG_PID);
- #endif
diff --git a/package/portmap/portmap-02-4.0-malloc.patch b/package/portmap/portmap-02-4.0-malloc.patch
deleted file mode 100644
index db3bf09..0000000
--- a/package/portmap/portmap-02-4.0-malloc.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-diff -urN portmap_4/daemon.c portmap_4.new/daemon.c
---- portmap_4/daemon.c Thu Jun 11 13:53:12 1992
-+++ portmap_4.new/daemon.c Mon Nov 29 18:37:28 1999
-@@ -35,7 +35,9 @@
- static char sccsid[] = "@(#)daemon.c 5.3 (Berkeley) 12/28/90";
- #endif /* LIBC_SCCS and not lint */
-
-+#include <sys/types.h>
- #include <fcntl.h>
-+#include <unistd.h>
-
- /* From unistd.h */
- #define STDIN_FILENO 0
-@@ -44,7 +46,7 @@
-
- /* From paths.h */
- #define _PATH_DEVNULL "/dev/null"
--
-+int
- daemon(nochdir, noclose)
- int nochdir, noclose;
- {
-diff -urN portmap_4/from_local.c portmap_4.new/from_local.c
---- portmap_4/from_local.c Fri May 31 06:52:58 1996
-+++ portmap_4.new/from_local.c Tue Nov 30 01:21:27 1999
-@@ -46,12 +46,14 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <stdio.h>
--#include <stdlib.h>
-+#include <unistd.h>
- #include <netdb.h>
- #include <netinet/in.h>
- #include <net/if.h>
- #include <sys/ioctl.h>
- #include <syslog.h>
-+#include <stdlib.h>
-+#include <string.h>
-
- #ifndef TRUE
- #define TRUE 1
-@@ -95,7 +98,7 @@
- }
-
- /* find_local - find all IP addresses for this host */
--
-+int
- find_local()
- {
- struct ifconf ifc;
-@@ -153,7 +156,7 @@
- }
-
- /* from_local - determine whether request comes from the local system */
--
-+int
- from_local(addr)
- struct sockaddr_in *addr;
- {
-diff -urN portmap_4/pmap_check.c portmap_4.new/pmap_check.c
---- portmap_4/pmap_check.c Sun Nov 21 11:59:01 1993
-+++ portmap_4.new/pmap_check.c Tue Nov 30 01:19:37 1999
-@@ -34,7 +34,7 @@
- #ifndef lint
- static char sccsid[] = "@(#) pmap_check.c 1.6 93/11/21 20:58:59";
- #endif
--
-+#include <unistd.h>
- #include <rpc/rpc.h>
- #include <rpc/pmap_prot.h>
- #include <syslog.h>
-@@ -66,6 +66,9 @@
-
- /* A handful of macros for "readability". */
-
-+/* coming from libwrap.a (tcp_wrappers) */
-+extern int hosts_ctl(char *daemon, char *name, char *addr, char *user);
-+
- #define good_client(a) hosts_ctl("portmap", "", inet_ntoa(a->sin_addr), "")
-
- #define legal_port(a,p) \
-@@ -104,6 +107,7 @@
-
- /* check_default - additional checks for NULL, DUMP, GETPORT and unknown */
-
-+int
- check_default(addr, proc, prog)
- struct sockaddr_in *addr;
- u_long proc;
-@@ -121,7 +125,7 @@
- }
-
- /* check_privileged_port - additional checks for privileged-port updates */
--
-+int
- check_privileged_port(addr, proc, prog, port)
- struct sockaddr_in *addr;
- u_long proc;
-@@ -147,6 +147,6 @@
-
- #ifdef LOOPBACK_SETUNSET
--
-+int
- check_setunset(xprt, ludp_xprt, ltcp_xprt, proc, prog, port)
- SVCXPRT *xprt;
- SVCXPRT *ludp_xprt;
-@@ -173,6 +174,6 @@
-
- #else
--
-+int
- check_setunset(addr, proc, prog, port)
- struct sockaddr_in *addr;
- u_long proc;
-@@ -160,7 +164,7 @@
- }
-
- /* check_callit - additional checks for forwarded requests */
--
-+int
- check_callit(addr, proc, prog, aproc)
- struct sockaddr_in *addr;
- u_long proc;
-@@ -213,13 +217,13 @@
- };
- struct proc_map *procp;
- static struct proc_map procmap[] = {
-- PMAPPROC_CALLIT, "callit",
-- PMAPPROC_DUMP, "dump",
-- PMAPPROC_GETPORT, "getport",
-- PMAPPROC_NULL, "null",
-- PMAPPROC_SET, "set",
-- PMAPPROC_UNSET, "unset",
-- 0, 0,
-+ { PMAPPROC_CALLIT, "callit"},
-+ { PMAPPROC_DUMP, "dump"},
-+ { PMAPPROC_GETPORT, "getport"},
-+ { PMAPPROC_NULL, "null"},
-+ { PMAPPROC_SET, "set"},
-+ { PMAPPROC_UNSET, "unset"},
-+ { 0, 0},
- };
-
- /*
-@@ -233,7 +237,7 @@
-
- if (prognum == 0) {
- progname = "";
-- } else if (rpc = getrpcbynumber((int) prognum)) {
-+ } else if ((rpc = getrpcbynumber((int) prognum))) {
- progname = rpc->r_name;
- } else {
- sprintf(progname = progbuf, "%lu", prognum);
-diff -urN portmap_4/pmap_dump.c portmap_4.new/pmap_dump.c
---- portmap_4/pmap_dump.c Thu Jun 11 13:53:16 1992
-+++ portmap_4.new/pmap_dump.c Tue Nov 30 01:22:07 1999
-@@ -22,7 +22,7 @@
- #include <rpc/pmap_prot.h>
-
- static char *protoname();
--
-+int
- main(argc, argv)
- int argc;
- char **argv;
-diff -urN portmap_4/pmap_set.c portmap_4.new/pmap_set.c
---- portmap_4/pmap_set.c Thu Jun 11 13:53:17 1992
-+++ portmap_4.new/pmap_set.c Tue Nov 30 01:23:49 1999
-@@ -17,6 +17,9 @@
- #include <rpc/rpc.h>
- #include <rpc/pmap_clnt.h>
-
-+int parse_line(char *buf, u_long *, u_long *, int *, unsigned *);
-+
-+int
- main(argc, argv)
- int argc;
- char **argv;
-@@ -42,7 +45,7 @@
- }
-
- /* parse_line - convert line to numbers */
--
-+int
- parse_line(buf, prog, vers, prot, port)
- char *buf;
- u_long *prog;
-diff -urN portmap_4/portmap.c portmap_4.new/portmap.c
---- portmap_4/portmap.c Fri May 31 06:52:59 1996
-+++ portmap_4.new/portmap.c Tue Nov 30 01:01:32 1999
-@@ -83,6 +83,7 @@
- #include <rpc/rpc.h>
- #include <rpc/pmap_prot.h>
- #include <stdio.h>
-+#include <unistd.h>
- #include <syslog.h>
- #include <netdb.h>
- #include <sys/socket.h>
-@@ -128,6 +129,7 @@
-
- #include "pmap_check.h"
-
-+int
- main(argc, argv)
- int argc;
- char **argv;
-@@ -229,6 +231,7 @@
- svc_run();
- syslog(LOG_ERR, "run_svc returned unexpectedly");
- abort();
-+ /* never reached */
- }
-
- #ifndef lint
-@@ -290,7 +293,7 @@
- */
- /* remote host authorization check */
- check_default(svc_getcaller(xprt), rqstp->rq_proc, (u_long) 0);
-- if (!svc_sendreply(xprt, xdr_void, (caddr_t)0) && debugging) {
-+ if (!svc_sendreply(xprt, (xdrproc_t)xdr_void, (caddr_t)0) && debugging) {
- abort();
- }
- break;
-@@ -299,7 +302,7 @@
- /*
- * Set a program,version to port mapping
- */
-- if (!svc_getargs(xprt, xdr_pmap, ®))
-+ if (!svc_getargs(xprt, (xdrproc_t)xdr_pmap, (caddr_t)®))
- svcerr_decode(xprt);
- else {
- /* reject non-local requests, protect priv. ports */
-@@ -341,7 +344,7 @@
- ans = 1;
- }
- done:
-- if ((!svc_sendreply(xprt, xdr_int, (caddr_t)&ans)) &&
-+ if ((!svc_sendreply(xprt, (xdrproc_t)xdr_int, (caddr_t)&ans)) &&
- debugging) {
- (void) fprintf(stderr, "svc_sendreply\n");
- abort();
-@@ -353,7 +356,7 @@
- /*
- * Remove a program,version to port mapping.
- */
-- if (!svc_getargs(xprt, xdr_pmap, ®))
-+ if (!svc_getargs(xprt, (xdrproc_t)xdr_pmap, (caddr_t)®))
- svcerr_decode(xprt);
- else {
- ans = 0;
-@@ -387,7 +390,7 @@
- prevpml->pml_next = pml;
- free(t);
- }
-- if ((!svc_sendreply(xprt, xdr_int, (caddr_t)&ans)) &&
-+ if ((!svc_sendreply(xprt, (xdrproc_t)xdr_int, (caddr_t)&ans)) &&
- debugging) {
- (void) fprintf(stderr, "svc_sendreply\n");
- abort();
-@@ -399,7 +402,7 @@
- /*
- * Lookup the mapping for a program,version and return its port
- */
-- if (!svc_getargs(xprt, xdr_pmap, ®))
-+ if (!svc_getargs(xprt, (xdrproc_t)xdr_pmap, (caddr_t)®))
- svcerr_decode(xprt);
- else {
- /* remote host authorization check */
-@@ -414,7 +417,7 @@
- port = fnd->pml_map.pm_port;
- else
- port = 0;
-- if ((!svc_sendreply(xprt, xdr_int, (caddr_t)&port)) &&
-+ if ((!svc_sendreply(xprt, (xdrproc_t)xdr_int, (caddr_t)&port)) &&
- debugging) {
- (void) fprintf(stderr, "svc_sendreply\n");
- abort();
-@@ -426,7 +429,7 @@
- /*
- * Return the current set of mapped program,version
- */
-- if (!svc_getargs(xprt, xdr_void, NULL))
-+ if (!svc_getargs(xprt, (xdrproc_t)xdr_void, NULL))
- svcerr_decode(xprt);
- else {
- /* remote host authorization check */
-@@ -437,7 +440,7 @@
- } else {
- p = pmaplist;
- }
-- if ((!svc_sendreply(xprt, xdr_pmaplist,
-+ if ((!svc_sendreply(xprt, (xdrproc_t)xdr_pmaplist,
- (caddr_t)&p)) && debugging) {
- (void) fprintf(stderr, "svc_sendreply\n");
- abort();
-@@ -481,7 +484,7 @@
- struct encap_parms *epp;
- {
-
-- return (xdr_bytes(xdrs, &(epp->args), &(epp->arglen), ARGSIZE));
-+ return (xdr_bytes(xdrs, &(epp->args), (u_int *)&(epp->arglen), ARGSIZE));
- }
-
- struct rmtcallargs {
-@@ -585,7 +588,7 @@
- timeout.tv_sec = 5;
- timeout.tv_usec = 0;
- a.rmt_args.args = buf;
-- if (!svc_getargs(xprt, xdr_rmtcall_args, &a))
-+ if (!svc_getargs(xprt, (xdrproc_t)xdr_rmtcall_args, (caddr_t)&a))
- return;
- /* host and service access control */
- if (!check_callit(svc_getcaller(xprt),
-@@ -614,9 +617,9 @@
- au->aup_uid, au->aup_gid, au->aup_len, au->aup_gids);
- }
- a.rmt_port = (u_long)port;
-- if (clnt_call(client, a.rmt_proc, xdr_opaque_parms, &a,
-- xdr_len_opaque_parms, &a, timeout) == RPC_SUCCESS) {
-- svc_sendreply(xprt, xdr_rmtcall_result, (caddr_t)&a);
-+ if (clnt_call(client, a.rmt_proc, (xdrproc_t)xdr_opaque_parms, (caddr_t)&a,
-+ (xdrproc_t)xdr_len_opaque_parms, (caddr_t)&a, timeout) == RPC_SUCCESS) {
-+ svc_sendreply(xprt, (xdrproc_t)xdr_rmtcall_result, (caddr_t)&a);
- }
- AUTH_DESTROY(client->cl_auth);
- clnt_destroy(client);
-
-+--------------------------------------------------------------------+
-| Ste'phane ERANIAN | Email eranian at hpl.hp.com |
-| Hewlett-Packard Laboratories | |
-| 1501, Page Mill Road MS 1U-15 | |
-| Palo Alto, CA 94303-096 | |
-| USA | |
-| Tel : (650) 857-7174 | |
-| Fax : (650) 857-5548 | |
-+--------------------------------------------------------------------+
-
-
diff --git a/package/portmap/portmap-4.0-cleanup.patch b/package/portmap/portmap-4.0-cleanup.patch
deleted file mode 100644
index 2e005af..0000000
--- a/package/portmap/portmap-4.0-cleanup.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Some cleanup for my last patch.
-
-
---
-H.J. Lu (hjl at gnu.org)
---
---- portmap_4/pmap_check.c.hostname Wed May 10 10:23:35 2000
-+++ portmap_4/pmap_check.c Wed May 10 11:03:22 2000
-@@ -35,6 +35,7 @@
- static char sccsid[] = "@(#) pmap_check.c 1.6 93/11/21 20:58:59";
- #endif
- #include <unistd.h>
-+#include <string.h>
- #include <rpc/rpc.h>
- #include <rpc/pmap_prot.h>
- #include <syslog.h>
-@@ -69,8 +70,6 @@ int deny_severity = LOG_WARNING;
- /* coming from libwrap.a (tcp_wrappers) */
- extern int hosts_ctl(char *daemon, char *name, char *addr, char *user);
-
--#define good_client(a) hosts_ctl("portmap", "", inet_ntoa(a->sin_addr), "")
--
- #define reserved_port(p) (IPPORT_RESERVED/2 < (p) && (p) < IPPORT_RESERVED)
-
- #define unreserved_port(p) (IPPORT_RESERVED <= (p) && (p) != NFS_PORT)
-@@ -88,6 +87,59 @@ extern int hosts_ctl(char *daemon, char
-
- #define log_client(addr, proc, prog) \
- logit(allow_severity, addr, proc, prog, "")
-+
-+#ifdef HOSTS_ACCESS
-+static int
-+good_client(addr)
-+struct sockaddr_in *addr;
-+{
-+ struct hostent *hp;
-+ char **sp;
-+ char *tmpname;
-+
-+ /* Check the IP address first. */
-+ if (hosts_ctl("portmap", "", inet_ntoa(addr->sin_addr), ""))
-+ return 1;
-+
-+ /* Check the hostname. */
-+ hp = gethostbyaddr ((const char *) &(addr->sin_addr),
-+ sizeof (addr->sin_addr), AF_INET);
-+
-+ if (!hp)
-+ return 0;
-+
-+ /* must make sure the hostent is authorative. */
-+ tmpname = alloca (strlen (hp->h_name) + 1);
-+ strcpy (tmpname, hp->h_name);
-+ hp = gethostbyname(tmpname);
-+ if (hp) {
-+ /* now make sure the "addr->sin_addr" is on the list */
-+ for (sp = hp->h_addr_list ; *sp ; sp++) {
-+ if (memcmp(*sp, &(addr->sin_addr), hp->h_length)==0)
-+ break;
-+ }
-+ if (!*sp)
-+ /* it was a FAKE. */
-+ return 0;
-+ }
-+ else
-+ /* never heard of it. misconfigured DNS? */
-+ return 0;
-+
-+ /* Check the official name first. */
-+ if (hosts_ctl("portmap", "", hp->h_name, ""))
-+ return 1;
-+
-+ /* Check aliases. */
-+ for (sp = hp->h_aliases; *sp ; sp++) {
-+ if (hosts_ctl("portmap", "", *sp, ""))
-+ return 1;
-+ }
-+
-+ /* No match */
-+ return 0;
-+}
-+#endif
-
- /* check_startup - additional startup code */
-
diff --git a/package/portmap/portmap-4.0-rpc_user.patch b/package/portmap/portmap-4.0-rpc_user.patch
deleted file mode 100644
index 6ef0736..0000000
--- a/package/portmap/portmap-4.0-rpc_user.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -urN portmap_4/daemon.c portmap_4.new/daemon.c
---- portmap_4/daemon.c Thu Aug 3 18:07:22 2000
-+++ portmap_4.new/daemon.c Fri Aug 4 08:45:25 2000
-@@ -35,6 +35,7 @@
- static char sccsid[] = "@(#)daemon.c 5.3 (Berkeley) 12/28/90";
- #endif /* LIBC_SCCS and not lint */
-
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <fcntl.h>
- #include <unistd.h>
-diff -urN portmap_4/pmap_check.c portmap_4.new/pmap_check.c
---- portmap_4/pmap_check.c Thu Aug 3 18:07:22 2000
-+++ portmap_4.new/pmap_check.c Thu Aug 3 18:29:51 2000
-@@ -40,6 +40,8 @@
- #include <rpc/pmap_prot.h>
- #include <syslog.h>
- #include <netdb.h>
-+#include <pwd.h>
-+#include <sys/types.h>
- #include <sys/signal.h>
- #ifdef SYSV40
- #include <netinet/in.h>
-@@ -149,11 +151,32 @@
- /*
- * Give up root privileges so that we can never allocate a privileged
- * port when forwarding an rpc request.
-+ *
-+ * Fix 8/3/00 Philipp Knirsch: First lookup our rpc user. If we find it,
-+ * switch to that uid, otherwise simply resue the old bin user and print
-+ * out a warning in syslog.
- */
-- if (setuid(1) == -1) {
-- syslog(LOG_ERR, "setuid(1) failed: %m");
-- exit(1);
-+
-+ struct passwd *pwent;
-+
-+ pwent = getpwnam("rpc");
-+ if (pwent == NULL) {
-+ syslog(LOG_WARNING, "user rpc not found, reverting to user bin");
-+ if (setuid(1) == -1) {
-+ syslog(LOG_ERR, "setuid(1) failed: %m");
-+ exit(1);
-+ }
- }
-+ else {
-+ if (setuid(pwent->pw_uid) == -1) {
-+ syslog(LOG_WARNING, "setuid() to rpc user failed: %m");
-+ if (setuid(1) == -1) {
-+ syslog(LOG_ERR, "setuid(1) failed: %m");
-+ exit(1);
-+ }
-+ }
-+ }
-+
- (void) signal(SIGINT, toggle_verboselog);
- }
-
diff --git a/package/portmap/portmap-4.0-sigpipe.patch b/package/portmap/portmap-4.0-sigpipe.patch
deleted file mode 100644
index dba7cf4..0000000
--- a/package/portmap/portmap-4.0-sigpipe.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- portmap_4/portmap.c.sigpipe Sun Feb 11 17:45:11 2001
-+++ portmap_4/portmap.c Sun Feb 11 17:45:51 2001
-@@ -228,6 +228,9 @@
- #else
- (void)signal(SIGCHLD, reap);
- #endif
-+ /* Dying on SIGPIPE doesn't help anyone */
-+ (void)signal(SIGPIPE, SIG_IGN);
-+
- svc_run();
- syslog(LOG_ERR, "run_svc returned unexpectedly");
- abort();
diff --git a/package/portmap/portmap-5b-include-errno_h.patch b/package/portmap/portmap-5b-include-errno_h.patch
deleted file mode 100644
index a440e61..0000000
--- a/package/portmap/portmap-5b-include-errno_h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- portmap_5beta/portmap.c.orig 2002-12-31 22:13:17.000000000 +0200
-+++ portmap_5beta/portmap.c 2002-12-31 22:13:50.000000000 +0200
-@@ -97,6 +97,7 @@
-
- extern char *strerror();
- #include <stdlib.h>
-+#include <errno.h>
-
- #ifndef LOG_PERROR
- #define LOG_PERROR 0
-@@ -124,7 +125,6 @@
- static void callit();
- struct pmaplist *pmaplist;
- int debugging = 0;
--extern int errno;
-
- #include "pmap_check.h"
-
diff --git a/package/portmap/portmap-5b-optional-tcpd.patch b/package/portmap/portmap-5b-optional-tcpd.patch
deleted file mode 100644
index d5b79f2..0000000
--- a/package/portmap/portmap-5b-optional-tcpd.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- portmap/Makefile.orig 2004-10-31 01:54:48.073875024 -0400
-+++ portmap/Makefile 2004-10-31 01:54:58.395305928 -0400
-@@ -15,8 +15,6 @@
- # no access control tables. The local system, since it runs the portmap
- # daemon, is always treated as an authorized host.
-
--HOSTS_ACCESS= -DHOSTS_ACCESS
--WRAP_LIB = $(WRAP_DIR)/libwrap.a
-
- # Comment out if your RPC library does not allocate privileged ports for
- # requests from processes with root privilege, or the new portmap will
-@@ -87,7 +85,7 @@
- #
- AUX = # daemon.o strerror.o
-
--LIBS = -lwrap -lutil
-+LIBS = -lutil
- NSARCHS =
- O = -Wall -O2 -pipe
-
-@@ -110,7 +108,7 @@
-
- SHELL = /bin/sh
-
--COPT = $(CONST) -Dperror=xperror $(HOSTS_ACCESS) $(CHECK_PORT) \
-+COPT = $(CONST) -Dperror=xperror $(CHECK_PORT) \
- $(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN) \
- $(LOOPBACK) $(SETPGRP)
- CFLAGS = $(COPT) $(O) $(NSARCHS)
-@@ -118,7 +116,7 @@
-
- all: portmap pmap_dump pmap_set
-
--portmap: $(OBJECTS) $(WRAP_DIR)/libwrap.a
-+portmap: $(OBJECTS)
- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(WRAP_LIB) $(LIBS)
-
- pmap_dump: pmap_dump.c
diff --git a/package/portmap/portmap-6.0.0-no-tcp-wrapper.patch b/package/portmap/portmap-6.0.0-no-tcp-wrapper.patch
new file mode 100644
index 0000000..0be5ee2
--- /dev/null
+++ b/package/portmap/portmap-6.0.0-no-tcp-wrapper.patch
@@ -0,0 +1,36 @@
+--- a/Makefile 2007-05-10 20:02:10.000000000 -0700
++++ b/Makefile 2010-10-06 13:35:16.000000000 -0700
+@@ -18,14 +18,14 @@ FACILITY=LOG_DAEMON
+ # target system will never user NIS for hostname lookup, you can define
+ # USE_DNS to add hostname tests in hosts.allow/deny.
+
+-ifeq ($(NO_TCP_WRAPPER),)
+-CPPFLAGS += -DHOSTS_ACCESS
+-WRAP_LIB = -lwrap
+-ifdef USE_DNS
+-CPPFLAGS += -DENABLE_DNS
+-MAN_SED += -e 's/USE_DNS/yes/'
+-endif
+-endif
++#ifeq ($(NO_TCP_WRAPPER),)
++#CPPFLAGS += -DHOSTS_ACCESS
++#WRAP_LIB = -lwrap
++#ifdef USE_DNS
++#CPPFLAGS += -DENABLE_DNS
++#MAN_SED += -e 's/USE_DNS/yes/'
++#endif
++#endif
+
+ # Comment out if your RPC library does not allocate privileged ports for
+ # requests from processes with root privilege, or the new portmap will
+
+--- a/pmap_check.c 2010-10-06 13:41:46.000000000 -0700
++++ b/pmap_check.c 2010-10-06 13:41:13.000000000 -0700
+@@ -44,7 +44,6 @@
+ #include <netinet/in.h>
+ #include <rpc/rpcent.h>
+ #endif
+-#include <tcpd.h>
+ #include <arpa/inet.h>
+ #include <grp.h>
+
diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk
index 0132c72..506f042 100644
--- a/package/portmap/portmap.mk
+++ b/package/portmap/portmap.mk
@@ -3,45 +3,49 @@
# portmap
#
#############################################################
-PORTMAP_VERSION:=5b
-PORTMAP_SOURCE:=portmap_$(PORTMAP_VERSION)eta.tar.gz
-PORTMAP_SITE:=ftp://ftp.porcupine.org/pub/security/
-PORTMAP_DIR:=$(BUILD_DIR)/portmap_$(PORTMAP_VERSION)eta
-PORTMAP_CAT:=$(ZCAT)
-PORTMAP_BINARY:=portmap
-PORTMAP_TARGET_BINARY:=sbin/portmap
-
-$(DL_DIR)/$(PORTMAP_SOURCE):
- $(call DOWNLOAD,$(PORTMAP_SITE),$(PORTMAP_SOURCE))
-
-portmap-source: $(DL_DIR)/$(PORTMAP_SOURCE)
-
-$(PORTMAP_DIR)/.unpacked: $(DL_DIR)/$(PORTMAP_SOURCE)
- $(PORTMAP_CAT) $(DL_DIR)/$(PORTMAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(PORTMAP_DIR) package/portmap/ portmap\*.patch
- touch $(PORTMAP_DIR)/.unpacked
-
-$(PORTMAP_DIR)/$(PORTMAP_BINARY): $(PORTMAP_DIR)/.unpacked
- $(MAKE) CC="$(TARGET_CC)" O="$(TARGET_CFLAGS)" -C $(PORTMAP_DIR)
-
-$(TARGET_DIR)/$(PORTMAP_TARGET_BINARY): $(PORTMAP_DIR)/$(PORTMAP_BINARY)
- $(INSTALL) -D $(PORTMAP_DIR)/$(PORTMAP_BINARY) $(TARGET_DIR)/$(PORTMAP_TARGET_BINARY)
- $(INSTALL) -m 0755 package/portmap/S13portmap $(TARGET_DIR)/etc/init.d
-
-portmap: $(TARGET_DIR)/$(PORTMAP_TARGET_BINARY)
-
-portmap-clean:
- rm -f $(TARGET_DIR)/$(PORTMAP_TARGET_BINARY)
- rm -f $(TARGET_DIR)/etc/init.d/S13portmap
- -$(MAKE) -C $(PORTMAP_DIR) clean
-
-portmap-dirclean:
- rm -rf $(PORTMAP_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_PORTMAP),y)
-TARGETS+=portmap
+PORTMAP_VERSION = 6.0.0
+PORTMAP_SOURCE = portmap_$(PORTMAP_VERSION).orig.tar.gz
+PORTMAP_PATCH = portmap_$(PORTMAP_VERSION)-2.diff.gz
+PORTMAP_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/p/portmap
+
+PORTMAP_BINARY = portmap
+PORTMAP_TARGET_BINARY = sbin/portmap
+
+ifneq ($(PORTMAP_PATCH),)
+define PORTMAP_DEBIAN_PATCHES
+ if [ -d $(@D)/debian/patches ]; then \
+ toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.diff; \
+ fi
+endef
endif
+
+PORTMAP_POST_PATCH_HOOKS = PORTMAP_DEBIAN_PATCHES
+
+define PORTMAP_BUILD_CMDS
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" -C $(@D)
+endef
+
+define PORTMAP_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/portmap $(TARGET_DIR)/sbin/portmap
+ $(INSTALL) -D -m 0755 $(@D)/pmap_dump $(TARGET_DIR)/sbin/pmap_dump
+ $(INSTALL) -D -m 0755 $(@D)/pmap_set $(TARGET_DIR)/sbin/pmap_set
+ $(INSTALL) -D -m 0644 $(@D)/portmap.man $(TARGET_DIR)/usr/share/man/man8/portmap.8
+ $(INSTALL) -D -m 0644 $(@D)/pmap_dump.8 $(TARGET_DIR)/usr/share/man/man8/pmap_dump.8
+ $(INSTALL) -D -m 0644 $(@D)/pmap_set.8 $(TARGET_DIR)/usr/share/man/man8/pmap_set.8
+ $(INSTALL) -D -m 0755 package/portmap/S13portmap $(TARGET_DIR)/etc/init.d/S13portmap
+endef
+
+define PORTMAP_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/sbin/portmap
+ rm -f $(TARGET_DIR)/sbin/pmap_dump
+ rm -f $(TARGET_DIR)/sbin/pmap_set
+ rm -f $(TARGET_DIR)/usr/share/man/man8/portmap.8
+ rm -f $(TARGET_DIR)/usr/share/man/man8/pmap_dump.8
+ rm -f $(TARGET_DIR)/usr/share/man/man8/pmap_set.8
+endef
+
+define PORTMAP_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
+
+$(eval $(call GENTARGETS,package,portmap))
--
1.7.3.1
^ permalink raw reply related
* Re: [Xenomai-help] kernel oopses when killing realtime task
From: Jan Kiszka @ 2010-10-08 8:41 UTC (permalink / raw)
To: Philippe Gerum; +Cc: xenomai@xenomai.org
In-Reply-To: <1286525848.13186.93.camel@domain.hid>
Am 08.10.2010 10:17, Philippe Gerum wrote:
> On Fri, 2010-10-08 at 09:01 +0200, Pavel Machek wrote:
>> Hi!
>>
>>>> I have... quite an interesting setup here.
>>>>
>>>> SMP machine, with special PCI card; that card has GPIOs and serial
>>>> ports. Unfortunately, there's only one interrupt, shared between
>>>> serials and GPIO pins, and serials are way too complex to be handled
>>>> by realtime layer.
>>>>
>>>> So I ended up with
>>>>
>>>> // we also have an interrupt handler:
>>>> ret = rtdm_irq_request(&my_context->irq_handle,
>>>> gpio_rt_config.irq, demo_interrupt,
>>>> RTDM_IRQTYPE_SHARED,
>>>> context->device->proc_name, my_context);
>>>>
>>>> and
>>>>
>>>> static int demo_interrupt(rtdm_irq_t *irq_context)
>>>> {
>>>> struct demodrv_context *ctx;
>>>> int dev_id;
>>>> int ret = RTDM_IRQ_HANDLED; // usual return value
>>>> unsigned pending, output;
>>>>
>>>> ctx = rtdm_irq_get_arg(irq_context, struct demodrv_context);
>>>> dev_id = ctx->dev_id;
>>>>
>>>> if (!ctx->ready) {
>>>> printk(KERN_CRIT "Unexpected interrupt\n");
>>>> return XN_ISR_PROPAGATE;
>>>
>>> Who sets ready and when? Looks racy.
>>
>> Debugging aid; yes, this one is racy.
>>
>>>> rtdm_lock_put(&ctx->lock);
>>>>
>>>> /* We need to propagate the interrupt, so that PMC-6L serials
>>>> work. Result is that interrupt latencies can't be
>>>> guaranteed when serials are in use. */
>>>>
>>>> return RTDM_IRQ_HANDLED;
>>>> }
>>>>
>>>> Unregistration is:
>>>> my_context->ready = 0;
>>>> rtdm_irq_disable(&my_context->irq_handle);
>>>
>>> Where is rtdm_irq_free? Again, this ready flag looks racy.
>>
>> Aha, sorry, I quoted wrong snippet. rtdm_irq_free() follows
>> immediately, like this:
>>
>> int demo_close_rt(struct rtdm_dev_context *context,
>> rtdm_user_info_t *user_info)
>> {
>> struct demodrv_context *my_context;
>> rtdm_lockctx_t lock_ctx;
>> // get the context
>> my_context = (struct demodrv_context *)context->dev_private;
>>
>> // if we need to do some stuff with preemption disabled:
>> rtdm_lock_get_irqsave(&my_context->lock, lock_ctx);
>>
>> my_context->ready = 0;
>> rtdm_irq_disable(&my_context->irq_handle);
>>
>>
>> // free irq in RTDM
>> rtdm_irq_free(&my_context->irq_handle);
>>
>> // destroy our interrupt signal/event
>> rtdm_event_destroy(&my_context->irq_event);
>>
>> // other stuff here
>> rtdm_lock_put_irqrestore(&my_context->lock, lock_ctx);
>>
>> return 0;
>> }
>>
>> Now... I'm aware that lock_get/put around irq_free should be
>> unneccessary, as should be irq_disable and my ->ready flag. Those were
>> my attempts to work around the problem. I'll attach the full source at
>> the end.
>>
>>>> Unfortunately, when the userspace app is ran and killed repeatedly (so
>>>> that interrupt is registered/unregistered all the time), I get
>>>> oopses in __ipipe_dispatch_wired() -- it seems to call into the NULL
>>>> pointer.
>>>>
>>>> I decided that "wired" interrupt when the source is shared between
>>>> Linux and Xenomai, is wrong thing, so I disable "wired" interrupts
>>>> altogether, but that only moved oops to __virq_end.
>>>
>>> This is wrong. The only way to get a determistically shared IRQs across
>>> domains is via the wired path, either using the pattern Gilles cited or,
>>> in a slight variation, signaling down via a separate rtdm_nrtsig.
>>
>> For now, I'm trying to get it not to oops; deterministic latencies are
>> the next topic :-(.
>
> The main issue is that we don't lock our IRQ descriptors (the pipeline
> ones) when running the handlers, so another CPU clearing them via
> ipipe_virtualize_irq() may well sink the boat...
>
> The unwritten rule has always been to assume that drivers would stop
> _and_ drain interrupts on all CPUs before unregistering handlers, then
> exiting the code. Granted, that's a bit much.
IIRC, we drain at nucleus-level if statistic are enabled. I guess we
should make this unconditional.
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply
* Re: [fix-isi-udev PATCH 0/3] Improve udev with isi
From: Marcel Holtmann @ 2010-10-08 8:41 UTC (permalink / raw)
To: ofono
In-Reply-To: <1286480461.9665.558.camel@tucson.research.nokia.com>
[-- Attachment #1: Type: text/plain, Size: 628 bytes --]
Hi Aki,
> > [fix-isi-udev PATCH 1/3] udev: do not use post-143 libudev features
> > [fix-isi-udev PATCH 2/3] udev: refactor add_isi
>
> These two were applied. Thanks!
>
> > [fix-isi-udev PATCH 3/3] ofono.rules: assign isigen driver by USB ids
>
> This one was left dangling; let's see if we can come up with a better
> way to match the modems driven by cdc_phonet. (Although, admittedly this
> same approach is already used with some AT modems.)
that is a leftover from the time where we only looking for TTY devices.
In that case that was fine. Now this needs to be fixed as well.
Regards
Marcel
^ permalink raw reply
* Re: [PATCH 2 of 3] support of cpupools in xl: commands and library changes
From: Juergen Gross @ 2010-10-08 8:41 UTC (permalink / raw)
To: Gianni Tedesco; +Cc: xen-devel@lists.xensource.com
In-Reply-To: <1286372869.12843.62.camel@qabil.uk.xensource.com>
On 10/06/10 15:47, Gianni Tedesco wrote:
> On Tue, 2010-10-05 at 14:45 +0100, Juergen Gross wrote:
>> diff -r cfce8e755505 -r baee85a24411 tools/python/xen/lowlevel/xl/xl.c
>> --- a/tools/python/xen/lowlevel/xl/xl.c Tue Oct 05 14:19:13 2010 +0200
>> +++ b/tools/python/xen/lowlevel/xl/xl.c Tue Oct 05 15:26:24 2010 +0200
>> @@ -208,6 +208,11 @@
>> return -1;
>> }
>>
>> +int attrib__uint64_t_ptr_set(PyObject *v, uint64_t * *pptr)
>> +{
>> + return -1;
>> +}
>> +
>> int attrib__libxl_cpumap_set(PyObject *v, libxl_cpumap *pptr)
>> {
>> return -1;
>> @@ -254,6 +259,11 @@
>> }
>>
>> PyObject *attrib__libxl_cpuid_policy_list_get(libxl_cpuid_policy_list
>> *pptr)
>> +{
>> + return NULL;
>> +}
>> +
>> +PyObject *attrib__uint64_t_ptr_get(uint64_t * *pptr)
>> {
>> return NULL;
>> }
>
> Because of using Reference(Uint64) directly in the idl - the python
> bindings autogenerate these type-marshalling functions. It's not quite
> clear how these are supposed to be implemented in a generic way! :)
>
> There ought to be a builtin type for this ala libxl_uuid and other types
> to generate correct bindings.
Gianni, I suppose I need a builtin for the complete libxl_cpumap type, not
only for the uint64_t array due to the size info which is needed to access
the array correctly.
I'm not sure how to translate this into the correct bindings. I think the
cpumap should be translated into a python list. Which methods do I need to
include in xc.c? Or would it be okay to add just some minimal dummy
functions and put in the functionality if needed?
Juergeb
--
Juergen Gross Principal Developer Operating Systems
TSP ES&S SWE OS6 Telephone: +49 (0) 89 3222 2967
Fujitsu Technology Solutions e-mail: juergen.gross@ts.fujitsu.com
Domagkstr. 28 Internet: ts.fujitsu.com
D-80807 Muenchen Company details: ts.fujitsu.com/imprint.html
^ permalink raw reply
* Re: [PATCH 00/33] Staging: Fixed <module-objs> to <module>-y
From: T Dent @ 2010-10-08 8:39 UTC (permalink / raw)
To: matt mooney; +Cc: greg, linux-kernel, kernel-janitors, sam, linux-kbuild
In-Reply-To: <AANLkTinynZj9bYFAyfRTF2uopmLe6Ls4YGdZPqCAJTpR@mail.gmail.com>
On 10/8/10, matt mooney <mfmooney@gmail.com> wrote:
> On Thu, Oct 7, 2010 at 6:35 PM, T Dent <tdent48227@gmail.com> wrote:
>> I patch against the next-20101006 tree.
>>
>> The patch series replace use of <module>-objs with <module>-y in the
>> staging directory.
>
> Commit messages are written in the present tense. You happen to be
> using two different tenses within the commit message, which is truly
> odd. And why did you not split apart those atrocious statements with
> the infinite column width?
>
You're right I didn't notice. I just copy-and-paste a lot of commits
and just switch the directory.
> This patch series adds little benefit. As Sam has suggested, a more
> general cleanup would be a better goal, and staging is an area that
> needs extra attention some of which has already been pointed out in
> other emails.
I am going to do a more general clean up. I was just breaking it up
into parts, so that its easier to review and get applied.
> -mfm
>
> --
> GPG-Key: 9AFE00EA
>
Thanks,
Tracey D
^ permalink raw reply
* Re: [PATCH 00/33] Staging: Fixed <module-objs> to <module>-y
From: T Dent @ 2010-10-08 8:39 UTC (permalink / raw)
To: matt mooney; +Cc: greg, linux-kernel, kernel-janitors, sam, linux-kbuild
In-Reply-To: <AANLkTinynZj9bYFAyfRTF2uopmLe6Ls4YGdZPqCAJTpR@mail.gmail.com>
On 10/8/10, matt mooney <mfmooney@gmail.com> wrote:
> On Thu, Oct 7, 2010 at 6:35 PM, T Dent <tdent48227@gmail.com> wrote:
>> I patch against the next-20101006 tree.
>>
>> The patch series replace use of <module>-objs with <module>-y in the
>> staging directory.
>
> Commit messages are written in the present tense. You happen to be
> using two different tenses within the commit message, which is truly
> odd. And why did you not split apart those atrocious statements with
> the infinite column width?
>
You're right I didn't notice. I just copy-and-paste a lot of commits
and just switch the directory.
> This patch series adds little benefit. As Sam has suggested, a more
> general cleanup would be a better goal, and staging is an area that
> needs extra attention some of which has already been pointed out in
> other emails.
I am going to do a more general clean up. I was just breaking it up
into parts, so that its easier to review and get applied.
> -mfm
>
> --
> GPG-Key: 9AFE00EA
>
Thanks,
Tracey D
^ permalink raw reply
* Re: PATCH [0/4] perf: clean-up of power events API
From: Ingo Molnar @ 2010-10-08 8:38 UTC (permalink / raw)
To: Tejun Heo
Cc: Thomas Gleixner, Andrew Morton, Pierre Tardy, Peter Zijlstra,
Frederic Weisbecker, Linus Torvalds, Jean Pihet, Steven Rostedt,
linux-perf-users, linux-trace-users, Frank Eigler,
Mathieu Desnoyers, Masami Hiramatsu, linux-pm, linux-omap, arjan
In-Reply-To: <4CAED2F0.9080801@kernel.org>
* Tejun Heo <tj@kernel.org> wrote:
> Hello,
>
> On 10/07/2010 05:58 PM, Frederic Weisbecker wrote:
> > I really feel uncomfortable with this tracepoint/ABI problem....
> > Mathieu suggested we start a user library that could handle these
> > changes when they are really necessary.
> >
> > Thoughts?
> >
> > (Adding Tejun in Cc).
>
> Given that tracepoints are supposed to make internal operation
> visible. I don't think it's a good idea to make it part of fixed ABI.
Yep, exactly.
OTOH since it exports information we can do disciplined versioning and
extensions only - i.e. leave the old power events around, add the new
ones with new distinct names, and phase out the old ones in a kernel
cycle or two. It's not hard to do.
That way apps can support old kernels too (if they want to), but new
events as well - and all in a controlled, non-disruptive manner.
More importantly, the kernel wont have cruft and will have no ABI
restrictions - the only 'restriction' is to treat information in an
append-only manner (i.e. change the event name if you change it
materially) - and that's not a big deal here.
The fundamental thing about tracing/instrumentation is that there are no
deep ABI needs: it's all about analyzing development kernels (and a few
select versions that get the enterprise treatment) but otherwise the
half-life of this kind of information is very short.
So we dont want to tie ourselves down with excessive ABIs.
> Maybe some core part can be put in stone but I think things like
> internal workqueue implementation should be changeable without
> worrying about ABI issues.
That's most definitely so! There is and will be zero back-coupling from
workqueue tracepoints to workqueue internals. Dont worry about this.
Ingo
^ permalink raw reply
* Re: PATCH [0/4] perf: clean-up of power events API
From: Ingo Molnar @ 2010-10-08 8:38 UTC (permalink / raw)
To: Tejun Heo
Cc: Frederic Weisbecker, Pierre Tardy, Mathieu Desnoyers,
Thomas Renninger, Jean Pihet, linux-trace-users, linux-pm,
linux-perf-users, arjan, rjw, linux-omap, Peter Zijlstra,
Kevin Hilman, Steven Rostedt, Frank Eigler, Masami Hiramatsu,
Thomas Gleixner, Andrew Morton, Linus Torvalds
In-Reply-To: <4CAED2F0.9080801@kernel.org>
* Tejun Heo <tj@kernel.org> wrote:
> Hello,
>
> On 10/07/2010 05:58 PM, Frederic Weisbecker wrote:
> > I really feel uncomfortable with this tracepoint/ABI problem....
> > Mathieu suggested we start a user library that could handle these
> > changes when they are really necessary.
> >
> > Thoughts?
> >
> > (Adding Tejun in Cc).
>
> Given that tracepoints are supposed to make internal operation
> visible. I don't think it's a good idea to make it part of fixed ABI.
Yep, exactly.
OTOH since it exports information we can do disciplined versioning and
extensions only - i.e. leave the old power events around, add the new
ones with new distinct names, and phase out the old ones in a kernel
cycle or two. It's not hard to do.
That way apps can support old kernels too (if they want to), but new
events as well - and all in a controlled, non-disruptive manner.
More importantly, the kernel wont have cruft and will have no ABI
restrictions - the only 'restriction' is to treat information in an
append-only manner (i.e. change the event name if you change it
materially) - and that's not a big deal here.
The fundamental thing about tracing/instrumentation is that there are no
deep ABI needs: it's all about analyzing development kernels (and a few
select versions that get the enterprise treatment) but otherwise the
half-life of this kind of information is very short.
So we dont want to tie ourselves down with excessive ABIs.
> Maybe some core part can be put in stone but I think things like
> internal workqueue implementation should be changeable without
> worrying about ABI issues.
That's most definitely so! There is and will be zero back-coupling from
workqueue tracepoints to workqueue internals. Dont worry about this.
Ingo
^ permalink raw reply
* Re: [PATCH 1/2] drivers:bluetooth: TI_ST bluetooth driver
From: Marcel Holtmann @ 2010-10-08 8:37 UTC (permalink / raw)
To: Gustavo F. Padovan; +Cc: pavan_savoy, linux-bluetooth, greg, linux-kernel
In-Reply-To: <20101007184534.GB13602@vigoh>
Hi Gustavo,
> Change the commit subject to "Bluetooth: TI_ST bluetooth driver"
>
> * pavan_savoy@ti.com <pavan_savoy@ti.com> [2010-10-07 14:47:16 -0400]:
>
> > From: Pavan Savoy <pavan_savoy@ti.com>
> >
> > This is the bluetooth protocol driver for the TI WiLink7 chipsets.
> > Texas Instrument's WiLink chipsets combine wireless technologies
> > like BT, FM, GPS and WLAN onto a single chip.
> >
> > This Bluetooth driver works on top of the TI_ST shared transport
> > line discipline driver which also allows other drivers like
> > FM V4L2 and GPS character driver to make use of the same UART interface.
> >
> > Signed-off-by: Pavan Savoy <pavan_savoy@ti.com>
> > ---
> > drivers/bluetooth/bt_ti.c | 489 +++++++++++++++++++++++++++++++++++++++++++++
> > 1 files changed, 489 insertions(+), 0 deletions(-)
> > create mode 100644 drivers/bluetooth/bt_ti.c
>
> We don't have filename with bt_.. in drivers/bluetooth/. Maybe ti_st.c
> should be a better name, or something like that.
actually we have the bt prefix for company generic ones where they
didn't wanna use the hardware name.
So I prefer to use the hardware for a driver since it is much more clear
that way. You acronym naming here is bad. It is confusing like hell.
What about just calling this btwilink.c or something. I just spinning
ideas here.
Regards
Marcel
^ permalink raw reply
* [PATCH for 2.6.36 2/2] cpuimx27: fix i2c bus selection
From: Eric Bénard @ 2010-10-08 8:37 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1286527061-3013-1-git-send-email-eric@eukrea.com>
Recent clean of i.MX devices registration changed the i2C bus number
selected for our platform (Freescale start peripheral ID at 1, kernel
now start it at 0 so i.MX27's i2c 1 is kernel's i2c 0).
Without this fix, i2c is unusable on this platform.
Signed-off-by: Eric B?nard <eric@eukrea.com>
Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
arch/arm/mach-imx/mach-cpuimx27.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
index 339150a..6830afd 100644
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@ -259,7 +259,7 @@ static void __init eukrea_cpuimx27_init(void)
i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
- imx27_add_i2c_imx1(&cpuimx27_i2c1_data);
+ imx27_add_i2c_imx0(&cpuimx27_i2c1_data);
platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
--
1.7.0.4
^ permalink raw reply related
* [PATCH v2 for 2.6.36 1/2] cpuimx27: fix compile when ULPI is selected
From: Eric Bénard @ 2010-10-08 8:37 UTC (permalink / raw)
To: linux-arm-kernel
without this patch we get :
arch/arm/mach-imx/built-in.o: In function `eukrea_cpuimx27_init':
eukrea_mbimx27-baseboard.c:(.init.text+0x44c): undefined reference to `mxc_ulpi_access_ops'
Signed-off-by: Eric B?nard <eric@eukrea.com>
---
v2 : remove SPI's select which leaked in previous patch
arch/arm/mach-imx/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index c5c0369..2f7e272 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -122,6 +122,7 @@ config MACH_CPUIMX27
select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MXC_NAND
+ select MXC_ULPI if USB_ULPI
help
Include support for Eukrea CPUIMX27 platform. This includes
specific configurations for the module and its peripherals.
--
1.7.0.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.