Re: [ptxdist] [PATCH 28/48] [procps] Added installation of alternative /etc/sysctl.conf
On Fri, Jan 08, 2010 at 12:14:06AM +0100, Carsten Schlote wrote: Am Freitag, den 08.01.2010, 00:03 +0100 schrieb Ladislav Michl: As newer kernels emulates binary interface we probably do not want to support obsolete interfaces, right? http://lwn.net/Articles/361001/ Hi Thanks for the point. As sysctl was in our firmware for a long time and is still used for older kernels, I added this patch. I will add the comments to the patch, so everyone knows as well. And of course I will remove sysctl from our current dev-firmware asap. Nevertheless I need it for the old projects - all of them are maintained to work with the latest ptxdist version. Then it could be easy to read/write files in /proc/sys directly, unless you found some sysctl entry which does not have its equivalent in /proc/sys. Is it the case? Otherwise, it should be only matter of script(s) modification. ladis -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 28/48] [procps] Added installationof alternative /etc/sysctl.conf
-Ursprüngliche Nachricht- course I will remove sysctl from our current dev-firmware asap. Nevertheless I need it for the old projects - all of them are maintained to work with the latest ptxdist version. Then it could be easy to read/write files in /proc/sys directly, unless you found some sysctl entry which does not have its equivalent in /proc/sys. Is it the case? Otherwise, it should be only matter of script(s) modification. Sure, and i'm going to replace the stuff. But patch 28 just introduced the installation of sysctl.conf after installing sysctl. This should be no problem at all and either uses an empty generic file or a user version from project root. In case you install sysctl for your project, the startup system will check for this config file and call sysctl. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 26/48] Fix issue with Ubuntu 'sh' and .postinst
-Ursprüngliche Nachricht- Von: ptxdist-boun...@pengutronix.de [mailto:ptxdist- boun...@pengutronix.de] Im Auftrag von Frederik Sdun Gesendet: Freitag, 8. Januar 2010 08:35 An: ptxdist@pengutronix.de Betreff: Re: [ptxdist] [PATCH 26/48] Fix issue with Ubuntu 'sh' and .postinst You have to link /bin/sh to /bin/bash instead of dash. Ubuntu uses dash instead of bash. It seems that there's some bashizm in the debian scripts and many people do not realize that they use a bash extension unless they're on a POSIX conform shell and use /bin/sh instead of /bin/bash. That's a common problem. My Ubuntu system works fine with the current setup using dash and I don't want to mod my system. So the other solution is to modify the .postinst scripts to work with a plain POSIX sh shell. So local installs of ipkg file on the host would work correctly on Ubuntu with /bin/sh - not just ipkg installs on the target itself. There /bin/sh is linked to /bin/bash indeed. Changing the bang line was some much easier way without changing the whole script or moding my host system. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 26/48] Fix issue with Ubuntu 'sh' and .postinst
Hey All, Maybe a silly proposal, but why not make a host-bash ? For gstreamer I also have a host-flex, because the flex on Centos 5.4 is to old. Of course that might be a bit of chicken-egg problem when bash is needed to build bash :-) - Erwin Carsten Schlote wrote: -Ursprüngliche Nachricht- Von: ptxdist-boun...@pengutronix.de [mailto:ptxdist- boun...@pengutronix.de] Im Auftrag von Frederik Sdun Gesendet: Freitag, 8. Januar 2010 08:35 An: ptxdist@pengutronix.de Betreff: Re: [ptxdist] [PATCH 26/48] Fix issue with Ubuntu 'sh' and .postinst You have to link /bin/sh to /bin/bash instead of dash. Ubuntu uses dash instead of bash. It seems that there's some bashizm in the debian scripts and many people do not realize that they use a bash extension unless they're on a POSIX conform shell and use /bin/sh instead of /bin/bash. That's a common problem. My Ubuntu system works fine with the current setup using dash and I don't want to mod my system. So the other solution is to modify the .postinst scripts to work with a plain POSIX sh shell. So local installs of ipkg file on the host would work correctly on Ubuntu with /bin/sh - not just ipkg installs on the target itself. There /bin/sh is linked to /bin/bash indeed. Changing the bang line was some much easier way without changing the whole script or moding my host system. Carsten -- ptxdist mailing list ptxdist@pengutronix.de -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] [acl][v2] Added packet for libacl.so and acl tools.
From: Carsten Schlote c.schl...@konzeptpark.de The libacl.so is required by other target tools. The packet also includes acl control functions, which can be installed on demand. Signed-off-by: Carsten Schlote c.schl...@konzeptp[acl] Added packet for libacl.so and tools. --- .../add-DESTDIR-to-fix-crosscompile-install.patch | 232 patches/acl-2.2.48/series |1 + rules/acl.in | 24 ++ rules/acl.make | 104 + 4 files changed, 361 insertions(+), 0 deletions(-) create mode 100644 patches/acl-2.2.48/add-DESTDIR-to-fix-crosscompile-install.patch create mode 100644 patches/acl-2.2.48/series create mode 100644 rules/acl.in create mode 100644 rules/acl.make diff --git a/patches/acl-2.2.48/add-DESTDIR-to-fix-crosscompile-install.patch b/patches/acl-2.2.48/add-DESTDIR-to-fix-crosscompile-install.patch new file mode 100644 index 000..1b16b71 --- /dev/null +++ b/patches/acl-2.2.48/add-DESTDIR-to-fix-crosscompile-install.patch @@ -0,0 +1,232 @@ +This patch adds $(DESDIR) to the installation paths to allow proper +use of make install from ptxdist. + +Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de +--- + Makefile|8 +--- + chacl/Makefile |4 ++-- + doc/Makefile|6 +++--- + getfacl/Makefile|4 ++-- + include/Makefile| 10 +- + include/buildmacros | 40 + libacl/Makefile |2 +- + man/Makefile|6 ++ + setfacl/Makefile|4 ++-- + 9 files changed, 46 insertions(+), 38 deletions(-) + +Index: acl-2.2.48/chacl/Makefile +=== +--- acl-2.2.48.orig/chacl/Makefile 2009-06-22 20:37:31.0 +0200 acl-2.2.48/chacl/Makefile 2009-12-15 21:00:35.627907040 +0100 +@@ -30,6 +30,6 @@ + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR) ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR) + install-dev install-lib: +Index: acl-2.2.48/doc/Makefile +=== +--- acl-2.2.48.orig/doc/Makefile 2009-06-22 20:37:31.0 +0200 acl-2.2.48/doc/Makefile2009-12-15 21:00:35.627907040 +0100 +@@ -31,12 +31,12 @@ + $(ZIP) --best -c CHANGES $@ + + install: default +- $(INSTALL) -m 755 -d $(PKG_DOC_DIR) +- $(INSTALL) -m 644 PORTING CHANGES.gz $(PKG_DOC_DIR) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR) ++ $(INSTALL) -m 644 PORTING CHANGES.gz $(DESTDIR)$(PKG_DOC_DIR) + ifeq ($(PKG_DISTRIBUTION), debian) + $(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz + else +- $(INSTALL) -m 644 COPYING COPYING.LGPL $(PKG_DOC_DIR) ++ $(INSTALL) -m 644 COPYING COPYING.LGPL $(DESTDIR)$(PKG_DOC_DIR) + endif + + install-dev install-lib: +Index: acl-2.2.48/getfacl/Makefile +=== +--- acl-2.2.48.orig/getfacl/Makefile 2009-06-22 20:37:31.0 +0200 acl-2.2.48/getfacl/Makefile2009-12-15 21:00:35.627907040 +0100 +@@ -31,6 +31,6 @@ + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR) ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR) + install-dev install-lib: +Index: acl-2.2.48/include/Makefile +=== +--- acl-2.2.48.orig/include/Makefile 2009-06-22 20:37:31.0 +0200 acl-2.2.48/include/Makefile2009-12-15 21:00:35.627907040 +0100 +@@ -31,10 +31,10 @@ + include $(BUILDRULES) + + install-dev: default +- $(INSTALL) -m 755 -d $(PKG_INC_DIR) +- $(INSTALL) -m 755 -d $(PKG_INC_DIR)/sys +- $(INSTALL) -m 644 acl.h $(PKG_INC_DIR)/sys/acl.h +- $(INSTALL) -m 755 -d $(PKG_INC_DIR)/acl +- $(INSTALL) -m 644 libacl.h $(PKG_INC_DIR)/acl/libacl.h ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)/sys ++ $(INSTALL) -m 644 acl.h $(DESTDIR)$(PKG_INC_DIR)/sys/acl.h ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)/acl ++ $(INSTALL) -m 644 libacl.h $(DESTDIR)$(PKG_INC_DIR)/acl/libacl.h + + install install-lib: +Index: acl-2.2.48/include/buildmacros +=== +--- acl-2.2.48.orig/include/buildmacros2009-06-22 20:37:31.0 +0200 acl-2.2.48/include/buildmacros 2009-12-15 21:00:35.627907040 +0100 +@@ -68,9 +68,9 @@ + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +-
[ptxdist] [PATCH 2/2] [host-libacl][v2] Added host compile for libacl.so and headers
From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools, e.g. the e2fsprogs or other stuff needed ACL support for filesystems on the host side. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-acl.in|8 + rules/host-acl.make | 86 ++ rules/host-gperf.in |1 + rules/host-libacl.in |5 --- 4 files changed, 95 insertions(+), 5 deletions(-) create mode 100644 rules/host-acl.in create mode 100644 rules/host-acl.make delete mode 100644 rules/host-libacl.in diff --git a/rules/host-acl.in b/rules/host-acl.in new file mode 100644 index 000..4180ca4 --- /dev/null +++ b/rules/host-acl.in @@ -0,0 +1,8 @@ +## SECTION=hosttools_noprompt + +config HOST_ACL + tristate + select HOST_ATTR + prompt acl + help + FIXME diff --git a/rules/host-acl.make b/rules/host-acl.make new file mode 100644 index 000..fa4487e --- /dev/null +++ b/rules/host-acl.make @@ -0,0 +1,86 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_ACL) += host-acl + +# +# Paths and names +# +HOST_ACL_DIR = $(HOST_BUILDDIR)/$(ACL) + +# +# Get +# + +$(STATEDIR)/host-acl.get: $(STATEDIR)/acl.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-acl.extract: + @$(call targetinfo) + @$(call clean, $(HOST_ACL_DIR)) + @$(call extract, ACL, $(HOST_BUILDDIR)) + @$(call patchin, ACL, $(HOST_ACL_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_ACL_PATH := PATH=$(HOST_PATH) +HOST_ACL_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_ACL_AUTOCONF := $(HOST_AUTOCONF) + +#$(STATEDIR)/host-acl.prepare: +# @$(call targetinfo) +# @$(call clean, $(HOST_ACL_DIR)/config.cache) +# cd $(HOST_ACL_DIR) \ +# $(HOST_ACL_PATH) $(HOST_ACL_ENV) \ +# ./configure $(HOST_ACL_AUTOCONF) +# @$(call touch) + +# +# Compile +# + +#$(STATEDIR)/host-acl.compile: +# @$(call targetinfo) +# cd $(HOST_ACL_DIR) $(HOST_ACL_PATH) $(MAKE) $(PARALLELMFLAGS) +# @$(call touch) + +# +# Install +# + +#$(STATEDIR)/host-acl.install: +# @$(call targetinfo) +# @$(call install, HOST_ACL) +# @$(call touch) + +# +# Clean +# + +host-acl_clean: + rm -rf $(STATEDIR)/host-acl.* + rm -rf $(HOST_ACL_DIR) + +# vim: syntax=make diff --git a/rules/host-gperf.in b/rules/host-gperf.in index 7105958..ccd6979 100644 --- a/rules/host-gperf.in +++ b/rules/host-gperf.in @@ -2,6 +2,7 @@ config HOST_GPERF tristate + select HOST_ACL help Perfect hash function generator diff --git a/rules/host-libacl.in b/rules/host-libacl.in deleted file mode 100644 index 8c5fea1..000 --- a/rules/host-libacl.in +++ /dev/null @@ -1,5 +0,0 @@ -## SECTION=hosttools_noprompt - -config HOST_LIBACL - tristate - select HOST_ATTR -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Busybox build error
Using ptxdist-2010.01.0 I get the busybox build error shown below. It looks like the binary does not get renamed by the new dummy-strip. In my case the target system is x86 and I don't use any cross compiler, perhaps the host strip does need to leak through here. Thanks, Rene CC util-linux/umount.o AR util-linux/lib.a LINKbusybox_unstripped Trying libraries: crypt m Library crypt is not needed, excluding it Library m is not needed, excluding it Final link with: none ptxdist: Discarding 'strip -s --remove-section=.note -remove-section=.comment busybox_unstripped -o busybox' chmod: cannot access `busybox': No such file or directory make[1]: *** [busybox] Error 1 make[1]: Leaving directory `/home/rhuber/test/build-target/busybox-1.15.2' make: *** [/home/rhuber/test/state/busybox.compile] Error 2 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 28/48] [procps] Added installation of alternative /etc/sysctl.conf
On Fri, Jan 08, 2010 at 12:14:45PM +0100, Carsten Schlote wrote: -Urspr?ngliche Nachricht- Then it could be easy to read/write files in /proc/sys directly, unless you found some sysctl entry which does not have its equivalent in /proc/sys. Is it the case? Otherwise, it should be only matter of script(s) modification. Sure, and i'm going to replace the stuff. But patch 28 just introduced the installation of sysctl.conf after installing sysctl. This should be no problem at all and either uses an empty generic file or a user version from project root. In case you install sysctl for your project, the startup system will check for this config file and call sysctl. I'm perfectly fine with that. I'd just like to see no PROCPS_SYSCTL in PTXdist config files at all, which is rather hard because 1) we are importing Busybox' version anyway 2) people won't understand it was removed for their own good ;-) So lets individuals decide and document it. ladis (thinking enlighted autocracy is the only right form of governement) -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] [host-acl][v3] Added host compile for libacl.so and headers
From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools, e.g. the e2fsprogs or other stuff needed ACL support for filesystems on the host side. The host-libacl.in file has no .make file to delete. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-acl.in|7 + rules/host-acl.make | 60 ++ rules/host-libacl.in |5 3 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 rules/host-acl.in create mode 100644 rules/host-acl.make delete mode 100644 rules/host-libacl.in diff --git a/rules/host-acl.in b/rules/host-acl.in new file mode 100644 index 000..7023b7e --- /dev/null +++ b/rules/host-acl.in @@ -0,0 +1,7 @@ +## SECTION=hosttools_noprompt + +config HOST_ACL + tristate + select HOST_ATTR + help + FIXME diff --git a/rules/host-acl.make b/rules/host-acl.make new file mode 100644 index 000..ba2be8d --- /dev/null +++ b/rules/host-acl.make @@ -0,0 +1,60 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_ACL) += host-acl + +# +# Paths and names +# +HOST_ACL_DIR = $(HOST_BUILDDIR)/$(ACL) + +# +# Get +# + +$(STATEDIR)/host-acl.get: $(STATEDIR)/acl.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-acl.extract: + @$(call targetinfo) + @$(call clean, $(HOST_ACL_DIR)) + @$(call extract, ACL, $(HOST_BUILDDIR)) + @$(call patchin, ACL, $(HOST_ACL_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_ACL_PATH := PATH=$(HOST_PATH) +HOST_ACL_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_ACL_AUTOCONF := $(HOST_AUTOCONF) + +# +# Clean +# + +host-acl_clean: + rm -rf $(STATEDIR)/host-acl.* + rm -rf $(HOST_ACL_DIR) + +# vim: syntax=make diff --git a/rules/host-libacl.in b/rules/host-libacl.in deleted file mode 100644 index 8c5fea1..000 --- a/rules/host-libacl.in +++ /dev/null @@ -1,5 +0,0 @@ -## SECTION=hosttools_noprompt - -config HOST_LIBACL - tristate - select HOST_ATTR -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/2] [acl][v2] Added packet for libacl.so and acl tools.
+ +-LCFLAGS = -include perm_copy.h ++LCFLAGS = -include perm_copy.h -I$(prefix)/include ^^ this is probably wrong, if prefix == /usr host include will leak in Without this hack, I had a problem with xattr.h no found on compile, although it is available in sysroot-target from previous libattr+headers build and install. I tried many other ways to fix this. This one worked. Still no glue, what is the real problem. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/2] [acl][v2] Added packet for libacl.so and acl tools.
the build system has to respect CPPFLAGS, i.e. not overwrite then and use them If I remember right, I also tried this 'standard' without success. I'm just rebuilding our ptxdist project with the latest fixes to ACL and HOST-ACL. Assuming the build still works as expected I will examine this problem again. And use better ways to fix it if possible. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Busybox build error
Rene Huber wrote:
Using ptxdist-2010.01.0 I get the busybox build error shown below.
It looks like the binary does not get renamed by the new dummy-strip.
In my case the target system is x86 and I don't use any cross compiler,
perhaps the host strip does need to leak through here.
CC util-linux/umount.o
AR util-linux/lib.a
LINKbusybox_unstripped
Trying libraries: crypt m
Library crypt is not needed, excluding it
Library m is not needed, excluding it
Final link with: none
ptxdist: Discarding 'strip -s --remove-section=.note -remove-section=.comment
busybox_unstripped -o busybox'
the dummy strip does not support -o that's a bug, but why doesn't this show
up here?
ahh...now I get it.
you don't use any cross compiler so busybox will use strip which is dummy
strip now. we use a cross compiler busybox is cross-aware and will use
$CROSS_COMPILE-strip, which will work, of course.
chmod: cannot access `busybox': No such file or directory
make[1]: *** [busybox] Error 1
make[1]: Leaving directory `/home/rhuber/test/build-target/busybox-1.15.2'
make: *** [/home/rhuber/test/state/busybox.compile] Error 2
cheers, Marc
please try the attached patch:
---
From d90e885ac877b8a4037d7ab138cc4aaf8230072f Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde m...@pengutronix.de
Date: Fri, 8 Jan 2010 15:27:28 +0100
Subject: [PATCH] [dummy-strip] add support for -o option
Compiling busybox without a CROSS_COMPILE defined, which is a valid use
case, busybox will use strip for stripping. Since commit
b0b990da3d10efe6368004408649bd3b35fd0b47 we have a dummy strip installed
to SYSROOT_CROSS. This command does nothing.
However busybox uses strip input -o output during strip, to create
the stripped variant. Our dummy strip doens't support the '-o' option.
This is why busybox fails withs:
ptxdist: Discarding 'strip -s --remove-section=.note
-remove-section=.comment busybox_unstripped -o busybox'
This patch add support for '-o' to strip.
Reported-by: Rene Huber renehub...@netscape.net
Signed-off-by: Marc Kleine-Budde m...@pengutronix.de
CC: Wolfram Sang w.s...@pengutronix.de
---
scripts/dummy-strip.sh | 33 ++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/scripts/dummy-strip.sh b/scripts/dummy-strip.sh
index 21d2eb6..05e58c8 100644
--- a/scripts/dummy-strip.sh
+++ b/scripts/dummy-strip.sh
@@ -1,11 +1,38 @@
-#! /bin/sh
-# dummy-strip.sh for PTXdist - Copyright (C) 2009 by Wolfram Sang
+#!/bin/bash
+#
+# dummy-strip.sh for ptxdist - Copyright (C) 2009 by Wolfram Sang
+#2010 by Marc Kleine-Budde
#
# This scripts gets installed into the cross-environment as a 'dummy'-strip
# program. As programs like 'install -s' just call 'strip', this prevents
# leaking in of the host-version of strip. Also, it does intentionally
# nothing as we want to strip at a later stage.
#
+
echo ptxdist: Discarding 'strip $*'
-exit 0
+unset output
+unset input
+
+while [ ${#} -ne 0 ]; do
+arg=${1}
+shift
+
+case ${arg} in
+ -o)
+ output=${1}
+ shift
+ ;;
+ -*)
+ ;;
+ *)
+ input=${arg}
+ ;;
+esac
+done
+
+if [ -n ${output} ]; then
+cp ${input} ${output} || exit
+fi
+
+exit 0
--
1.6.5.7
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 3/3] [host-attr] Added host compile for libattr.so and headers
From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools, e.g. e2fstools or other host tools which need to care about xattr on filesystems. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-attr.in |2 + rules/host-attr.make | 61 ++ 2 files changed, 63 insertions(+), 0 deletions(-) create mode 100644 rules/host-attr.make diff --git a/rules/host-attr.in b/rules/host-attr.in index 4cf5ed8..ced71aa 100644 --- a/rules/host-attr.in +++ b/rules/host-attr.in @@ -2,3 +2,5 @@ config HOST_ATTR tristate + help + FIXME diff --git a/rules/host-attr.make b/rules/host-attr.make new file mode 100644 index 000..0227aa9 --- /dev/null +++ b/rules/host-attr.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_ATTR) += host-attr + +# +# Paths and names +# +HOST_ATTR_DIR = $(HOST_BUILDDIR)/$(ATTR) + +# +# Get +# + +$(STATEDIR)/host-attr.get: $(STATEDIR)/attr.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-attr.extract: + @$(call targetinfo) + @$(call clean, $(HOST_ATTR_DIR)) + @$(call extract, ATTR, $(HOST_BUILDDIR)) + @$(call patchin, ATTR, $(HOST_ATTR_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_ATTR_PATH := PATH=$(HOST_PATH) +HOST_ATTR_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_ATTR_AUTOCONF := $(HOST_AUTOCONF) + + +# +# Clean +# + +host-attr_clean: + rm -rf $(STATEDIR)/host-attr.* + rm -rf $(HOST_ATTR_DIR) + +# vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] [attr] Added additional patches for ATTR
From: Carsten Schlote c.schl...@konzeptpark.de Some more DESTDIR fixes. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- patches/attr-2.4.44/fix-buildsystem-additions.diff | 200 patches/attr-2.4.44/series |4 +- 2 files changed, 201 insertions(+), 3 deletions(-) create mode 100644 patches/attr-2.4.44/fix-buildsystem-additions.diff diff --git a/patches/attr-2.4.44/fix-buildsystem-additions.diff b/patches/attr-2.4.44/fix-buildsystem-additions.diff new file mode 100644 index 000..1cce851 --- /dev/null +++ b/patches/attr-2.4.44/fix-buildsystem-additions.diff @@ -0,0 +1,200 @@ +Subject: [patch] attr: make attr DESTDIR aware - enhancements +From: Carsten Schlote c.schl...@konzeptpark.de + +Make DESTDIR aware at several other places to allow the +attr target tools to be installed correctly. + +Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de + +--- + Makefile|8 +--- + attr/Makefile |4 ++-- + doc/Makefile|6 +++--- + getfattr/Makefile |4 ++-- + include/Makefile|4 ++-- + include/buildmacros | 30 +++--- + man/Makefile|6 ++ + setfattr/Makefile |4 ++-- + 8 files changed, 37 insertions(+), 29 deletions(-) + +# 20091213 rsc: submitted as https://savannah.nongnu.org/bugs/index.php?28281 + + + +Index: attr-2.4.44/include/buildmacros +=== +--- attr-2.4.44.orig/include/buildmacros 2010-01-08 15:36:45.0 +0100 attr-2.4.44/include/buildmacros2010-01-08 15:37:20.0 +0100 +@@ -68,9 +68,9 @@ + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \ +- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR) ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \ ++ ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \ ++ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR) + endif + + # Libtool thinks the static and shared libs should be in the same dir, so +@@ -82,15 +82,15 @@ + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB_DEV = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ +- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \ ++ ../$(INSTALL) -T so_base $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \ + if test x$(PKG_DEVLIB_DIR) != x$(PKG_LIB_DIR) ; then \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).a; \ ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).la; \ ++ ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ + fi + else + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) +@@ -98,8 +98,8 @@ + + INSTALL_LTLIB_STATIC = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR) ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR) + + INSTALL_MAN = \ + @for d in $(MAN_PAGES); do \ +@@ -132,8 +132,8 @@ + @for l in $(LINGUAS) ; do \ + if test -f $$l.mo ; then \ + ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \ +- $(INSTALL) -m 755 -d $$ldir; \ +- $(INSTALL) -m 644 $$l.mo $$ldir/$(PKG_NAME).mo; \ ++ $(INSTALL) -m 755 -d $(DESTDIR)$$ldir; \ ++ $(INSTALL) -m 644 $$l.mo $(DESTDIR)$$ldir/$(PKG_NAME).mo; \ + fi; \ + done + endif +Index: attr-2.4.44/Makefile +=== +--- attr-2.4.44.orig/Makefile 2010-01-08 15:36:16.0 +0100 attr-2.4.44/Makefile 2010-01-08 15:37:20.0 +0100 +@@ -89,9 +89,11 @@ + $(MAKE) $(AM_MAKEFLAGS)
[ptxdist] [PATCH 1/3] [attr] Added packet for libattr.so and tools.
From: Carsten Schlote c.schl...@konzeptpark.de This target build is required for other target tools or for included attr control functions. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/attr.in |7 ++- rules/attr.make | 26 -- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/rules/attr.in b/rules/attr.in index 4e4fa56..196df22 100644 --- a/rules/attr.in +++ b/rules/attr.in @@ -5,12 +5,17 @@ menuconfig ATTR select HOST_GETTEXT if ATTR_GETTEXT prompt attr help - This is the extended attributes project for the ext2 and ext3 filesystems. For reference, have a look at the project homepage: http://acl.bestbits.at/ +config ATTR_SHARED + bool + depends on ATTR + default y + prompt Install shared lib + config ATTR_GETTEXT bool depends on ATTR diff --git a/rules/attr.make b/rules/attr.make index b78c61c..bb003a3 100644 --- a/rules/attr.make +++ b/rules/attr.make @@ -23,6 +23,8 @@ ATTR_SOURCE := $(SRCDIR)/$(ATTR).src.$(ATTR_SUFFIX) ATTR_DIR := $(BUILDDIR)/$(ATTR) ATTR_URL := \ + http://mirrors.zerg.biz/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ + http://mirror.dknss.com/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/cmd_tars-oct_09/$(ATTR).src.$(ATTR_SUFFIX) @@ -49,7 +51,13 @@ ATTR_ENV := \ # ATTR_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --disable-shared + --libexecdir=/usr/lib + +ifdef PTXCONF_ATTR_SHARED +ATTR_AUTOCONF += --enable-shared +else +ATTR_AUTOCONF += --disable-shared +endif ifdef PTXCONF_ATTR_GETTEXT ATTR_AUTOCONF += --enable-gettext @@ -58,6 +66,15 @@ ATTR_AUTOCONF += --disable-gettext endif # +# Install +# + +$(STATEDIR)/attr.install: + @$(call targetinfo) + @$(call install, ATTR) + @$(call touch) + +# # Target-Install # @@ -77,6 +94,11 @@ $(STATEDIR)/attr.targetinstall: @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/setfattr) @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/getfattr) +ifdef PTXCONF_ATTR_SHARED + @$(call install_copy, attr, 0, 0, 0644, -, /usr/lib/libattr.so.1.1.0) + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so.1) + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so) +endif @$(call install_finish, attr) @$(call touch) @@ -87,7 +109,7 @@ $(STATEDIR)/attr.targetinstall: attr_clean: rm -rf $(STATEDIR)/attr.* - rm -rf $(PKGDIR)/attr_* + rm -rf $(ATTR_PKGDIR)/* rm -rf $(ATTR_DIR) # vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [ANNOUNCE] ptxdist-2010.01.0 Generic Reference Project released
PTXdist 2010.01.0 Generic Reference Project Release --- The PTXdist team has released version 2010.01.0 of the Generic Reference Project which is intended to be used in conjunction with the ptxdist-2010.01.0 release. About the Generic Reference Project --- The 2010.01.0 Generic Reference Project is a generic PTXdist based project that can act as a basic project to clone user defined projects from. It is also intended for beginners in PTXdist to get an idea how PTXdist works and how to handle PTXdist based projects to adapt them to their own embedded needs. The Generic Reference Project is coming in two archives: 1) From our website at: http://www.oselas.de/oselas/bsp/index_en.html: * OSELAS.BSP-Pengutronix-Generic-2010.01.0.tgz This archive is intended for beginners in PTXdist, as it comes with extensive manuals how to work with PTXdist and this project. Users don't need any real hardware to work with the platforms from the project, they are prepared to run in a QEMU environment. The manuals contain a step by step tutorial from installing and configuring the required components, building the binaries for the target systems and running them in QEMU. 2) From our website at: http://www.oselas.de/software/ptxdist/download/ * ptxdist-2010.01.0-projects.tgz This archive is intended to be used as a source to clone from. It does not contain any manuals. -- Pengutronix e.K. | Juergen Beisert | Linux Solutions for Science and Industry | Phone: +49-8766-939 228 | Vertretung Sued/Muenchen, Germany | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de/ | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Busybox build error
Wolfram Sang wrote: However busybox uses strip input -o output during strip, to create the stripped variant. Our dummy strip doens't support the '-o' option. This is why busybox fails withs: ptxdist: Discarding 'strip -s --remove-section=.note -remove-section=.comment busybox_unstripped -o busybox' This patch add support for '-o' to strip. Hmm, that means we have a stripped binary when not using cross-toolchains and an unstripped one if using the host-toolchain. I wouldn't say this is a show-stopper, but maybe we can additionally convince busybox to not strip? And then strip ourselves at the targetinstall stage as usual? Yes, that should be possilbe. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/3] [attr] Added packet for libattr.so and tools.
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de This target build is required for other target tools or for included attr control functions. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/attr.in |7 ++- rules/attr.make | 26 -- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/rules/attr.in b/rules/attr.in index 4e4fa56..196df22 100644 --- a/rules/attr.in +++ b/rules/attr.in @@ -5,12 +5,17 @@ menuconfig ATTR select HOST_GETTEXT if ATTR_GETTEXT prompt attr help - This is the extended attributes project for the ext2 and ext3 filesystems. For reference, have a look at the project homepage: http://acl.bestbits.at/ +config ATTR_SHARED + bool + depends on ATTR + default y + prompt Install shared lib + config ATTR_GETTEXT bool depends on ATTR diff --git a/rules/attr.make b/rules/attr.make index b78c61c..bb003a3 100644 --- a/rules/attr.make +++ b/rules/attr.make @@ -23,6 +23,8 @@ ATTR_SOURCE := $(SRCDIR)/$(ATTR).src.$(ATTR_SUFFIX) ATTR_DIR := $(BUILDDIR)/$(ATTR) ATTR_URL := \ + http://mirrors.zerg.biz/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ + http://mirror.dknss.com/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/cmd_tars-oct_09/$(ATTR).src.$(ATTR_SUFFIX) @@ -49,7 +51,13 @@ ATTR_ENV := \ # ATTR_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --disable-shared + --libexecdir=/usr/lib does it actually install something to libexecdir? IMHO it should be /usr/lib/package or /usr/bin + +ifdefPTXCONF_ATTR_SHARED +ATTR_AUTOCONF += --enable-shared +else +ATTR_AUTOCONF += --disable-shared +endif ifdef PTXCONF_ATTR_GETTEXT ATTR_AUTOCONF += --enable-gettext @@ -58,6 +66,15 @@ ATTR_AUTOCONF += --disable-gettext endif # +# Install +# + +$(STATEDIR)/attr.install: + @$(call targetinfo) + @$(call install, ATTR) + @$(call touch) please remove that rule + +# # Target-Install # @@ -77,6 +94,11 @@ $(STATEDIR)/attr.targetinstall: @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/setfattr) @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/getfattr) +ifdefPTXCONF_ATTR_SHARED + @$(call install_copy, attr, 0, 0, 0644, -, /usr/lib/libattr.so.1.1.0) + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so.1) + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so) +endif @$(call install_finish, attr) @$(call touch) @@ -87,7 +109,7 @@ $(STATEDIR)/attr.targetinstall: attr_clean: rm -rf $(STATEDIR)/attr.* - rm -rf $(PKGDIR)/attr_* + rm -rf $(ATTR_PKGDIR)/* rm -rf $(ATTR_DIR) # vim: syntax=make otherwise it looks good Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] [attr] Added additional patches for ATTR
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Some more DESTDIR fixes. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- patches/attr-2.4.44/fix-buildsystem-additions.diff | 200 patches/attr-2.4.44/series |4 +- 2 files changed, 201 insertions(+), 3 deletions(-) create mode 100644 patches/attr-2.4.44/fix-buildsystem-additions.diff diff --git a/patches/attr-2.4.44/fix-buildsystem-additions.diff b/patches/attr-2.4.44/fix-buildsystem-additions.diff new file mode 100644 index 000..1cce851 --- /dev/null +++ b/patches/attr-2.4.44/fix-buildsystem-additions.diff @@ -0,0 +1,200 @@ +Subject: [patch] attr: make attr DESTDIR aware - enhancements +From: Carsten Schlote c.schl...@konzeptpark.de + +Make DESTDIR aware at several other places to allow the +attr target tools to be installed correctly. + +Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de + +--- + Makefile|8 +--- + attr/Makefile |4 ++-- + doc/Makefile|6 +++--- + getfattr/Makefile |4 ++-- + include/Makefile|4 ++-- + include/buildmacros | 30 +++--- + man/Makefile|6 ++ + setfattr/Makefile |4 ++-- + 8 files changed, 37 insertions(+), 29 deletions(-) + +# 20091213 rsc: submitted as https://savannah.nongnu.org/bugs/index.php?28281 are you sure this comment is correct? + + + +Index: attr-2.4.44/include/buildmacros +=== +--- attr-2.4.44.orig/include/buildmacros 2010-01-08 15:36:45.0 +0100 attr-2.4.44/include/buildmacros 2010-01-08 15:37:20.0 +0100 +@@ -68,9 +68,9 @@ + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +-../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +-../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \ +-../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR) ++../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \ ++../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \ ++../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR) + endif + + # Libtool thinks the static and shared libs should be in the same dir, so +@@ -82,15 +82,15 @@ + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB_DEV = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +-../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ +-../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ +-../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ +-../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +-../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ ++../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++../$(INSTALL) -m 644 $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ ++../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \ ++../$(INSTALL) -T so_base $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \ + if test x$(PKG_DEVLIB_DIR) != x$(PKG_LIB_DIR) ; then \ +-../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ +-../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ +-../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ ++../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).a; \ ++../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).la; \ ++../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ + fi + else + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) +@@ -98,8 +98,8 @@ + + INSTALL_LTLIB_STATIC = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +-../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ +-../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR) ++../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR) + + INSTALL_MAN = \ + @for d in $(MAN_PAGES); do \ +@@ -132,8 +132,8 @@ + @for l in $(LINGUAS) ; do \ + if test -f $$l.mo ; then \ + ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \ +-$(INSTALL) -m 755 -d $$ldir; \ +-$(INSTALL) -m 644 $$l.mo $$ldir/$(PKG_NAME).mo; \ ++$(INSTALL) -m 755 -d $(DESTDIR)$$ldir; \ ++$(INSTALL) -m 644 $$l.mo $(DESTDIR)$$ldir/$(PKG_NAME).mo; \ + fi; \ + done + endif +Index: attr-2.4.44/Makefile +=== +--- attr-2.4.44.orig/Makefile2010-01-08 15:36:16.0 +0100 attr-2.4.44/Makefile
[ptxdist] [ANNOUNCE] Documentation update
To be in sync with the current ptxdist-2010.01.0 release we updated our PTXdist Application Notes at our website at http://www.oselas.de/software/ptxdist/appnotes_en.html We also add the extensive manual: How to become a PTXdist Guru This manual is intended for beginners in PTXdist, but also for experts. For beginners it provides a step by step tutorial how to get a working environment and building all the required components to run an embedded target. For the experts this manual provides a PTXdist reference and other helpful sections about new features the ptxdist-2010 series offer and how to use them. Any comment about the manual will be appreciated, also suggestions about currently missing topics we should add. Regards, Juergen Beisert -- Pengutronix e.K. | Juergen Beisert | Linux Solutions for Science and Industry | Phone: +49-8766-939 228 | Vertretung Sued/Muenchen, Germany | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de/ | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/3] [host-attr] Added host compile for libattr.so and headers
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools, e.g. e2fstools or other host tools which need to care about xattr on filesystems. applied, tnx Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-attr.in |2 + rules/host-attr.make | 61 ++ 2 files changed, 63 insertions(+), 0 deletions(-) create mode 100644 rules/host-attr.make diff --git a/rules/host-attr.in b/rules/host-attr.in index 4cf5ed8..ced71aa 100644 --- a/rules/host-attr.in +++ b/rules/host-attr.in @@ -2,3 +2,5 @@ config HOST_ATTR tristate + help + FIXME diff --git a/rules/host-attr.make b/rules/host-attr.make new file mode 100644 index 000..0227aa9 --- /dev/null +++ b/rules/host-attr.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_ATTR) += host-attr + +# +# Paths and names +# +HOST_ATTR_DIR= $(HOST_BUILDDIR)/$(ATTR) + +# +# Get +# + +$(STATEDIR)/host-attr.get: $(STATEDIR)/attr.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-attr.extract: + @$(call targetinfo) + @$(call clean, $(HOST_ATTR_DIR)) + @$(call extract, ATTR, $(HOST_BUILDDIR)) + @$(call patchin, ATTR, $(HOST_ATTR_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_ATTR_PATH := PATH=$(HOST_PATH) +HOST_ATTR_ENV:= $(HOST_ENV) + +# +# autoconf +# +HOST_ATTR_AUTOCONF := $(HOST_AUTOCONF) + + +# +# Clean +# + +host-attr_clean: + rm -rf $(STATEDIR)/host-attr.* + rm -rf $(HOST_ATTR_DIR) + +# vim: syntax=make -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/3] [attr] Added packet for libattr.so and tools.
From: Carsten Schlote c.schl...@konzeptpark.de This target build provides libattr.so and includes the attr control functions. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/attr.in |7 ++- rules/attr.make | 17 +++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/rules/attr.in b/rules/attr.in index 4e4fa56..196df22 100644 --- a/rules/attr.in +++ b/rules/attr.in @@ -5,12 +5,17 @@ menuconfig ATTR select HOST_GETTEXT if ATTR_GETTEXT prompt attr help - This is the extended attributes project for the ext2 and ext3 filesystems. For reference, have a look at the project homepage: http://acl.bestbits.at/ +config ATTR_SHARED + bool + depends on ATTR + default y + prompt Install shared lib + config ATTR_GETTEXT bool depends on ATTR diff --git a/rules/attr.make b/rules/attr.make index b78c61c..601fcd5 100644 --- a/rules/attr.make +++ b/rules/attr.make @@ -23,6 +23,8 @@ ATTR_SOURCE := $(SRCDIR)/$(ATTR).src.$(ATTR_SUFFIX) ATTR_DIR := $(BUILDDIR)/$(ATTR) ATTR_URL := \ + http://mirrors.zerg.biz/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ + http://mirror.dknss.com/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/cmd_tars-oct_09/$(ATTR).src.$(ATTR_SUFFIX) @@ -49,7 +51,13 @@ ATTR_ENV := \ # ATTR_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --disable-shared + --libexecdir=/usr/lib + +ifdef PTXCONF_ATTR_SHARED +ATTR_AUTOCONF += --enable-shared +else +ATTR_AUTOCONF += --disable-shared +endif ifdef PTXCONF_ATTR_GETTEXT ATTR_AUTOCONF += --enable-gettext @@ -77,6 +85,11 @@ $(STATEDIR)/attr.targetinstall: @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/setfattr) @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/getfattr) +ifdef PTXCONF_ATTR_SHARED + @$(call install_copy, attr, 0, 0, 0644, -, /usr/lib/libattr.so.1.1.0) + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so.1) + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so) +endif @$(call install_finish, attr) @$(call touch) @@ -87,7 +100,7 @@ $(STATEDIR)/attr.targetinstall: attr_clean: rm -rf $(STATEDIR)/attr.* - rm -rf $(PKGDIR)/attr_* + rm -rf $(ATTR_PKGDIR)/* rm -rf $(ATTR_DIR) # vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] [attr] Patches for build fixes.
From: Carsten Schlote c.schl...@konzeptpark.de Somehow the build still breaks. Reworked previous patch and added more fixes. Now it it builds. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- patches/attr-2.4.44/fix-buildsystem-additions.diff | 217 patches/attr-2.4.44/series |5 +- 2 files changed, 219 insertions(+), 3 deletions(-) create mode 100644 patches/attr-2.4.44/fix-buildsystem-additions.diff diff --git a/patches/attr-2.4.44/fix-buildsystem-additions.diff b/patches/attr-2.4.44/fix-buildsystem-additions.diff new file mode 100644 index 000..cbf1c07 --- /dev/null +++ b/patches/attr-2.4.44/fix-buildsystem-additions.diff @@ -0,0 +1,217 @@ +Subject: [patch] attr: make attr DESTDIR aware +From: Carsten Schlote c.schl...@konzeptpark.de + +Additional DESTDIR awareness. DIST_ROOT caused a compile break. + +Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de + +--- + Makefile|8 +--- + attr/Makefile |4 ++-- + doc/Makefile|6 +++--- + getfattr/Makefile |4 ++-- + include/Makefile|4 ++-- + include/buildmacros | 34 +- + man/Makefile|6 ++ + setfattr/Makefile |4 ++-- + 8 files changed, 39 insertions(+), 31 deletions(-) + +# 20091213 rsc: submitted as https://savannah.nongnu.org/bugs/index.php?28281 + + + +Index: attr-2.4.44/include/buildmacros +=== +--- attr-2.4.44.orig/include/buildmacros 2010-01-08 16:46:35.0 +0100 attr-2.4.44/include/buildmacros2010-01-08 16:46:46.0 +0100 +@@ -40,7 +40,7 @@ + $(LFILES:.l=.o) \ + $(YFILES:%.y=%.tab.o) + +-INSTALL = DIST_ROOT=$(DESTDIR) $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) + + SHELL = /bin/sh + IMAGES_DIR = $(TOPDIR)/all-images +@@ -57,7 +57,7 @@ + + LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC) + LTEXEC = $(LIBTOOL) --mode=execute +-LTINSTALL = DIST_ROOT=$(DESTDIR) $(LIBTOOL) --mode=install $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++LTINSTALL = $(LIBTOOL) --mode=install $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF) + + ifeq ($(ENABLE_SHARED),yes) +@@ -68,9 +68,9 @@ + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \ +- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR) ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \ ++ ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \ ++ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR) + endif + + # Libtool thinks the static and shared libs should be in the same dir, so +@@ -82,15 +82,15 @@ + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB_DEV = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ +- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \ ++ ../$(INSTALL) -T so_base $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \ + if test x$(PKG_DEVLIB_DIR) != x$(PKG_LIB_DIR) ; then \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).a; \ ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).la; \ ++ ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ + fi + else + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) +@@ -98,8 +98,8 @@ + + INSTALL_LTLIB_STATIC = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR) ++ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR) + + INSTALL_MAN = \ + @for d in $(MAN_PAGES); do \ +@@ -132,8 +132,8 @@ + @for l in
[ptxdist] [PATCH 3/3] [host-attr] Added host compile for libattr.so and headers
From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools, e.g. e2fstools or other host tools which need to care about xattr on filesystems. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-attr.in |2 + rules/host-attr.make | 61 ++ 2 files changed, 63 insertions(+), 0 deletions(-) create mode 100644 rules/host-attr.make diff --git a/rules/host-attr.in b/rules/host-attr.in index 4cf5ed8..ced71aa 100644 --- a/rules/host-attr.in +++ b/rules/host-attr.in @@ -2,3 +2,5 @@ config HOST_ATTR tristate + help + FIXME diff --git a/rules/host-attr.make b/rules/host-attr.make new file mode 100644 index 000..0227aa9 --- /dev/null +++ b/rules/host-attr.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_ATTR) += host-attr + +# +# Paths and names +# +HOST_ATTR_DIR = $(HOST_BUILDDIR)/$(ATTR) + +# +# Get +# + +$(STATEDIR)/host-attr.get: $(STATEDIR)/attr.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-attr.extract: + @$(call targetinfo) + @$(call clean, $(HOST_ATTR_DIR)) + @$(call extract, ATTR, $(HOST_BUILDDIR)) + @$(call patchin, ATTR, $(HOST_ATTR_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_ATTR_PATH := PATH=$(HOST_PATH) +HOST_ATTR_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_ATTR_AUTOCONF := $(HOST_AUTOCONF) + + +# +# Clean +# + +host-attr_clean: + rm -rf $(STATEDIR)/host-attr.* + rm -rf $(HOST_ATTR_DIR) + +# vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] [miredo][v2] Added miredo 1.2.2
From: Carsten Schlote c.schl...@konzeptpark.de
This packet provides IPV6 networking with the
tereodo protocol.
The dummy patch is required to keep 'patchin'
working, otherwise the build stops.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
generic/etc/init.d/miredo-server | 89 ++
generic/etc/miredo/client-hook| 70
generic/etc/miredo/miredo-server.conf | 22 +++
generic/etc/miredo/miredo.conf| 35 ++
patches/miredo-1.2.2/autogen.sh |1 +
patches/miredo-1.2.2/series |2 +
rules/miredo.in | 35 ++
rules/miredo.make | 113 +
8 files changed, 367 insertions(+), 0 deletions(-)
create mode 100644 generic/etc/init.d/miredo-server
create mode 100644 generic/etc/miredo/client-hook
create mode 100644 generic/etc/miredo/miredo-server.conf
create mode 100644 generic/etc/miredo/miredo.conf
create mode 12 patches/miredo-1.2.2/autogen.sh
create mode 100644 patches/miredo-1.2.2/dummy.patch
create mode 100644 patches/miredo-1.2.2/series
create mode 100644 rules/miredo.in
create mode 100644 rules/miredo.make
diff --git a/generic/etc/init.d/miredo-server b/generic/etc/init.d/miredo-server
new file mode 100644
index 000..271d173
--- /dev/null
+++ b/generic/etc/init.d/miredo-server
@@ -0,0 +1,89 @@
+#! /bin/sh
+# $Id: miredo-server.init 1754 2006-09-18 14:25:04Z remi $
+#
+# miredo-server start/stop script for Debian GNU/Linux
+# Author: Rémi Denis-Courmont rdenis (at) simphalempin (dot) com
+#
+# chkconfig: 345 17 83
+# description: Starts and stops the miredo-server daemon \
+# used to provide a Teredo server.
+#
+### BEGIN INIT INFO
+# Provides:
+# Required-Start:$local_fs $remote_fs $network $syslog $time
+# Required-Stop: $local_fs $remote_fs $syslog
+# Short-Description: Teredo server
+# Description: miredo-server daemon to provide a Teredo server
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
+### END INIT INFO
+
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+DESC=Teredo server daemon
+NAME=miredo-server
+DAEMON=/usr/sbin/$NAME
+DAEMON_ARGS=
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+[ -x $DAEMON ] || exit 0
+
+# Source defaults.
+[ -r /etc/default/$NAME ] . /etc/default/$NAME
+
+# Ensure configuration is readable.
+[ -r /etc/$NAME.conf ] || exit 0
+
+. /lib/lsb/init-functions
+
+check_start() {
+if [ x$START_MIREDO_SERVER != xtrue ]; then
+echo START_MIREDO_SERVER is set to false in
/etc/default/$NAME
+echo $DAEMON not starting
+exit 0
+fi
+}
+
+check_chroot_dir() {
+if [ -d /var/run/$NAME ]; then
+mkdir -p /var/run/$NAME
+chmod 0755 /var/run/$NAME
+fi
+}
+
+
+case $1 in
+ start)
+check_start
+check_chroot_dir
+log_daemon_msg Starting $DESC $NAME
+start-stop-daemon --start --quiet --pidfile $PIDFILE \
+--exec $DAEMON --oknodo -- $DAEMON_ARGS
+log_end_msg $?
+;;
+ stop)
+log_daemon_msg Stopping $DESC $NAME
+start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+--retry 1 --oknodo
+log_end_msg $?
+;;
+ reload|force-reload)
+log_daemon_msg Reloading $DESC $NAME
+start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE \
+--exec $DAEMON
+log_end_msg $?
+;;
+ restart)
+check_start # avoid stopping if would not restart
+$0 stop
+sleep 1
+$0 start
+;;
+ *)
+echo Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload} 2
+exit 1
+;;
+esac
+
+exit $?
diff --git a/generic/etc/miredo/client-hook b/generic/etc/miredo/client-hook
new file mode 100644
index 000..87ae405
--- /dev/null
+++ b/generic/etc/miredo/client-hook
@@ -0,0 +1,70 @@
+#! /bin/sh
+#
+# Miredo client hook script for Linux/iproute2
+# Copyright © 2007 Rémi Denis-Courmont.
+# Distributed under the terms of the GNU General Public License version 2.
+
+# Linux iproute2 path:
+IP=/sbin/ip
+
+# Linux default route default metric is 1024
+# (we put 1029 so that Teredo is used as a last resort):
+METRIC=1029
+
+# Linux routing table ID
+# (possible values: 1-252 from /etc/iproute/rt_tables):
+TABLE=teredo
+
+# Linux routing rule priority
+# (possible values: 1-32765, lowest number is highest priority):
+PRIO=32765
+
+# MTU for the tunnel interface
+# (default: specified by the Teredo server, or 1280)
+#MTU=1400
+
+if ! test -x $IP; then
+ echo $0: iproute2 is required! Please install it. 2
+ exit 1
+fi
+
+# Nothing to do with destroy event
+if test $STATE = destroy; then exit 0; fi
+
+# If the source routing table is not configured, ignore it.
+if ! $IP route show table $TABLE /dev/null 21; then
+ unset TABLE
+else
+ if
[ptxdist] [PATCH] [openvpn][v2] Added OpenVPN 2.0.9
From: Carsten Schlote c.schl...@konzeptpark.de Added simple to use VPN packet. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/openvpn.in | 22 + rules/openvpn.make | 88 2 files changed, 110 insertions(+), 0 deletions(-) create mode 100644 rules/openvpn.in create mode 100644 rules/openvpn.make diff --git a/rules/openvpn.in b/rules/openvpn.in new file mode 100644 index 000..5c6fe69 --- /dev/null +++ b/rules/openvpn.in @@ -0,0 +1,22 @@ +## SECTION=networking +menuconfig OPENVPN + tristate + default n + prompt OpenVPN + select OPENSSL + select LIBLZO if OPENVPN_LZO +help + This adds OpenVPN to your root filesystem. Plain vanilla + packet. + +if OPENVPN + +config OPENVPN_LZO + bool + prompt Enable LZO compression + help + This enables the LZO compression code. Selecting this option + will select the LZO library as well. + If unsure, say N. + +endif diff --git a/rules/openvpn.make b/rules/openvpn.make new file mode 100644 index 000..5179af5 --- /dev/null +++ b/rules/openvpn.make @@ -0,0 +1,88 @@ +# -*-makefile-*- +# $Id: template 6655 2007-01-02 12:55:21Z rsc $ +# +# Copyright (C) 2007 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_OPENVPN) += openvpn + +# +# Paths and names +# +OPENVPN_VERSION:= 2.0.9 +OPENVPN:= openvpn-$(OPENVPN_VERSION) +OPENVPN_SUFFIX := tar.gz +OPENVPN_URL:= http://openvpn.net/release/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_DIR:= $(BUILDDIR)/$(OPENVPN) + + +# +# Get +# + +$(OPENVPN_SOURCE): + @$(call targetinfo, $@) + @$(call get, OPENVPN) + +# +# Prepare +# + +OPENVPN_PATH := PATH=$(CROSS_PATH) +OPENVPN_ENV:= $(CROSS_ENV) + +# +# autoconf +# +OPENVPN_AUTOCONF := $(CROSS_AUTOCONF_USR) + +ifdef PTXCONF_OPENVPN_LZO +OPENVPN_LZO := --enable-lzo +else +OPENVPN_LZO := --disable-lzo +endif + +# +# Target-Install +# + +$(STATEDIR)/openvpn.targetinstall: + @$(call targetinfo) + + @$(call install_init, openvpn) + @$(call install_fixup, openvpn,PACKAGE,openvpn) + @$(call install_fixup, openvpn,PRIORITY,optional) + @$(call install_fixup, openvpn,VERSION,$(OPENVPN_VERSION)) + @$(call install_fixup, openvpn,SECTION,base) + @$(call install_fixup, openvpn,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) + @$(call install_fixup, openvpn,DEPENDS,) + @$(call install_fixup, openvpn,DESCRIPTION,missing) + + @$(call install_copy, openvpn, 0, 0, 0755, -, /usr/sbin/openvpn) + + @$(call install_copy, openvpn, 0, 0, 0755, /etc/openvpn) + + @$(call install_finish, openvpn) + + @$(call touch) + +# +# Clean +# + +openvpn_clean: + rm -rf $(STATEDIR)/openvpn.* + rm -rf $(OPENVPN_PKGDIR)/* + rm -rf $(OPENVPN_DIR) + +# vim: syntax=make + -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [miredo][v2] Added miredo 1.2.2
Carsten Schlote wrote:
From: Carsten Schlote c.schl...@konzeptpark.de
This packet provides IPV6 networking with the
tereodo protocol.
The dummy patch is required to keep 'patchin'
working, otherwise the build stops.
damn, no autogen.sh without a patch?
please remove any trailing whitespace from the .make file
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
generic/etc/init.d/miredo-server | 89 ++
generic/etc/miredo/client-hook| 70
generic/etc/miredo/miredo-server.conf | 22 +++
generic/etc/miredo/miredo.conf| 35 ++
patches/miredo-1.2.2/autogen.sh |1 +
patches/miredo-1.2.2/series |2 +
rules/miredo.in | 35 ++
rules/miredo.make | 113
+
8 files changed, 367 insertions(+), 0 deletions(-)
create mode 100644 generic/etc/init.d/miredo-server
create mode 100644 generic/etc/miredo/client-hook
create mode 100644 generic/etc/miredo/miredo-server.conf
create mode 100644 generic/etc/miredo/miredo.conf
create mode 12 patches/miredo-1.2.2/autogen.sh
create mode 100644 patches/miredo-1.2.2/dummy.patch
create mode 100644 patches/miredo-1.2.2/series
create mode 100644 rules/miredo.in
create mode 100644 rules/miredo.make
diff --git a/generic/etc/init.d/miredo-server
b/generic/etc/init.d/miredo-server
new file mode 100644
index 000..271d173
--- /dev/null
+++ b/generic/etc/init.d/miredo-server
@@ -0,0 +1,89 @@
+#! /bin/sh
+# $Id: miredo-server.init 1754 2006-09-18 14:25:04Z remi $
+#
+# miredo-server start/stop script for Debian GNU/Linux
+# Author: Rémi Denis-Courmont rdenis (at) simphalempin (dot) com
+#
+# chkconfig: 345 17 83
+# description: Starts and stops the miredo-server daemon \
+# used to provide a Teredo server.
+#
+### BEGIN INIT INFO
+# Provides:
+# Required-Start:$local_fs $remote_fs $network $syslog $time
+# Required-Stop: $local_fs $remote_fs $syslog
+# Short-Description: Teredo server
+# Description: miredo-server daemon to provide a Teredo server
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
+### END INIT INFO
+
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+DESC=Teredo server daemon
+NAME=miredo-server
+DAEMON=/usr/sbin/$NAME
+DAEMON_ARGS=
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+[ -x $DAEMON ] || exit 0
+
+# Source defaults.
+[ -r /etc/default/$NAME ] . /etc/default/$NAME
+
+# Ensure configuration is readable.
+[ -r /etc/$NAME.conf ] || exit 0
+
+. /lib/lsb/init-functions
i think we don't have this file (yet)
+
+check_start() {
+if [ x$START_MIREDO_SERVER != xtrue ]; then
+echo START_MIREDO_SERVER is set to false in
/etc/default/$NAME
+echo $DAEMON not starting
+exit 0
+fi
+}
+
+check_chroot_dir() {
+if [ -d /var/run/$NAME ]; then
+mkdir -p /var/run/$NAME
+chmod 0755 /var/run/$NAME
+fi
+}
+
+
+case $1 in
+ start)
+check_start
+check_chroot_dir
+log_daemon_msg Starting $DESC $NAME
+start-stop-daemon --start --quiet --pidfile $PIDFILE \
+--exec $DAEMON --oknodo -- $DAEMON_ARGS
+log_end_msg $?
+;;
+ stop)
+log_daemon_msg Stopping $DESC $NAME
+start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+--retry 1 --oknodo
+log_end_msg $?
+;;
+ reload|force-reload)
+log_daemon_msg Reloading $DESC $NAME
+start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE \
+--exec $DAEMON
+log_end_msg $?
+;;
+ restart)
+check_start # avoid stopping if would not restart
+$0 stop
+sleep 1
+$0 start
+;;
+ *)
+echo Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}
2
+exit 1
+;;
+esac
+
+exit $?
diff --git a/generic/etc/miredo/client-hook b/generic/etc/miredo/client-hook
new file mode 100644
index 000..87ae405
--- /dev/null
+++ b/generic/etc/miredo/client-hook
@@ -0,0 +1,70 @@
+#! /bin/sh
+#
+# Miredo client hook script for Linux/iproute2
+# Copyright © 2007 Rémi Denis-Courmont.
+# Distributed under the terms of the GNU General Public License version 2.
+
+# Linux iproute2 path:
+IP=/sbin/ip
+
+# Linux default route default metric is 1024
+# (we put 1029 so that Teredo is used as a last resort):
+METRIC=1029
+
+# Linux routing table ID
+# (possible values: 1-252 from /etc/iproute/rt_tables):
+TABLE=teredo
+
+# Linux routing rule priority
+# (possible values: 1-32765, lowest number is highest priority):
+PRIO=32765
+
+# MTU for the tunnel interface
+# (default: specified by the Teredo server, or 1280)
+#MTU=1400
+
+if ! test -x
Re: [ptxdist] [PATCH 30/48] [gettext] Updated to version 0.17
-Ursprüngliche Nachricht- --- a/rules/gettext.make +++ b/rules/gettext.make @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_GETTEXT) += gettext # # Paths and names # -GETTEXT_VERSION:= 0.16.1 +GETTEXT_VERSION:= 0.17 the last time I tried this, it broke compilation on arm. please check Worked fine on PPC here and is a requirement for one of the updated tools in my patch stack. Right now, I have no ARM target project setup up and running. But I will check eventually. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [miredo][v2] Added miredo 1.2.2
The dummy patch is required to keep 'patchin' working, otherwise the build stops. damn, no autogen.sh without a patch? No, the patchin macro stalls and refuses to continue due to empty patch, even without any patch or series file. Just the default autogen.sh script was linked. The dummy script fixes this problem for now. patchin bug/unexpected behaviour? Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [miredo][v2] Added miredo 1.2.2
Carsten Schlote wrote: The dummy patch is required to keep 'patchin' working, otherwise the build stops. damn, no autogen.sh without a patch? No, the patchin macro stalls and refuses to continue due to empty patch, even without any patch or series file. Just the default autogen.sh script was linked. The dummy script fixes this problem for now. patchin bug/unexpected behaviour? rather unexpected and thus a bug please add that comment to the dummy patch Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 30/48] [gettext] Updated to version 0.17
Carsten Schlote wrote: -Ursprüngliche Nachricht- --- a/rules/gettext.make +++ b/rules/gettext.make @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_GETTEXT) += gettext # # Paths and names # -GETTEXT_VERSION:= 0.16.1 +GETTEXT_VERSION:= 0.17 the last time I tried this, it broke compilation on arm. please check Worked fine on PPC here and is a requirement for one of the updated tools in my patch stack. Right now, I have no ARM target project setup up and running. But I will check eventually. 0.17 breaks here on ARM. arm-1136jfs-linux-gnueabi-gcc -DHAVE_CONFIG_H -DEXEEXT=\\ -I. -I.. -I../intl -I../intl -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1 -isystem /home/frogger/pengutronix/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-ARM-reference/sysroot-target/include -isystem /home/frogger/pengutronix/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-ARM-reference/sysroot-target/usr/include -g -O2 -c -o mbchar.o mbchar.c In file included from mbchar.h:158, from mbchar.c:22: /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:112: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:118: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:121: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:125: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:129: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:134: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:137: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:142: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:147: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:152: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:157: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:163: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:176: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:195: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'towlower' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:198: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'towupper' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:222: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'towctrans' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:231: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:237: error: expected ')' before
Re: [ptxdist] [PATCH] [miredo][v2] Added miredo 1.2.2
The dummy script fixes this problem for now. patchin bug/unexpected behaviour? rather unexpected and thus a bug please add that comment to the dummy patch I tried, but this causes patchin to stop due to garbadge in patch file? Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [miredo][v2] Added miredo 1.2.2
Carsten Schlote wrote: The dummy script fixes this problem for now. patchin bug/unexpected behaviour? rather unexpected and thus a bug please add that comment to the dummy patch I tried, but this causes patchin to stop due to garbadge in patch file? even with hashes in the beginning? # # is this really a comment? # Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 30/48] [gettext] Updated to version 0.17
Right now, I have no ARM target project setup up and running. But I will check eventually. 0.17 breaks here on ARM. arm-1136jfs-linux-gnueabi-gcc -DHAVE_CONFIG_H -DEXEEXT=\\ -I. -I.. -I../intl -I../intl -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1 - isystem /home/frogger/pengutronix/bsp/OSELAS.BSP-Pengutronix-AllYes- ... Hmm, ok. Maybe a toolchain too old problem? I'm using the latest GCC and binutils with eglibc 2.10 here. See http://www.vahanus.net/cgi-bin/gitweb.cgi?p=OSELAS.Toolchain.git/.git;a= summary A precompiled toolchain for ARM xscale/BE can be found at http://www.vahanus.net/~csc/downloads/toolchains/. I will refactor the 'for-upstream' commits asap to complete eglibc, GCC 4.4.1 and binutils 2.20 support. It's still the grown mess. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] [attr] Patches for build fixes.
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Somehow the build still breaks. Reworked previous patch and added more fixes. I've reduced the patch to a minimum. please pull and try if it works for you, too. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [openvpn][v2] Added OpenVPN 2.0.9
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Added simple to use VPN packet. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/openvpn.in | 22 + rules/openvpn.make | 88 2 files changed, 110 insertions(+), 0 deletions(-) create mode 100644 rules/openvpn.in create mode 100644 rules/openvpn.make diff --git a/rules/openvpn.in b/rules/openvpn.in new file mode 100644 index 000..5c6fe69 --- /dev/null +++ b/rules/openvpn.in @@ -0,0 +1,22 @@ +## SECTION=networking here a blank line, please +menuconfig OPENVPN + tristate + default n default n is default, please remove + prompt OpenVPN please all lowercase + select OPENSSL + select LIBLZO if OPENVPN_LZO +help + This adds OpenVPN to your root filesystem. Plain vanilla + packet. + +if OPENVPN + +config OPENVPN_LZO + bool + prompt Enable LZO compression + help +This enables the LZO compression code. Selecting this option +will select the LZO library as well. +If unsure, say N. + +endif diff --git a/rules/openvpn.make b/rules/openvpn.make new file mode 100644 index 000..5179af5 --- /dev/null +++ b/rules/openvpn.make @@ -0,0 +1,88 @@ +# -*-makefile-*- +# $Id: template 6655 2007-01-02 12:55:21Z rsc $ please remove that line +# +# Copyright (C) 2007 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_OPENVPN) += openvpn + +# +# Paths and names +# +OPENVPN_VERSION := 2.0.9 +OPENVPN := openvpn-$(OPENVPN_VERSION) +OPENVPN_SUFFIX := tar.gz +OPENVPN_URL := http://openvpn.net/release/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_DIR := $(BUILDDIR)/$(OPENVPN) + + +# +# Get +# + +$(OPENVPN_SOURCE): + @$(call targetinfo, $@) + @$(call get, OPENVPN) + +# +# Prepare +# + +OPENVPN_PATH := PATH=$(CROSS_PATH) +OPENVPN_ENV := $(CROSS_ENV) + +# +# autoconf +# +OPENVPN_AUTOCONF := $(CROSS_AUTOCONF_USR) + +ifdef PTXCONF_OPENVPN_LZO +OPENVPN_LZO := --enable-lzo +else +OPENVPN_LZO := --disable-lzo +endif + +# +# Target-Install +# + +$(STATEDIR)/openvpn.targetinstall: + @$(call targetinfo) + + @$(call install_init, openvpn) + @$(call install_fixup, openvpn,PACKAGE,openvpn) + @$(call install_fixup, openvpn,PRIORITY,optional) + @$(call install_fixup, openvpn,VERSION,$(OPENVPN_VERSION)) + @$(call install_fixup, openvpn,SECTION,base) + @$(call install_fixup, openvpn,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) + @$(call install_fixup, openvpn,DEPENDS,) + @$(call install_fixup, openvpn,DESCRIPTION,missing) + + @$(call install_copy, openvpn, 0, 0, 0755, -, /usr/sbin/openvpn) + + @$(call install_copy, openvpn, 0, 0, 0755, /etc/openvpn) + + @$(call install_finish, openvpn) + + @$(call touch) + +# +# Clean +# + +openvpn_clean: + rm -rf $(STATEDIR)/openvpn.* + rm -rf $(OPENVPN_PKGDIR)/* + rm -rf $(OPENVPN_DIR) + +# vim: syntax=make + some startscripts would be nice. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [miredo][v2] Added miredo 1.2.2
Carsten Schlote wrote: even with hashes in the beginning? # # is this really a comment? # :-) Yes, of course :-) crap Marc, okay thena comment to the series file -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] [miredo][v3] Added miredo 1.2.2
From: Carsten Schlote c.schl...@konzeptpark.de
This packet provides IPV6 networking with the
tereodo protocol.
The dummy patch is required to keep 'patchin'
working, otherwise the build stops.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
generic/etc/init.d/miredo-server | 89
generic/etc/miredo/client-hook| 70 ++
generic/etc/miredo/miredo-server.conf | 22 +++
generic/etc/miredo/miredo.conf| 35 +++
patches/miredo-1.2.2/autogen.sh |1 +
patches/miredo-1.2.2/series |4 +
rules/miredo.in | 18 ++
rules/miredo.make | 105 +
8 files changed, 344 insertions(+), 0 deletions(-)
create mode 100644 generic/etc/init.d/miredo-server
create mode 100644 generic/etc/miredo/client-hook
create mode 100644 generic/etc/miredo/miredo-server.conf
create mode 100644 generic/etc/miredo/miredo.conf
create mode 12 patches/miredo-1.2.2/autogen.sh
create mode 100644 patches/miredo-1.2.2/dummy.patch
create mode 100644 patches/miredo-1.2.2/series
create mode 100644 rules/miredo.in
create mode 100644 rules/miredo.make
diff --git a/generic/etc/init.d/miredo-server b/generic/etc/init.d/miredo-server
new file mode 100644
index 000..271d173
--- /dev/null
+++ b/generic/etc/init.d/miredo-server
@@ -0,0 +1,89 @@
+#! /bin/sh
+# $Id: miredo-server.init 1754 2006-09-18 14:25:04Z remi $
+#
+# miredo-server start/stop script for Debian GNU/Linux
+# Author: Rémi Denis-Courmont rdenis (at) simphalempin (dot) com
+#
+# chkconfig: 345 17 83
+# description: Starts and stops the miredo-server daemon \
+# used to provide a Teredo server.
+#
+### BEGIN INIT INFO
+# Provides:
+# Required-Start:$local_fs $remote_fs $network $syslog $time
+# Required-Stop: $local_fs $remote_fs $syslog
+# Short-Description: Teredo server
+# Description: miredo-server daemon to provide a Teredo server
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
+### END INIT INFO
+
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+DESC=Teredo server daemon
+NAME=miredo-server
+DAEMON=/usr/sbin/$NAME
+DAEMON_ARGS=
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+[ -x $DAEMON ] || exit 0
+
+# Source defaults.
+[ -r /etc/default/$NAME ] . /etc/default/$NAME
+
+# Ensure configuration is readable.
+[ -r /etc/$NAME.conf ] || exit 0
+
+. /lib/lsb/init-functions
+
+check_start() {
+if [ x$START_MIREDO_SERVER != xtrue ]; then
+echo START_MIREDO_SERVER is set to false in
/etc/default/$NAME
+echo $DAEMON not starting
+exit 0
+fi
+}
+
+check_chroot_dir() {
+if [ -d /var/run/$NAME ]; then
+mkdir -p /var/run/$NAME
+chmod 0755 /var/run/$NAME
+fi
+}
+
+
+case $1 in
+ start)
+check_start
+check_chroot_dir
+log_daemon_msg Starting $DESC $NAME
+start-stop-daemon --start --quiet --pidfile $PIDFILE \
+--exec $DAEMON --oknodo -- $DAEMON_ARGS
+log_end_msg $?
+;;
+ stop)
+log_daemon_msg Stopping $DESC $NAME
+start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+--retry 1 --oknodo
+log_end_msg $?
+;;
+ reload|force-reload)
+log_daemon_msg Reloading $DESC $NAME
+start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE \
+--exec $DAEMON
+log_end_msg $?
+;;
+ restart)
+check_start # avoid stopping if would not restart
+$0 stop
+sleep 1
+$0 start
+;;
+ *)
+echo Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload} 2
+exit 1
+;;
+esac
+
+exit $?
diff --git a/generic/etc/miredo/client-hook b/generic/etc/miredo/client-hook
new file mode 100644
index 000..87ae405
--- /dev/null
+++ b/generic/etc/miredo/client-hook
@@ -0,0 +1,70 @@
+#! /bin/sh
+#
+# Miredo client hook script for Linux/iproute2
+# Copyright © 2007 Rémi Denis-Courmont.
+# Distributed under the terms of the GNU General Public License version 2.
+
+# Linux iproute2 path:
+IP=/sbin/ip
+
+# Linux default route default metric is 1024
+# (we put 1029 so that Teredo is used as a last resort):
+METRIC=1029
+
+# Linux routing table ID
+# (possible values: 1-252 from /etc/iproute/rt_tables):
+TABLE=teredo
+
+# Linux routing rule priority
+# (possible values: 1-32765, lowest number is highest priority):
+PRIO=32765
+
+# MTU for the tunnel interface
+# (default: specified by the Teredo server, or 1280)
+#MTU=1400
+
+if ! test -x $IP; then
+ echo $0: iproute2 is required! Please install it. 2
+ exit 1
+fi
+
+# Nothing to do with destroy event
+if test $STATE = destroy; then exit 0; fi
+
+# If the source routing table is not configured, ignore it.
+if ! $IP route show table $TABLE /dev/null 21; then
+ unset TABLE
+else
+ if
[ptxdist] [PATCH] [openvpn][v3] Added OpenVPN 2.0.9
From: Carsten Schlote c.schl...@konzeptpark.de Added simple to use VPN packet. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/openvpn.in | 21 rules/openvpn.make | 87 2 files changed, 108 insertions(+), 0 deletions(-) create mode 100644 rules/openvpn.in create mode 100644 rules/openvpn.make diff --git a/rules/openvpn.in b/rules/openvpn.in new file mode 100644 index 000..2c69338 --- /dev/null +++ b/rules/openvpn.in @@ -0,0 +1,21 @@ +## SECTION=networking +menuconfig OPENVPN + tristate + prompt openvpn + select OPENSSL + select LIBLZO if OPENVPN_LZO +help + This adds OpenVPN to your root filesystem. Plain vanilla + packet. + +if OPENVPN + +config OPENVPN_LZO + bool + prompt Enable LZO compression + help + This enables the LZO compression code. Selecting this option + will select the LZO library as well. + If unsure, say N. + +endif diff --git a/rules/openvpn.make b/rules/openvpn.make new file mode 100644 index 000..da79d5f --- /dev/null +++ b/rules/openvpn.make @@ -0,0 +1,87 @@ +# -*-makefile-*- +# +# Copyright (C) 2007 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_OPENVPN) += openvpn + +# +# Paths and names +# +OPENVPN_VERSION:= 2.0.9 +OPENVPN:= openvpn-$(OPENVPN_VERSION) +OPENVPN_SUFFIX := tar.gz +OPENVPN_URL:= http://openvpn.net/release/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_DIR:= $(BUILDDIR)/$(OPENVPN) + + +# +# Get +# + +$(OPENVPN_SOURCE): + @$(call targetinfo, $@) + @$(call get, OPENVPN) + +# +# Prepare +# + +OPENVPN_PATH := PATH=$(CROSS_PATH) +OPENVPN_ENV:= $(CROSS_ENV) + +# +# autoconf +# +OPENVPN_AUTOCONF := $(CROSS_AUTOCONF_USR) + +ifdef PTXCONF_OPENVPN_LZO +OPENVPN_LZO := --enable-lzo +else +OPENVPN_LZO := --disable-lzo +endif + +# +# Target-Install +# + +$(STATEDIR)/openvpn.targetinstall: + @$(call targetinfo) + + @$(call install_init, openvpn) + @$(call install_fixup, openvpn,PACKAGE,openvpn) + @$(call install_fixup, openvpn,PRIORITY,optional) + @$(call install_fixup, openvpn,VERSION,$(OPENVPN_VERSION)) + @$(call install_fixup, openvpn,SECTION,base) + @$(call install_fixup, openvpn,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) + @$(call install_fixup, openvpn,DEPENDS,) + @$(call install_fixup, openvpn,DESCRIPTION,missing) + + @$(call install_copy, openvpn, 0, 0, 0755, -, /usr/sbin/openvpn) + + @$(call install_copy, openvpn, 0, 0, 0755, /etc/openvpn) + + @$(call install_finish, openvpn) + + @$(call touch) + +# +# Clean +# + +openvpn_clean: + rm -rf $(STATEDIR)/openvpn.* + rm -rf $(OPENVPN_PKGDIR)/* + rm -rf $(OPENVPN_DIR) + +# vim: syntax=make + -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/3] [mtd-utils] Selects HOST_MTD_UTILS, more configs
From: Carsten Schlote c.schl...@konzeptpark.de This patch adds config options for the remaining MTD utils. As we need to build images, we also select the host mtd utils Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/mtd-utils.in | 200 + rules/mtd-utils.make | 123 ++- 2 files changed, 255 insertions(+), 68 deletions(-) diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in index 5f91944..e8bc636 100644 --- a/rules/mtd-utils.in +++ b/rules/mtd-utils.in @@ -6,6 +6,7 @@ menuconfig MTD_UTILS select ZLIB select E2FSPROGS select LIBLZO if MTD_UTILS_USE_LIBLZO + select HOST_MTD_UTILS help Memory Technology Device Utilities @@ -14,12 +15,74 @@ menuconfig MTD_UTILS if MTD_UTILS +comment build options + config MTD_UTILS_USE_LIBLZO bool prompt liblzo support help Enable LZO support + +comment misc utils + +config MTD_UTILS_PDDCUSTOMIZE + bool + prompt pddcustomize + help + customize bootenv and pdd values + +config MTD_UTILS_MKPFI + bool + prompt mkpfi + help + This perl program is assembles PFI files from a config file + +config MTD_UTILS_PFI2BIN + bool + prompt pfi2bin + help + a tool to convert PFI files into binary images + +config MTD_UTILS_PFIFLASH + bool + prompt pfiflash + help + a tool for updating a controller with PFI files + +config MTD_UTILS_DOC_LOADBIOS + bool + prompt doc_loadbios + help + FIXME + +config MTD_UTILS_DOCFDISK + bool + prompt docfdisk + help + FIXME + +config MTD_UTILS_MTD_DEBUG + bool + prompt mtd_debug + help + Does info, read, write and erase on mtd devices + +config MTD_UTILS_RECV_IMAGE + bool + prompt recv_image + help + Receive and flash image from a network host + +config MTD_UTILS_SERVE_IMAGE + bool + prompt serve_image + help + Serve flashimage to network + + +comment flash utils + config MTD_UTILS_FLASH_ERASE bool prompt flash_erase @@ -44,6 +107,18 @@ config MTD_UTILS_FLASH_LOCK help This utility locks one or more sectors of flash device. +config MTD_UTILS_FLASH_OTP_DUMP + bool + prompt flash_otp_dump + help + FIXME + +config MTD_UTILS_FLASH_OTP_INFO + bool + prompt flash_otp_info + help + FIXME + config MTD_UTILS_FLASH_UNLOCK bool prompt flash_unlock @@ -56,53 +131,81 @@ config MTD_UTILS_FLASHCP help Flash Copy - Written by Abraham van der Merwe -config MTD_UTILS_FTL_CHECK +config MTD_UTILS_JFFS2DUMP bool - prompt ftl_check + prompt jffs2dump help - Utility to check an FTL partition + This utility dumps the contents of a binary JFFS2 image -config MTD_UTILS_FTL_FORMAT +config MTD_UTILS_MKFS_JFFS2 bool - prompt ftl_format + prompt mkfs.jffs2 help - Utility to create an FTL partition in a memory region + Build a JFFS2 image in a file, from a given directory tree. -config MTD_UTILS_JFFS2_DUMP +config MTD_UTILS_RFDDUMP bool - prompt jffs2_dump + prompt rfddump help - This utility dumps the contents of a binary JFFS2 image + Dumps the contents of a resident flash disk -#config MTD_UTILS_JFFS2READER -# bool -# prompt jffs2reader -# help -#A jffs2 image reader +config MTD_UTILS_RFDFORMAT + bool + prompt rfdformat + help + Formats NOR flash for resident flash disk -config MTD_UTILS_JITTERTEST +config MTD_UTILS_SUMTOOL bool - prompt jittertest + prompt sumtool help - This program is used to measure what the jitter of a - real time task would be under standard Linux. + Convert the input JFFS2 image to a summarized JFFS2 image + Summary makes mounting faster - if summary support enabled in your kernel + - More particularly, what is the effect of running - a real time task under Linux with background - JFFS file system activity. +comment nand utils -config MTD_UTILS_MTDDEBUG +config MTD_UTILS_BIN2NAND bool - prompt mtd_debug + prompt bin2nand help - Does info, read, write and erase on mtd devices + a tool for adding OOB information to a binary input file + +config MTD_UTILS_MKBOOTENV + bool + prompt mkbootenv + help + processes bootenv text files and convertes them into a binary format + +config MTD_UTILS_NAND2BIN + bool + prompt nand2bin + help + split data and OOB + +config MTD_UTILS_FTL_CHECK + bool + prompt ftl_check + help + Utility to check an
[ptxdist] [PATCH 3/3] [mtd-utils] Fixed lzo compression tests and crash caused by unset variable.
From: Carsten Schlote c.schl...@konzeptpark.de
The following issues are addressed by this patch.
- Check for compressed data to be smaller than the original size. This
a clear fail and break assumtions at other places (-t option)
- Set the destlen to the expected maximum size, before calling lzo
decompression routine. It's used a max size value by this code (and
holds the real decompression size after the call.)
- Calls lzo_init().
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
patches/mtd-utils-1.3.0/lzo-compr-fixes.patch | 59 +
patches/mtd-utils-1.3.0/series|3 +
2 files changed, 62 insertions(+), 0 deletions(-)
create mode 100644 patches/mtd-utils-1.3.0/lzo-compr-fixes.patch
create mode 100644 patches/mtd-utils-1.3.0/series
diff --git a/patches/mtd-utils-1.3.0/lzo-compr-fixes.patch
b/patches/mtd-utils-1.3.0/lzo-compr-fixes.patch
new file mode 100644
index 000..132d304
--- /dev/null
+++ b/patches/mtd-utils-1.3.0/lzo-compr-fixes.patch
@@ -0,0 +1,59 @@
+From: Carsten Schlote c.schl...@konzeptpark.de
+Date: Fri, 20 Mar 2009 12:43:32 +0100
+Subject: [PATCH 1/1] [lzo compressor] Fixed lzo compression tests and crash
caused by unset variable.
+
+The following issues are addressed by this patch.
+
+- Check for compressed data to be smaller than the original size. This
+ a clear fail and break assumtions at other places (-t option)
+
+- Set the destlen to the expected maximum size, before calling lzo
+ decompression routine. It's used a max size value by this code (and
+ holds the real decompression size after the call.)
+
+- Calls lzo_init().
+
+Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
+---
+ compr_lzo.c | 14 +++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+Index: compr_lzo.c
+===
+--- compr_lzo.c.orig 2009-07-03 11:31:41.0 +0200
compr_lzo.c2009-07-22 11:47:04.0 +0200
+@@ -56,6 +56,9 @@
+ if (ret != LZO_E_OK)
+ return -1;
+
++ if (compress_size *sourcelen)
++ return -1;
++
+ if (compress_size *dstlen)
+ return -1;
+
+@@ -71,6 +74,7 @@
+ int ret;
+ lzo_uint dl;
+
++ dl = destlen;
+ ret = lzo1x_decompress_safe(data_in,srclen,cpage_out,dl,NULL);
+
+ if (ret != LZO_E_OK || dl != destlen)
+@@ -92,11 +96,15 @@
+ {
+ int ret;
+
++ lzo_init();
++
+ lzo_mem = malloc(LZO1X_999_MEM_COMPRESS);
+ if (!lzo_mem)
+ return -1;
+
+- /* Worse case LZO compression size from their FAQ */
++ /* Worse case LZO compression size from their FAQ -
++ see http://www.oberhumer.com/opensource/lzo/lzofaq.php */
++
+ lzo_compress_buf = malloc(page_size + (page_size / 16) + 64 + 3);
+ if (!lzo_compress_buf) {
+ free(lzo_mem);
diff --git a/patches/mtd-utils-1.3.0/series b/patches/mtd-utils-1.3.0/series
new file mode 100644
index 000..721ea5d
--- /dev/null
+++ b/patches/mtd-utils-1.3.0/series
@@ -0,0 +1,3 @@
+0001-make-liblzo-optional.patch
+lzo-compr-fixes.patch -p0
+
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] [host-mtd-utils] Added LZO compression for host tools
From: Carsten Schlote c.schl...@konzeptpark.de If we enable it for the target, do so for the host tools as well. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-mtd-utils.in | 14 +- rules/host-mtd-utils.make |5 + 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in index 2e501c0..4890ba0 100644 --- a/rules/host-mtd-utils.in +++ b/rules/host-mtd-utils.in @@ -2,6 +2,18 @@ config HOST_MTD_UTILS tristate - select HOST_LIBLZO select HOST_ZLIB select HOST_E2FSPROGS + select HOST_LIBLZO if HOST_MTD_UTILS_USE_LIBLZO + help + Install complete set of mtd-utils as host tools. + +if HOST_MTD_UTILS + +config HOST_MTD_UTILS_USE_LIBLZO + bool + default y if MTD_UTILS_USE_LIBLZO + help + Enable LZO support, when enabled for target tools. + +endif diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make index 8bd1018..ef13308 100644 --- a/rules/host-mtd-utils.make +++ b/rules/host-mtd-utils.make @@ -52,6 +52,11 @@ HOST_MTD_UTILS_MAKEVARS = \ BUILDDIR=$(HOST_MTD_UTILS_DIR) \ DESTDIR=/ +ifndef PTXCONF_HOST_MTD_UTILS_USE_LIBLZO + HOST_MTD_UTILS_COMPILE_ENV += WITHOUT_LZO=1 + HOST_MTD_UTILS_MAKEVARS += WITHOUT_LZO=1 +endif + HOST_MTD_UTILS_MAKE_PAR := NO # -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/3] [mtd-utils] Selects HOST_MTD_UTILS, more configs
-Ursprüngliche Nachricht- Von: ptxdist-boun...@pengutronix.de [mailto:ptxdist- boun...@pengutronix.de] Im Auftrag von Marc Kleine-Budde Gesendet: Freitag, 8. Januar 2010 20:19 An: ptxdist@pengutronix.de Betreff: Re: [ptxdist] [PATCH 1/3] [mtd-utils] Selects HOST_MTD_UTILS, more configs Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de This patch adds config options for the remaining MTD utils. As we need to build images, we also select the host mtd utils I don't see why mtd-utils needs the host mtd-utils? Hmm, good question and I think there was a reason one year ago or so. The host tools should be selected by the image options. Just the LZO flag should be cloned, if set for the target. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/3] [mtd-utils] Selects HOST_MTD_UTILS, more configs
Carsten Schlote wrote: -Ursprüngliche Nachricht- Von: ptxdist-boun...@pengutronix.de [mailto:ptxdist- boun...@pengutronix.de] Im Auftrag von Marc Kleine-Budde Gesendet: Freitag, 8. Januar 2010 20:19 An: ptxdist@pengutronix.de Betreff: Re: [ptxdist] [PATCH 1/3] [mtd-utils] Selects HOST_MTD_UTILS, more configs Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de This patch adds config options for the remaining MTD utils. As we need to build images, we also select the host mtd utils I don't see why mtd-utils needs the host mtd-utils? Hmm, good question and I think there was a reason one year ago or so. The host tools should be selected by the image options. Just the LZO flag should be cloned, if set for the target. we just build LZO support for the host unconditionally. imagine a rather small image where you don't have mts-utils on the target. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/2] [acl][v3] Added packet for libacl.so and acl tools.
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de The libacl.so is required by other target tools. The packet also includes acl control functions, which can be installed on demand. applied with some changes cheers Marc Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- .../add-DESTDIR-to-fix-crosscompile-install.patch | 235 patches/acl-2.2.49/series |1 + rules/acl.in | 24 ++ rules/acl.make | 102 + 4 files changed, 362 insertions(+), 0 deletions(-) create mode 100644 patches/acl-2.2.49/add-DESTDIR-to-fix-crosscompile-install.patch create mode 100644 patches/acl-2.2.49/series create mode 100644 rules/acl.in create mode 100644 rules/acl.make diff --git a/patches/acl-2.2.49/add-DESTDIR-to-fix-crosscompile-install.patch b/patches/acl-2.2.49/add-DESTDIR-to-fix-crosscompile-install.patch new file mode 100644 index 000..34d8d8c --- /dev/null +++ b/patches/acl-2.2.49/add-DESTDIR-to-fix-crosscompile-install.patch @@ -0,0 +1,235 @@ +From: Carsten Schlote c.schl...@konzeptpark.de +Subject: Fix crosscompile install stage (DESTDIR) + +This patch adds $(DESDIR) to the installation paths to allow proper +use of make install from ptxdist. + +Signed-off: Carsten Schlote c.schl...@konzeptpark.de +--- + Makefile|8 +--- + chacl/Makefile |4 ++-- + doc/Makefile|6 +++--- + getfacl/Makefile|4 ++-- + include/Makefile| 10 +- + include/buildmacros | 40 + libacl/Makefile |2 +- + man/Makefile|6 ++ + setfacl/Makefile|4 ++-- + 9 files changed, 46 insertions(+), 38 deletions(-) + +Index: acl-2.2.48/chacl/Makefile +=== +--- acl-2.2.48.orig/chacl/Makefile 2009-06-22 20:37:31.0 +0200 acl-2.2.48/chacl/Makefile2009-12-15 21:00:35.627907040 +0100 +@@ -30,6 +30,6 @@ + include $(BUILDRULES) + + install: default +-$(INSTALL) -m 755 -d $(PKG_BIN_DIR) +-$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR) ++$(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR) + install-dev install-lib: +Index: acl-2.2.48/doc/Makefile +=== +--- acl-2.2.48.orig/doc/Makefile 2009-06-22 20:37:31.0 +0200 acl-2.2.48/doc/Makefile 2009-12-15 21:00:35.627907040 +0100 +@@ -31,12 +31,12 @@ + $(ZIP) --best -c CHANGES $@ + + install: default +-$(INSTALL) -m 755 -d $(PKG_DOC_DIR) +-$(INSTALL) -m 644 PORTING CHANGES.gz $(PKG_DOC_DIR) ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR) ++$(INSTALL) -m 644 PORTING CHANGES.gz $(DESTDIR)$(PKG_DOC_DIR) + ifeq ($(PKG_DISTRIBUTION), debian) + $(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz + else +-$(INSTALL) -m 644 COPYING COPYING.LGPL $(PKG_DOC_DIR) ++$(INSTALL) -m 644 COPYING COPYING.LGPL $(DESTDIR)$(PKG_DOC_DIR) + endif + + install-dev install-lib: +Index: acl-2.2.48/getfacl/Makefile +=== +--- acl-2.2.48.orig/getfacl/Makefile 2009-06-22 20:37:31.0 +0200 acl-2.2.48/getfacl/Makefile 2009-12-15 21:00:35.627907040 +0100 +@@ -31,6 +31,6 @@ + include $(BUILDRULES) + + install: default +-$(INSTALL) -m 755 -d $(PKG_BIN_DIR) +-$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR) ++$(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR) + install-dev install-lib: +Index: acl-2.2.48/include/Makefile +=== +--- acl-2.2.48.orig/include/Makefile 2009-06-22 20:37:31.0 +0200 acl-2.2.48/include/Makefile 2009-12-15 21:00:35.627907040 +0100 +@@ -31,10 +31,10 @@ + include $(BUILDRULES) + + install-dev: default +-$(INSTALL) -m 755 -d $(PKG_INC_DIR) +-$(INSTALL) -m 755 -d $(PKG_INC_DIR)/sys +-$(INSTALL) -m 644 acl.h $(PKG_INC_DIR)/sys/acl.h +-$(INSTALL) -m 755 -d $(PKG_INC_DIR)/acl +-$(INSTALL) -m 644 libacl.h $(PKG_INC_DIR)/acl/libacl.h ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR) ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)/sys ++$(INSTALL) -m 644 acl.h $(DESTDIR)$(PKG_INC_DIR)/sys/acl.h ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)/acl ++$(INSTALL) -m 644 libacl.h $(DESTDIR)$(PKG_INC_DIR)/acl/libacl.h + + install install-lib: +Index: acl-2.2.48/include/buildmacros +=== +--- acl-2.2.48.orig/include/buildmacros 2009-06-22 20:37:31.0 +0200 acl-2.2.48/include/buildmacros 2009-12-15 21:00:35.627907040
Re: [ptxdist] [PATCH 2/2] [host-acl][v3] Added host compile for libacl.so and headers
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools, e.g. the e2fsprogs or other stuff needed ACL support for filesystems on the host side. The host-libacl.in file has no .make file to delete. tnx, applied with minor changes Marc Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-acl.in|7 + rules/host-acl.make | 60 ++ rules/host-libacl.in |5 3 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 rules/host-acl.in create mode 100644 rules/host-acl.make delete mode 100644 rules/host-libacl.in diff --git a/rules/host-acl.in b/rules/host-acl.in new file mode 100644 index 000..7023b7e --- /dev/null +++ b/rules/host-acl.in @@ -0,0 +1,7 @@ +## SECTION=hosttools_noprompt + +config HOST_ACL + tristate + select HOST_ATTR + help + FIXME diff --git a/rules/host-acl.make b/rules/host-acl.make new file mode 100644 index 000..ba2be8d --- /dev/null +++ b/rules/host-acl.make @@ -0,0 +1,60 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_ACL) += host-acl + +# +# Paths and names +# +HOST_ACL_DIR = $(HOST_BUILDDIR)/$(ACL) + +# +# Get +# + +$(STATEDIR)/host-acl.get: $(STATEDIR)/acl.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-acl.extract: + @$(call targetinfo) + @$(call clean, $(HOST_ACL_DIR)) + @$(call extract, ACL, $(HOST_BUILDDIR)) + @$(call patchin, ACL, $(HOST_ACL_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_ACL_PATH:= PATH=$(HOST_PATH) +HOST_ACL_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_ACL_AUTOCONF:= $(HOST_AUTOCONF) + +# +# Clean +# + +host-acl_clean: + rm -rf $(STATEDIR)/host-acl.* + rm -rf $(HOST_ACL_DIR) + +# vim: syntax=make diff --git a/rules/host-libacl.in b/rules/host-libacl.in deleted file mode 100644 index 8c5fea1..000 --- a/rules/host-libacl.in +++ /dev/null @@ -1,5 +0,0 @@ -## SECTION=hosttools_noprompt - -config HOST_LIBACL - tristate - select HOST_ATTR -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [openvpn][v3] Added OpenVPN 2.0.9
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Added simple to use VPN packet. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/openvpn.in | 21 rules/openvpn.make | 87 2 files changed, 108 insertions(+), 0 deletions(-) create mode 100644 rules/openvpn.in create mode 100644 rules/openvpn.make I've fixed these things diff --git a/rules/openvpn.in b/rules/openvpn.in new file mode 100644 index 000..2c69338 --- /dev/null +++ b/rules/openvpn.in @@ -0,0 +1,21 @@ +## SECTION=networking empty line here, please +menuconfig OPENVPN + tristate + prompt openvpn + select OPENSSL + select LIBLZO if OPENVPN_LZO +help + This adds OpenVPN to your root filesystem. Plain vanilla + packet. + +if OPENVPN + +config OPENVPN_LZO + bool + prompt Enable LZO compression + help +This enables the LZO compression code. Selecting this option +will select the LZO library as well. +If unsure, say N. + +endif diff --git a/rules/openvpn.make b/rules/openvpn.make new file mode 100644 index 000..da79d5f --- /dev/null +++ b/rules/openvpn.make @@ -0,0 +1,87 @@ +# -*-makefile-*- +# +# Copyright (C) 2007 by Carsten Schlote c.schl...@konzeptpark.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_OPENVPN) += openvpn + +# +# Paths and names +# +OPENVPN_VERSION := 2.0.9 +OPENVPN := openvpn-$(OPENVPN_VERSION) +OPENVPN_SUFFIX := tar.gz +OPENVPN_URL := http://openvpn.net/release/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_DIR := $(BUILDDIR)/$(OPENVPN) + + +# +# Get +# + +$(OPENVPN_SOURCE): + @$(call targetinfo, $@) please remove + @$(call get, OPENVPN) + +# +# Prepare +# + +OPENVPN_PATH := PATH=$(CROSS_PATH) +OPENVPN_ENV := $(CROSS_ENV) + +# +# autoconf +# +OPENVPN_AUTOCONF := $(CROSS_AUTOCONF_USR) + +ifdef PTXCONF_OPENVPN_LZO +OPENVPN_LZO := --enable-lzo +else +OPENVPN_LZO := --disable-lzo you probably want to write OPENVPN_AUTOCONF += here +endif + +# +# Target-Install +# + +$(STATEDIR)/openvpn.targetinstall: + @$(call targetinfo) + + @$(call install_init, openvpn) + @$(call install_fixup, openvpn,PACKAGE,openvpn) + @$(call install_fixup, openvpn,PRIORITY,optional) + @$(call install_fixup, openvpn,VERSION,$(OPENVPN_VERSION)) + @$(call install_fixup, openvpn,SECTION,base) + @$(call install_fixup, openvpn,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) + @$(call install_fixup, openvpn,DEPENDS,) + @$(call install_fixup, openvpn,DESCRIPTION,missing) + + @$(call install_copy, openvpn, 0, 0, 0755, -, /usr/sbin/openvpn) + + @$(call install_copy, openvpn, 0, 0, 0755, /etc/openvpn) + + @$(call install_finish, openvpn) + + @$(call touch) + +# +# Clean +# + +openvpn_clean: + rm -rf $(STATEDIR)/openvpn.* + rm -rf $(OPENVPN_PKGDIR)/* + rm -rf $(OPENVPN_DIR) + +# vim: syntax=make + and applied it. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Busybox build error
Hello Marc, The dummy-strip patch works fine. However I have run into a problem with grub. It seems grub.make wants to install 'packages/grub-0.97/usr/lib/grub/i386-unknown/stage1' but in my case the i386-unknown directory is called i386-host. Again this is probably because I don't use a cross compiler. This is the error message: install_fixup: @AUTHOR@ - Robert Schwebel r.schweb...@pengutronix.de ... done. install_fixup: @DESCRIPTION@ - missing ... done. install_copy: src=/home/rhuber/test/packages/grub-0.97/usr/lib/grub/i386-unknown/stage1 dst=/boot/grub/stage1 owner=0 group=0 permissions=0644 install: cannot stat `/home/rhuber/test/packages/grub-0.97/usr/lib/grub/i386-unknown/stage1': No such file or directory Error: install_copy failed! make: *** [/home/rhuber/test/state/grub.targetinstall] Error 1 I am using the 1.99.20 grub.make as a workaround. Regards, Rene -- ptxdist mailing list ptxdist@pengutronix.de
