[ptxdist] eglibc, upstart and more patches for ptxdist-2010.01.0
This patch stack is derived from our main ptxdist dev line at work. Most changes are related to eglibc, upstart, dbus and udev. Also some changes for Ubuntu are in this stack. See details below or in the GIT history. You can pull the branch 'for-upstream' from git://www.vahanus.net/ptxdist-kp.git Or use the web frontend for log details: http://www.vahanus.net/cgi-bin/gitweb.cgi?p=ptxdist-kp.git;a=summary Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 02/48] [util-linux-ng] Switch to newer version in util-linux-ng
From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources. Framework changed to use the newer libraries and binaries from util-linux-ng. Added missing swapoff link to swapon binary. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/e2fsprogs.in | 57 ++--- rules/e2fsprogs.make | 41 +--- rules/mtd-utils.in |3 +- rules/networkmanager.in |4 +- rules/nfsutils.in|4 +- rules/util-linux-ng.in | 33 +- rules/util-linux-ng.make | 23 ++ 7 files changed, 95 insertions(+), 70 deletions(-) diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in index 825d287..2eec3bf 100644 --- a/rules/e2fsprogs.in +++ b/rules/e2fsprogs.in @@ -4,6 +4,9 @@ menuconfig E2FSPROGS tristate prompt e2fsprogs select HOST_GETTEXT + select UTIL_LINUX_NG if E2FSPROGS_LIBBLKID || E2FSPROGS_LIBUUID + select UTIL_LINUX_NG_LIBBLKID if E2FSPROGS_LIBBLKID + select UTIL_LINUX_NG_LIBUUID if E2FSPROGS_LIBUUID help The e2fsprogs package provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3 filesystem @@ -11,10 +14,6 @@ menuconfig E2FSPROGS if E2FSPROGS -# --- -menu build options -# --- - config E2FSPROGS_COMPRESSION bool prompt compression @@ -35,18 +34,9 @@ config E2FSPROGS_RESIZER help Enable support for e2resize program. -endmenu - -# --- -menu libraries -# --- config E2FSPROGS_LIBBLKID bool - prompt libblkid - select E2FSPROGS_LIBUUID - help - Install libblkid. config E2FSPROGS_LIBCOM_ERR bool @@ -79,15 +69,6 @@ config E2FSPROGS_LIBSS config E2FSPROGS_LIBUUID bool - prompt libuuid - help - Install libuuid. - -endmenu - -# --- -menu binaries -# --- config E2FSPROGS_INSTALL_CHATTR bool @@ -105,12 +86,12 @@ config E2FSPROGS_INSTALL_LSATTR help Enable support for lsattr program. -config E2FSPROGS_INSTALL_UUIDGEN - bool - select E2FSPROGS_LIBUUID - prompt uuidgen - help - Enable support for uuidgen program. +#config E2FSPROGS_INSTALL_UUIDGEN +# bool +# select E2FSPROGS_LIBUUID +# prompt uuidgen +# help +#Enable support for uuidgen program. # - @@ -122,15 +103,15 @@ config E2FSPROGS_INSTALL_BADBLOCKS help Enable support for badblocks program. -config E2FSPROGS_INSTALL_BLKID - bool - select E2FSPROGS_LIBBLKID - select E2FSPROGS_LIBCOM_ERR - select E2FSPROGS_LIBEXT2FS - select E2FSPROGS_LIBUUID - prompt blkid - help - Enable support for blkid program. +#config E2FSPROGS_INSTALL_BLKID +# bool +# select E2FSPROGS_LIBBLKID +# select E2FSPROGS_LIBCOM_ERR +# select E2FSPROGS_LIBEXT2FS +# select E2FSPROGS_LIBUUID +# prompt blkid +# help +#Enable support for blkid program. config E2FSPROGS_INSTALL_DUMPE2FS bool @@ -313,7 +294,5 @@ config E2FSPROGS_INSTALL_UUIDD help Enable support for uuid program. -endmenu - endif diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 40a2f22..3c93faa 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -56,7 +56,9 @@ E2FSPROGS_AUTOCONF := \ --disable-testio-debug \ --disable-tls \ --enable-elf-shlibs \ - --enable-htree + --enable-htree \ + --disable-libblkid \ + --disable-libuuid ifdef PTXCONF_E2FSPROGS_COMPRESSION E2FSPROGS_AUTOCONF += --enable-compression @@ -109,12 +111,13 @@ $(STATEDIR)/e2fsprogs.targetinstall: # # # # libraries # # -ifdef PTXCONF_E2FSPROGS_LIBBLKID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libblkid.so.1.0) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) -endif + +#ifdef PTXCONF_E2FSPROGS_LIBBLKID +# @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ +# /usr/lib/libblkid.so.1.0) +# @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) +# @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) +#endif ifdef PTXCONF_E2FSPROGS_LIBCOM_ERR @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ @@ -144,12 +147,12 @@ ifdef PTXCONF_E2FSPROGS_LIBSS @$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so)
[ptxdist] [PATCH 01/48] [eglibc] Add support for eglibc toolchains to ptxdist
From: Carsten Schlote c.schl...@konzeptpark.de
This patch adds support for eglibc to ptxdist. It adds
an eglibc packet and all needed changes to find the
correct toolchain. Adds a new copy function to copy
target binaries in toolchain sysroot (e.g. ldconfig)
to the ipkg.
See corresponding changes for OSELAS toolchain with eglibc
support.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
bin/ptxdist |5 +-
platforms/toolchain.in|8 +-
rules/eglibc.in | 240 +
rules/eglibc.make | 213
rules/libc.in | 25
rules/locales.in |4 +-
rules/post/install.make | 18 +++-
rules/pre/Version.make|1 +
rules/timezone.in |2 +-
scripts/install_copy_toolchain.sh | 73 +++-
10 files changed, 577 insertions(+), 12 deletions(-)
create mode 100644 rules/eglibc.in
create mode 100644 rules/eglibc.make
diff --git a/bin/ptxdist b/bin/ptxdist
index c96c03d..0a0395b 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1500,10 +1500,13 @@ do_select_toolchain_guess()
java=${java:+java-}
# libc
+ local eglibc_select=$(ptxd_get_ptxconf PTXCONF_LIBC_EGLIBC)
local glibc_version=$(ptxd_get_ptxconf PTXCONF_GLIBC_VERSION)
local uclibc_version=$(ptxd_get_ptxconf PTXCONF_UCLIBC_VERSION)
- if [ -n ${glibc_version} ]; then
+ if [ -n ${eglibc_select} ]; then
+ libc=eglibc-${glibc_version}-
+ elif [ -n ${glibc_version} ]; then
libc=glibc-${glibc_version}-
elif [ -n ${uclibc_version} ]; then
libc=glibc-${uclibc_version}-
diff --git a/platforms/toolchain.in b/platforms/toolchain.in
index 097b5eb..4bdd9ca 100644
--- a/platforms/toolchain.in
+++ b/platforms/toolchain.in
@@ -28,12 +28,14 @@ config CROSSCHAIN_CHECK
config GLIBC_VERSION
string
- prompt check for specific glibc version
- default 2.8
+ prompt check for specific eglibc or glibc version
+ default 2.10
help
Specify the glibc version this BSP shall be built with. This
information
- is used to guess the toolchain path if you use ptxdist toolchain
+ is used to guess the toolchain path if you use ptxdist toolchain
without an argument.
+ As eglibc is directly related to glibc, we use the same
+ config variable here.
config GNU_TARGET
string
diff --git a/rules/eglibc.in b/rules/eglibc.in
new file mode 100644
index 000..55909d8
--- /dev/null
+++ b/rules/eglibc.in
@@ -0,0 +1,240 @@
+## SECTION=libc
+
+config EGLIBC
+ tristate
+ select BASE
+
+if EGLIBC
+
+menu eglibc
+ depends on !PROJECT_USE_PRODUCTION
+
+commentInstall options
+
+config EGLIBC_LD
+ bool
+ help
+ This is the dynamic loader (e.g.: /lib/ld-2.8.90.so)
+
+ You don't want to deselect this, unless you have a pure
+ static system. This is why this options hasn't a prompt.
+
+config EGLIBC_LDCONFIG
+ bool
+ prompt Install ldconfig
+ help
+ Install /sbin/ldconfig
+
+config EGLIBC_C
+ bool
+ default y
+ prompt Install libc
+ select EGLIBC_LD
+ help
+ Any Unix-like operating system needs a C library:
+ the library which defines the system calls and
+ other basic facilities such as open, malloc, printf,
+ exit...
+
+ The GNU C library is used as the C library in the
+ GNU system and most systems with the Linux kernel.
+
+ Better not turn this option off..
+
+config EGLIBC_PTHREAD
+ bool
+ prompt Install libpthread
+ help
+ If at least one application on the target uses threads when executed
+ this library will be required.
+
+config EGLIBC_THREAD_DB
+ bool
+ prompt Install libthread_db
+ help
+ If at least one application on the target uses threads when executed
+ and you are going to debug this application (also remotely!), this
+ library will be required. You can omit this library, if you never
+ intend to debug multithread application on your target.
+
+config EGLIBC_RT
+ bool
+ prompt Install librt
+ help
+ Functions in this library provide most of the interfaces specified by
+ the POSIX.1b Realtime Extension
+
+config EGLIBC_DL
+ bool
+ prompt Install libdl
+ help
+ libdl.so is a dynamic linking library that is generally of use only
for
+ porting applications. If you are porting a BeOS application that
requires
+ dlopen, dlclose, dlerror, dlsym, dladdr, or dlfcn.h, then you can use
this
+ library.
+
+ libdl.so is a wrapper to the add-on functions with the semantics of
the dl
+
[ptxdist] [PATCH 07/48] [host-libusb#?] Added packets for host libusb#?.so and headers
From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools. See follow up patches. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-libusb-compat.in |8 rules/host-libusb-compat.make | 86 + rules/host-libusb.in |8 rules/host-libusb.make| 86 + 4 files changed, 188 insertions(+), 0 deletions(-) create mode 100644 rules/host-libusb-compat.in create mode 100644 rules/host-libusb-compat.make create mode 100644 rules/host-libusb.in create mode 100644 rules/host-libusb.make diff --git a/rules/host-libusb-compat.in b/rules/host-libusb-compat.in new file mode 100644 index 000..504b679 --- /dev/null +++ b/rules/host-libusb-compat.in @@ -0,0 +1,8 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBUSB_COMPAT + tristate + select HOST_LIBUSB + prompt libusb-compat + help + FIXME diff --git a/rules/host-libusb-compat.make b/rules/host-libusb-compat.make new file mode 100644 index 000..b679b23 --- /dev/null +++ b/rules/host-libusb-compat.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_LIBUSB_COMPAT) += host-libusb-compat + +# +# Paths and names +# +HOST_LIBUSB_COMPAT_DIR = $(HOST_BUILDDIR)/$(LIBUSB_COMPAT) + +# +# Get +# + +$(STATEDIR)/host-libusb-compat.get: $(STATEDIR)/libusb-compat.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-libusb-compat.extract: + @$(call targetinfo) + @$(call clean, $(HOST_LIBUSB_COMPAT_DIR)) + @$(call extract, LIBUSB_COMPAT, $(HOST_BUILDDIR)) + @$(call patchin, LIBUSB_COMPAT, $(HOST_LIBUSB_COMPAT_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_LIBUSB_COMPAT_PATH:= PATH=$(HOST_PATH) +HOST_LIBUSB_COMPAT_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_LIBUSB_COMPAT_AUTOCONF:= $(HOST_AUTOCONF) + +#$(STATEDIR)/host-libusb-compat.prepare: +# @$(call targetinfo) +# @$(call clean, $(HOST_LIBUSB_COMPAT_DIR)/config.cache) +# cd $(HOST_LIBUSB_COMPAT_DIR) \ +# $(HOST_LIBUSB_COMPAT_PATH) $(HOST_LIBUSB_COMPAT_ENV) \ +# ./configure $(HOST_LIBUSB_COMPAT_AUTOCONF) +# @$(call touch) + +# +# Compile +# + +#$(STATEDIR)/host-libusb-compat.compile: +# @$(call targetinfo) +# cd $(HOST_LIBUSB_COMPAT_DIR) $(HOST_LIBUSB_COMPAT_PATH) $(MAKE) $(PARALLELMFLAGS) +# @$(call touch) + +# +# Install +# + +#$(STATEDIR)/host-libusb-compat.install: +# @$(call targetinfo) +# @$(call install, HOST_LIBUSB_COMPAT) +# @$(call touch) + +# +# Clean +# + +host-libusb-compat_clean: + rm -rf $(STATEDIR)/host-libusb-compat.* + rm -rf $(HOST_LIBUSB_COMPAT_DIR) + +# vim: syntax=make diff --git a/rules/host-libusb.in b/rules/host-libusb.in new file mode 100644 index 000..de0be5b --- /dev/null +++ b/rules/host-libusb.in @@ -0,0 +1,8 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBUSB + tristate + prompt libusb + help + Library for programming USB applications without the knowledge of + Linux kernel internals. diff --git a/rules/host-libusb.make b/rules/host-libusb.make new file mode 100644 index 000..e7ec89c --- /dev/null +++ b/rules/host-libusb.make @@ -0,0 +1,86 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Rumpelfurz +# +# 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_LIBUSB) += host-libusb + +# +# Paths and names +# +HOST_LIBUSB_DIR= $(HOST_BUILDDIR)/$(LIBUSB) + +#
[ptxdist] [PATCH 06/48] [host-libudev] Added .in segment for host libudev.so and headers
From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools. See follow up patches. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-libudev.in |8 1 files changed, 8 insertions(+), 0 deletions(-) create mode 100644 rules/host-libudev.in diff --git a/rules/host-libudev.in b/rules/host-libudev.in new file mode 100644 index 000..5bbd160 --- /dev/null +++ b/rules/host-libudev.in @@ -0,0 +1,8 @@ +## SECTION=hosttools + +config HOST_LIBUDEV + tristate + prompt libudev + select HOST_LIBDBUS + help + Headers and .so files for libudev -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 10/48] [host-usbutils] Added packets for host usbutils and binaries
From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools. See follow up patches. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-usbutils.in |7 rules/host-usbutils.make | 86 ++ 2 files changed, 93 insertions(+), 0 deletions(-) create mode 100644 rules/host-usbutils.in create mode 100644 rules/host-usbutils.make diff --git a/rules/host-usbutils.in b/rules/host-usbutils.in new file mode 100644 index 000..7ede013 --- /dev/null +++ b/rules/host-usbutils.in @@ -0,0 +1,7 @@ +## SECTION=hosttools_noprompt + +config HOST_USBUTILS + tristate + prompt usbutils + help + FIXME diff --git a/rules/host-usbutils.make b/rules/host-usbutils.make new file mode 100644 index 000..32da543 --- /dev/null +++ b/rules/host-usbutils.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_USBUTILS) += host-usbutils + +# +# Paths and names +# +HOST_USBUTILS_DIR = $(HOST_BUILDDIR)/$(USBUTILS) + +# +# Get +# + +$(STATEDIR)/host-usbutils.get: $(STATEDIR)/usbutils.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-usbutils.extract: + @$(call targetinfo) + @$(call clean, $(HOST_USBUTILS_DIR)) + @$(call extract, USBUTILS, $(HOST_BUILDDIR)) + @$(call patchin, USBUTILS, $(HOST_USBUTILS_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_USBUTILS_PATH := PATH=$(HOST_PATH) +HOST_USBUTILS_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_USBUTILS_AUTOCONF := $(HOST_AUTOCONF) + +#$(STATEDIR)/host-usbutils.prepare: +# @$(call targetinfo) +# @$(call clean, $(HOST_USBUTILS_DIR)/config.cache) +# cd $(HOST_USBUTILS_DIR) \ +# $(HOST_USBUTILS_PATH) $(HOST_USBUTILS_ENV) \ +# ./configure $(HOST_USBUTILS_AUTOCONF) +# @$(call touch) + +# +# Compile +# + +#$(STATEDIR)/host-usbutils.compile: +# @$(call targetinfo) +# cd $(HOST_USBUTILS_DIR) $(HOST_USBUTILS_PATH) $(MAKE) $(PARALLELMFLAGS) +# @$(call touch) + +# +# Install +# + +#$(STATEDIR)/host-usbutils.install: +# @$(call targetinfo) +# @$(call install, HOST_USBUTILS) +# @$(call touch) + +# +# Clean +# + +host-usbutils_clean: + rm -rf $(STATEDIR)/host-usbutils.* + rm -rf $(HOST_USBUTILS_DIR) + +# vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 12/48] [host-libudev] Added packets for host libudev.so and headers
From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools. See follow up patches. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-udev.in | 11 ++ rules/host-udev.make | 95 ++ 2 files changed, 106 insertions(+), 0 deletions(-) create mode 100644 rules/host-udev.in create mode 100644 rules/host-udev.make diff --git a/rules/host-udev.in b/rules/host-udev.in new file mode 100644 index 000..62a3a07 --- /dev/null +++ b/rules/host-udev.in @@ -0,0 +1,11 @@ +## SECTION=hosttools_noprompt + +config HOST_UDEV + tristate + select HOST_LIBUSB_COMPAT + select HOST_USBUTILS + select HOST_PCIUTILS + select HOST_ACL + prompt udev + help + FIXME diff --git a/rules/host-udev.make b/rules/host-udev.make new file mode 100644 index 000..26ccaa8 --- /dev/null +++ b/rules/host-udev.make @@ -0,0 +1,95 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by RUmpelstilzchen +# +# 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_UDEV) += host-udev + +# +# Paths and names +# +HOST_UDEV_DIR = $(HOST_BUILDDIR)/$(UDEV) + +# +# Get +# + +$(STATEDIR)/host-udev.get: $(STATEDIR)/udev.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-udev.extract: + @$(call targetinfo) + @$(call clean, $(HOST_UDEV_DIR)) + @$(call extract, UDEV, $(HOST_BUILDDIR)) + @$(call patchin, UDEV, $(HOST_UDEV_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_UDEV_PATH := PATH=$(HOST_PATH) +HOST_UDEV_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_UDEV_AUTOCONF := $(HOST_AUTOCONF) \ + --libexecdir=$(SYSROOT)/lib/udev \ + \ + --disable-dependency-tracking \ + --enable-shared \ + --with-pci-ids-path=/usr/share/pci.ids \ + --disable-extras \ + --disable-introspection + +#$(STATEDIR)/host-udev.prepare: +# @$(call targetinfo) +# @$(call clean, $(HOST_UDEV_DIR)/config.cache) +# cd $(HOST_UDEV_DIR) \ +# $(HOST_UDEV_PATH) $(HOST_UDEV_ENV) \ +# ./configure $(HOST_UDEV_AUTOCONF) +# @$(call touch) + +# +# Compile +# + +#$(STATEDIR)/host-udev.compile: +# @$(call targetinfo) +# cd $(HOST_UDEV_DIR) $(HOST_UDEV_PATH) $(MAKE) $(PARALLELMFLAGS) +# @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-udev.install: + @$(call targetinfo) + #...@$(call install, HOST_UDEV) + cd $(HOST_UDEV_DIR) $(HOST_UDEV_PATH) $(MAKE) install $(PARALLELMFLAGS) + #cd $(HOST_UDEV_DIR) $(HOST_UDEV_PATH) $(MAKE) install-libLTLIBRARIES $(PARALLELMFLAGS) + @$(call touch) + +# +# Clean +# + +host-udev_clean: + rm -rf $(STATEDIR)/host-udev.* + rm -rf $(HOST_UDEV_DIR) + +# vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 11/48] [host-util-linux-ng] Added packets for host binaries and headers
From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools. See follow up patches. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-mtd-utils.in |2 +- rules/host-util-linux-ng.in |8 rules/host-util-linux-ng.make | 88 + 3 files changed, 97 insertions(+), 1 deletions(-) create mode 100644 rules/host-util-linux-ng.in create mode 100644 rules/host-util-linux-ng.make diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in index 2e501c0..7c3b629 100644 --- a/rules/host-mtd-utils.in +++ b/rules/host-mtd-utils.in @@ -4,4 +4,4 @@ config HOST_MTD_UTILS tristate select HOST_LIBLZO select HOST_ZLIB - select HOST_E2FSPROGS + select HOST_UTIL_LINUX_NG diff --git a/rules/host-util-linux-ng.in b/rules/host-util-linux-ng.in new file mode 100644 index 000..b457267 --- /dev/null +++ b/rules/host-util-linux-ng.in @@ -0,0 +1,8 @@ +## SECTION=hosttools + +config HOST_UTIL_LINUX_NG + tristate + prompt util-linux-ng (host libs) + select HOST_GETTEXT + help + Useful hosttools and libs for linux ng utils. diff --git a/rules/host-util-linux-ng.make b/rules/host-util-linux-ng.make new file mode 100644 index 000..6f1f1b4 --- /dev/null +++ b/rules/host-util-linux-ng.make @@ -0,0 +1,88 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 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_UTIL_LINUX_NG) += host-util-linux-ng + +# +# Paths and names +# +HOST_UTIL_LINUX_NG_DIR = $(HOST_BUILDDIR)/$(UTIL_LINUX_NG) + +# +# Get +# + +$(STATEDIR)/host-util-linux-ng.get: $(STATEDIR)/util-linux-ng.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-util-linux-ng.extract: + @$(call targetinfo) + @$(call clean, $(HOST_UTIL_LINUX_NG_DIR)) + @$(call extract, UTIL_LINUX_NG, $(HOST_BUILDDIR)) + @$(call patchin, UTIL_LINUX_NG, $(HOST_UTIL_LINUX_NG_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_UTIL_LINUX_NG_PATH:= PATH=$(HOST_PATH) +HOST_UTIL_LINUX_NG_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_UTIL_LINUX_NG_AUTOCONF:= $(HOST_AUTOCONF) \ + --disable-use-tty-group \ + --disable-makeinstall-chown + +#$(STATEDIR)/host-util-linux-ng.prepare: +# @$(call targetinfo) +# @$(call clean, $(HOST_UTIL_LINUX_NG_DIR)/config.cache) +# cd $(HOST_UTIL_LINUX_NG_DIR) \ +# $(HOST_UTIL_LINUX_NG_PATH) $(HOST_UTIL_LINUX_NG_ENV) \ +# ./configure $(HOST_UTIL_LINUX_NG_AUTOCONF) +# @$(call touch) + +# +# Compile +# + +#$(STATEDIR)/host-util-linux-ng.compile: +# @$(call targetinfo) +# cd $(HOST_UTIL_LINUX_NG_DIR) $(HOST_UTIL_LINUX_NG_PATH) $(MAKE) $(PARALLELMFLAGS) +# @$(call touch) + +# +# Install +# + +#$(STATEDIR)/host-util-linux-ng.install: +# @$(call targetinfo) +# @$(call install, HOST_UTIL_LINUX_NG) +# @$(call touch) + +# +# Clean +# + +host-util-linux-ng_clean: + rm -rf $(STATEDIR)/host-util-linux-ng.* + rm -rf $(HOST_UTIL_LINUX_NG_DIR) + +# vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 13/48] [acl] Added packet for libacl.so and tools.
From: Carsten Schlote c.schl...@konzeptpark.de This target build is required for other target tools or for included acl control functions. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- patches/acl-2.2.48/fix-crosscompile.patch | 228 + patches/acl-2.2.48/series |1 + rules/acl.in | 24 +++ rules/acl.make| 149 +++ 4 files changed, 402 insertions(+), 0 deletions(-) create mode 100644 patches/acl-2.2.48/fix-crosscompile.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/fix-crosscompile.patch b/patches/acl-2.2.48/fix-crosscompile.patch new file mode 100644 index 000..c7bfd0c --- /dev/null +++ b/patches/acl-2.2.48/fix-crosscompile.patch @@ -0,0 +1,228 @@ +--- + 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); \ +- ../$(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
[ptxdist] [PATCH 05/48] [host-libdbus] Added .in segment for host libdbus.so and headers
From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools. See follow up patches. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-libdbus.in |8 1 files changed, 8 insertions(+), 0 deletions(-) create mode 100644 rules/host-libdbus.in diff --git a/rules/host-libdbus.in b/rules/host-libdbus.in new file mode 100644 index 000..efe416b --- /dev/null +++ b/rules/host-libdbus.in @@ -0,0 +1,8 @@ +## SECTION=hosttools + +config HOST_LIBDBUS + tristate + prompt libdbus + select HOST_DBUS + help + Headers and .so files for libdbus -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 04/48] [host-libattr] 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. See follow up patches. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-attr.in |3 ++ rules/host-attr.make | 86 ++ 2 files changed, 89 insertions(+), 0 deletions(-) create mode 100644 rules/host-attr.make diff --git a/rules/host-attr.in b/rules/host-attr.in index 4cf5ed8..aa6c8cd 100644 --- a/rules/host-attr.in +++ b/rules/host-attr.in @@ -2,3 +2,6 @@ config HOST_ATTR tristate + prompt attr + help + FIXME diff --git a/rules/host-attr.make b/rules/host-attr.make new file mode 100644 index 000..e9ce8ff --- /dev/null +++ b/rules/host-attr.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_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) + +#$(STATEDIR)/host-attr.prepare: +# @$(call targetinfo) +# @$(call clean, $(HOST_ATTR_DIR)/config.cache) +# cd $(HOST_ATTR_DIR) \ +# $(HOST_ATTR_PATH) $(HOST_ATTR_ENV) \ +# ./configure $(HOST_ATTR_AUTOCONF) +# @$(call touch) + +# +# Compile +# + +#$(STATEDIR)/host-attr.compile: +# @$(call targetinfo) +# cd $(HOST_ATTR_DIR) $(HOST_ATTR_PATH) $(MAKE) $(PARALLELMFLAGS) +# @$(call touch) + +# +# Install +# + +#$(STATEDIR)/host-attr.install: +# @$(call targetinfo) +# @$(call install, HOST_ATTR) +# @$(call touch) + +# +# 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 09/48] [pciutils] Added packets for host pciutils and headers
From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools. See follow up patches. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-pciutils.in |7 rules/host-pciutils.make | 87 ++ 2 files changed, 94 insertions(+), 0 deletions(-) create mode 100644 rules/host-pciutils.in create mode 100644 rules/host-pciutils.make diff --git a/rules/host-pciutils.in b/rules/host-pciutils.in new file mode 100644 index 000..22e7d82 --- /dev/null +++ b/rules/host-pciutils.in @@ -0,0 +1,7 @@ +## SECTION=hosttools_noprompt + +config HOST_PCIUTILS + tristate + prompt pciutils + help + FIXME diff --git a/rules/host-pciutils.make b/rules/host-pciutils.make new file mode 100644 index 000..3e65d7b --- /dev/null +++ b/rules/host-pciutils.make @@ -0,0 +1,87 @@ +# -*-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_PCIUTILS) += host-pciutils + +# +# Paths and names +# +HOST_PCIUTILS_DIR = $(HOST_BUILDDIR)/$(PCIUTILS) + +# +# Get +# + +$(STATEDIR)/host-pciutils.get: $(STATEDIR)/pciutils.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-pciutils.extract: + @$(call targetinfo) + @$(call clean, $(HOST_PCIUTILS_DIR)) + @$(call extract, PCIUTILS, $(HOST_BUILDDIR)) + @$(call patchin, PCIUTILS, $(HOST_PCIUTILS_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_PCIUTILS_PATH := PATH=$(HOST_PATH) +HOST_PCIUTILS_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_PCIUTILS_AUTOCONF := $(HOST_AUTOCONF) + +$(STATEDIR)/host-pciutils.prepare: + @$(call targetinfo) +# @$(call clean, $(HOST_PCIUTILS_DIR)/config.cache) +# cd $(HOST_PCIUTILS_DIR) \ +# $(HOST_PCIUTILS_PATH) $(HOST_PCIUTILS_ENV) \ +# ./configure $(HOST_PCIUTILS_AUTOCONF) + @$(call touch) + +# +# Compile +# + +#$(STATEDIR)/host-pciutils.compile: +# @$(call targetinfo) +# cd $(HOST_PCIUTILS_DIR) $(HOST_PCIUTILS_PATH) $(MAKE) $(PARALLELMFLAGS) +# @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-pciutils.install: + @$(call targetinfo) + #$(call install, HOST_PCIUTILS) + cd $(HOST_PCIUTILS_DIR) $(HOST_PCIUTILS_PATH) $(MAKE) DESTDIR=$(SYSROOT) install $(PARALLELMFLAGS) + @$(call touch) + +# +# Clean +# + +host-pciutils_clean: + rm -rf $(STATEDIR)/host-pciutils.* + rm -rf $(HOST_PCIUTILS_DIR) + +# vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 14/48] [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 acl control functions.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
patches/attr-2.4.44/attr_2.4.44-1.diff | 122 +
patches/attr-2.4.44/fix-buildsystem.diff | 210 +++---
patches/attr-2.4.44/series |5 +-
rules/attr.in|6 +
rules/attr.make | 26 -
5 files changed, 347 insertions(+), 22 deletions(-)
create mode 100644 patches/attr-2.4.44/attr_2.4.44-1.diff
diff --git a/patches/attr-2.4.44/attr_2.4.44-1.diff
b/patches/attr-2.4.44/attr_2.4.44-1.diff
new file mode 100644
index 000..982ca47
--- /dev/null
+++ b/patches/attr-2.4.44/attr_2.4.44-1.diff
@@ -0,0 +1,122 @@
+--- attr-2.4.44.orig/Makefile
attr-2.4.44/Makefile
+@@ -75,7 +75,6 @@
+ --bindir=/usr/bin \
+ --libdir=/lib \
+ --libexecdir=/usr/lib \
+- --enable-lib64=yes \
+ --includedir=/usr/include \
+ --mandir=/usr/share/man \
+ --datadir=/usr/share \
+--- attr-2.4.44.orig/debian/control
attr-2.4.44/debian/control
+@@ -3,9 +3,11 @@
+ Priority: optional
+ Maintainer: Nathan Scott nath...@debian.org
+ Uploaders: Niv Sardi xa...@debian.org, Anibal Monsalve Salazar
ani...@debian.org
+-Build-Depends: autoconf, debhelper (= 5), gettext, libtool
+-Standards-Version: 3.8.0
+-Homepage: http://oss.sgi.com/projects/xfs/
++Build-Depends: autoconf, automake, debhelper (= 7), gettext, libtool
++Standards-Version: 3.8.3
++Homepage: http://savannah.nongnu.org/projects/attr/
++Vcs-Git: git://git.savannah.nongnu.org/attr.git
++Vcs-Browser: http://git.savannah.gnu.org/cgit/attr.git
+
+ Package: attr
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+--- attr-2.4.44.orig/debian/compat
attr-2.4.44/debian/compat
+@@ -1 +1 @@
+-5
++7
+--- attr-2.4.44.orig/debian/watch
attr-2.4.44/debian/watch
+@@ -1,2 +1,2 @@
+ version=3
+-ftp://oss.sgi.com/projects/xfs/cmd_tars/ attr_([\d]+[\d\.]*)-[\d].tar.gz
++http://download.savannah.gnu.org/releases-noredirect/attr/
attr-([\d]+[\d\.]*).src.tar.gz
+--- attr-2.4.44.orig/debian/rules
attr-2.4.44/debian/rules
+@@ -1,5 +1,7 @@
+ #!/usr/bin/make -f
+
++export DH_VERBOSE=1
++
+ package = attr
+ develop = lib$(package)1-dev
+ library = lib$(package)1
+@@ -50,8 +52,14 @@
+ $(pkglib) $(MAKE) -C . install-lib
+ $(pkgme) $(MAKE) -C build src-manifest
+
++ sed s/^libdir='\/lib'$$/libdir='\/usr\/lib'/
$(dirdev)/usr/lib/libattr.la $(dirdev)/usr/lib/libattr.la.new
++ mv $(dirdev)/usr/lib/libattr.la.new $(dirdev)/usr/lib/libattr.la
++
+ -rm -rf $(dirdev)/usr/share/doc/attr
+ -rm -rf $(dirlib)/usr/share/doc/attr
++ -rm -rf $(dirlib)/usr/share/locale
++ -rm -rf $(dirlib)/usr/share/man
++ -rm -rf $(dirlib)/usr/bin
+
+ dh_installdocs
+ dh_installchangelogs
+--- attr-2.4.44.orig/debian/copyright
attr-2.4.44/debian/copyright
+@@ -1,7 +1,7 @@
+ This package was debianized by Nathan Scott nath...@debian.org on
+ Sun, 19 Nov 2000 07:37:09 -0500.
+
+-It can be downloaded from ftp://oss.sgi.com/projects/xfs/download/
++It can be downloaded from
http://download.savannah.gnu.org/releases-noredirect/attr/
+
+ Copyright:
+
+@@ -16,4 +16,4 @@
+ Certain components (as annotated in the source) are licensed
+ under version 2 of the terms of the GNU General Public License.
+ On Debian systems, the complete text of the GNU General Public
+-License can be found in /usr/share/common-licenses/GPL file.
++License can be found in /usr/share/common-licenses/GPL-2 file.
+--- attr-2.4.44.orig/debian/changelog
attr-2.4.44/debian/changelog
+@@ -1,3 +1,39 @@
++attr (1:2.4.44-1) unstable; urgency=low
++
++ * New upstream release
++ * Fix out-of-date-standards-version
++ * Fix copyright-refers-to-versionless-license-file
++ * Update homepage in debian/control
++ * Add Vcs-Git and Vcs-Browser to debian/control
++ * Update download page in debian/copyright
++ * Update debian/watch
++ * Add automake as a build-dependency
++
++ -- Anibal Monsalve Salazar ani...@debian.org Tue, 25 Aug 2009 11:23:53
+1000
++
++attr (1:2.4.43-3) unstable; urgency=low
++
++ [ Cyril Brulebois ]
++ * Backport the following fix by Petr Salinger from upstream to fix
++FTBFS on GNU/kFreeBSD (Closes: #531950): [git commit b4636a4e9e]
++On Linux, ENOATTR aliases to ENODATA. On other operating systems
++like Irix and BSD*, ENOATTR is a separate error number. Therefore,
++protect the check on âerr == ENODATAâ with â#ifdef __linux__â in
++strerror_ea() in both getfattr/getfattr.c and setfattr/setfattr.c
++
++ [ Anibal Monsalve Salazar ]
++ * Standards version is 3.8.2
++ * DH compatibility level is 7
++ * Fix incorrect-libdir-in-la-file usr/lib/libattr.la /lib != /usr/lib
++
++ -- Anibal Monsalve Salazar ani...@debian.org
[ptxdist] [PATCH 18/48] [libnih] Fixes to allow compilation with eglibc
From: Carsten Schlote c.schl...@konzeptpark.de
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
patches/libnih-1.0.0/autogen.sh |5 +
patches/libnih-1.0.0/remove-abort-msg-hack.patch | 94 ++
patches/libnih-1.0.0/series |1 +
3 files changed, 100 insertions(+), 0 deletions(-)
create mode 100644 patches/libnih-1.0.0/autogen.sh
create mode 100644 patches/libnih-1.0.0/remove-abort-msg-hack.patch
create mode 100644 patches/libnih-1.0.0/series
diff --git a/patches/libnih-1.0.0/autogen.sh b/patches/libnih-1.0.0/autogen.sh
new file mode 100644
index 000..73c682f
--- /dev/null
+++ b/patches/libnih-1.0.0/autogen.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+autoreconf -fvi
+
+echo Now run ./configure
diff --git a/patches/libnih-1.0.0/remove-abort-msg-hack.patch
b/patches/libnih-1.0.0/remove-abort-msg-hack.patch
new file mode 100644
index 000..4d0e8fc
--- /dev/null
+++ b/patches/libnih-1.0.0/remove-abort-msg-hack.patch
@@ -0,0 +1,94 @@
+Reverted reference to __abort_msg.
+
+This hack needs to be added to eglibc and the toolchain later and
+this patch can be removed.
+
+Not for upstream.
+---
+ nih/logging.c|6 +++---
+ nih/tests/test_logging.c | 14 +++---
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+Index: libnih-1.0.0/nih/logging.c
+===
+--- libnih-1.0.0.orig/nih/logging.c2009-12-10 14:41:38.0 +0100
libnih-1.0.0/nih/logging.c 2009-12-10 14:44:17.0 +0100
+@@ -43,7 +43,7 @@
+ *
+ * A glibc variable that keeps the assertion message in the core dump.
+ **/
+-extern char *__abort_msg;
++/* extern char *__abort_msg; */
+
+ /**
+ * logger:
+@@ -120,10 +120,10 @@
+ static void
+ nih_log_abort_message (const char *message)
+ {
+- if (__abort_msg)
++/*if (__abort_msg)
+ nih_discard (__abort_msg);
+
+- __abort_msg = NIH_MUST (nih_strdup (NULL, message));
++ __abort_msg = NIH_MUST (nih_strdup (NULL, message)); */
+ }
+
+ /**
+Index: libnih-1.0.0/nih/tests/test_logging.c
+===
+--- libnih-1.0.0.orig/nih/tests/test_logging.c 2009-12-10 14:41:38.0
+0100
libnih-1.0.0/nih/tests/test_logging.c 2009-12-10 14:43:43.0
+0100
+@@ -31,7 +31,7 @@
+ #include nih/main.h
+
+
+-extern char *__abort_msg;
++/* extern char *__abort_msg; */
+
+ static NihLogLevel last_priority = NIH_LOG_UNKNOWN;
+ static char * last_message = NULL;
+@@ -161,7 +161,7 @@
+*/
+ TEST_FEATURE (with fatal message);
+ TEST_ALLOC_FAIL {
+- __abort_msg = NULL;
++ /* __abort_msg = NULL; */
+ last_priority = NIH_LOG_UNKNOWN;
+ last_message = NULL;
+
+@@ -173,10 +173,10 @@
+ TEST_EQ (last_priority, NIH_LOG_FATAL);
+ TEST_EQ_STR (last_message, message with some 20 formatting);
+
+- TEST_NE_P (__abort_msg, NULL);
++/*TEST_NE_P (__abort_msg, NULL);
+ TEST_ALLOC_PARENT (__abort_msg, NULL);
+ TEST_EQ_STR (__abort_msg, message with some 20 formatting);
+-
++*/
+ free (last_message);
+ }
+
+@@ -190,7 +190,7 @@
+ msg = nih_strdup (NULL, test);
+ }
+
+- __abort_msg = msg;
++ /* __abort_msg = msg; */
+ TEST_FREE_TAG (msg);
+
+ last_priority = NIH_LOG_UNKNOWN;
+@@ -206,10 +206,10 @@
+
+ TEST_FREE (msg);
+
+- TEST_NE_P (__abort_msg, NULL);
++/*TEST_NE_P (__abort_msg, NULL);
+ TEST_ALLOC_PARENT (__abort_msg, NULL);
+ TEST_EQ_STR (__abort_msg, message with some 20 formatting);
+-
++*/
+ free (last_message);
+ }
+
diff --git a/patches/libnih-1.0.0/series b/patches/libnih-1.0.0/series
new file mode 100644
index 000..1d19617
--- /dev/null
+++ b/patches/libnih-1.0.0/series
@@ -0,0 +1 @@
+remove-abort-msg-hack.patch
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 17/48] [dhcp] Fix warning, which is treated as error.
From: Carsten Schlote c.schl...@konzeptpark.de
GCC 4.4.1 seems to have some problem with the 'ip' variable and claims it
is uninitialized. I added a fake assign to the declaration. This fixes
the problem at least.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
.../dhcp-4.1.0/gcc4.4-fixup-error-warning.patch| 22
patches/dhcp-4.1.0/series |1 +
2 files changed, 23 insertions(+), 0 deletions(-)
create mode 100644 patches/dhcp-4.1.0/gcc4.4-fixup-error-warning.patch
create mode 100644 patches/dhcp-4.1.0/series
diff --git a/patches/dhcp-4.1.0/gcc4.4-fixup-error-warning.patch
b/patches/dhcp-4.1.0/gcc4.4-fixup-error-warning.patch
new file mode 100644
index 000..5ed93b5
--- /dev/null
+++ b/patches/dhcp-4.1.0/gcc4.4-fixup-error-warning.patch
@@ -0,0 +1,22 @@
+[dhcp] Fix warning, which is treated as error.
+
+GCC 4.4.1 seems to have some problem with the 'ip' variable and claims it
+is uninitialized. I added a fake assign to the declaration. This fixes
+the problem at least.
+---
+ common/packet.c |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: dhcp-4.1.0/common/packet.c
+===
+--- dhcp-4.1.0.orig/common/packet.c2009-11-19 15:58:41.0 +0100
dhcp-4.1.0/common/packet.c 2009-11-19 15:59:57.0 +0100
+@@ -132,7 +132,7 @@
+ unsigned char *data;
+ unsigned len;
+ {
+- struct ip ip;
++ struct ip ip = { };
+ struct udphdr udp;
+
+ /* Fill out the IP header */
diff --git a/patches/dhcp-4.1.0/series b/patches/dhcp-4.1.0/series
new file mode 100644
index 000..58ad620
--- /dev/null
+++ b/patches/dhcp-4.1.0/series
@@ -0,0 +1 @@
+gcc4.4-fixup-error-warning.patch
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 22/48] [mountall] Added mountall 1.1 for upstart boot process
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- patches/mountall-1.1/autogen.sh |5 ++ patches/mountall-1.1/series |1 + rules/mountall.in | 11 rules/mountall.make | 115 +++ 4 files changed, 132 insertions(+), 0 deletions(-) create mode 100644 patches/mountall-1.1/autogen.sh create mode 100644 patches/mountall-1.1/series create mode 100644 rules/mountall.in create mode 100644 rules/mountall.make diff --git a/patches/mountall-1.1/autogen.sh b/patches/mountall-1.1/autogen.sh new file mode 100644 index 000..73c682f --- /dev/null +++ b/patches/mountall-1.1/autogen.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +autoreconf -fvi + +echo Now run ./configure diff --git a/patches/mountall-1.1/series b/patches/mountall-1.1/series new file mode 100644 index 000..f4159c5 --- /dev/null +++ b/patches/mountall-1.1/series @@ -0,0 +1 @@ +dummy.patch diff --git a/rules/mountall.in b/rules/mountall.in new file mode 100644 index 000..ae631de --- /dev/null +++ b/rules/mountall.in @@ -0,0 +1,11 @@ +## SECTION=shell_and_console + +config MOUNTALL + tristate + select HOST_LIBNIH + select HOST_LIBNIH_DBUS_TOOL + select LIBNIH + depends on INITMETHOD_UPSTART + prompt mountall + help + FIXME diff --git a/rules/mountall.make b/rules/mountall.make new file mode 100644 index 000..ad6c2e8 --- /dev/null +++ b/rules/mountall.make @@ -0,0 +1,115 @@ +# -*-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 +# +PACKAGES-$(PTXCONF_MOUNTALL) += mountall + +# +# Paths and names +# +MOUNTALL_VERSION := 1.1 +MOUNTALL := mountall-$(MOUNTALL_VERSION) +MOUNTALL_SUFFIX:= tar.gz +MOUNTALL_URL := https://launchpad.net/ubuntu/+archive/primary/+files/mountall_$(MOUNTALL_VERSION).$(MOUNTALL_SUFFIX) +MOUNTALL_SOURCE:= $(SRCDIR)/mountall_$(MOUNTALL_VERSION).$(MOUNTALL_SUFFIX) +MOUNTALL_DIR := $(BUILDDIR)/$(MOUNTALL) +MOUNTALL_LICENSE := GPL + +# +# Get +# + +$(MOUNTALL_SOURCE): + @$(call targetinfo) + @$(call get, MOUNTALL) + +# +# Prepare +# + +MOUNTALL_PATH := PATH=$(CROSS_PATH) +MOUNTALL_ENV := $(CROSS_ENV) \ +NIH_DBUS_TOOL=$(PTXCONF_SYSROOT_HOST)/usr/bin/nih-dbus-tool + +MOUNTALL_MAKEVARS := \ +NIH_DBUS_TOOL=$(PTXCONF_SYSROOT_HOST)/usr/bin/nih-dbus-tool + +# +# autoconf +# +MOUNTALL_AUTOCONF := $(CROSS_AUTOCONF_ROOT) + +#$(STATEDIR)/mountall.prepare: +# @$(call targetinfo) +# @$(call clean, $(MOUNTALL_DIR)/config.cache) +# cd $(MOUNTALL_DIR) \ +# $(MOUNTALL_PATH) $(MOUNTALL_ENV) \ +# ./configure $(MOUNTALL_AUTOCONF) +# @$(call touch) + +# +# Compile +# + +#$(STATEDIR)/mountall.compile: +# @$(call targetinfo) +# cd $(MOUNTALL_DIR) $(MOUNTALL_PATH) $(MAKE) $(PARALLELMFLAGS) +# @$(call touch) + +# +# Install +# + +#$(STATEDIR)/mountall.install: +# @$(call targetinfo) +# @$(call install, MOUNTALL) +# @$(call touch) + +# +# Target-Install +# + +$(STATEDIR)/mountall.targetinstall: + @$(call targetinfo) + + @$(call install_init, mountall) + @$(call install_fixup, mountall,PACKAGE,mountall) + @$(call install_fixup, mountall,PRIORITY,optional) + @$(call install_fixup, mountall,VERSION,$(MOUNTALL_VERSION)) + @$(call install_fixup, mountall,SECTION,base) + @$(call install_fixup, mountall,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) + @$(call install_fixup, mountall,DEPENDS,) + @$(call install_fixup, mountall,DESCRIPTION,missing) + +# @$(call install_copy, mountall, 0, 0, 0755, $(MOUNTALL_DIR)/foobar, /dev/null) + + @$(call install_copy, mountall, 0, 0, 0755, -, /sbin/mountall ) + + @$(call install_copy, mountall, 0, 0, 0644, -, /etc/init/mountall-net.conf ) + @$(call install_copy, mountall, 0, 0, 0644, -,
[ptxdist] [PATCH 26/48] Fix issue with Ubuntu 'sh' and .postinst
From: Carsten Schlote c.schl...@konzeptpark.de The postinst scripts seem to have problem with ubuntu. As we have bash on our target, we can use bash here. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/busybox.postinst |2 +- rules/cvs.postinst |2 +- rules/dnsmasq.postinst |2 +- rules/fam.postinst |2 +- rules/inetutils.postinst |2 +- rules/portmap.postinst |2 +- rules/pureftpd.postinst |2 +- rules/rsync.postinst |2 +- rules/urshd.postinst |2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rules/busybox.postinst b/rules/busybox.postinst index 6f56479..ff796a8 100644 --- a/rules/busybox.postinst +++ b/rules/busybox.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/cvs.postinst b/rules/cvs.postinst index 6f56479..ff796a8 100644 --- a/rules/cvs.postinst +++ b/rules/cvs.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/dnsmasq.postinst b/rules/dnsmasq.postinst index 6f56479..ff796a8 100644 --- a/rules/dnsmasq.postinst +++ b/rules/dnsmasq.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/fam.postinst b/rules/fam.postinst index 6f56479..ff796a8 100644 --- a/rules/fam.postinst +++ b/rules/fam.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/inetutils.postinst b/rules/inetutils.postinst index 6f56479..ff796a8 100644 --- a/rules/inetutils.postinst +++ b/rules/inetutils.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/portmap.postinst b/rules/portmap.postinst index 6f56479..ff796a8 100644 --- a/rules/portmap.postinst +++ b/rules/portmap.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/pureftpd.postinst b/rules/pureftpd.postinst index 6f56479..ff796a8 100644 --- a/rules/pureftpd.postinst +++ b/rules/pureftpd.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/rsync.postinst b/rules/rsync.postinst index 6f56479..ff796a8 100644 --- a/rules/rsync.postinst +++ b/rules/rsync.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/urshd.postinst b/rules/urshd.postinst index 6f56479..ff796a8 100644 --- a/rules/urshd.postinst +++ b/rules/urshd.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 34/48] [nfsutils] Added option to install mount.nfs
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/nfsutils.in |4 rules/nfsutils.make |5 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/rules/nfsutils.in b/rules/nfsutils.in index a653d22..f315797 100644 --- a/rules/nfsutils.in +++ b/rules/nfsutils.in @@ -107,6 +107,10 @@ config NFSUTILS_INSTALL_SHOWMOUNT bool prompt Install /sbin/showmount +config NFSUTILS_INSTALL_MOUNTNFS + bool + prompt Install /sbin/mount.nfs + config NFSUTILS_INSTALL_STATD bool prompt Install /sbin/statd diff --git a/rules/nfsutils.make b/rules/nfsutils.make index 9bcd68e..aaafd99 100644 --- a/rules/nfsutils.make +++ b/rules/nfsutils.make @@ -144,6 +144,11 @@ ifdef PTXCONF_NFSUTILS_INSTALL_SHOWMOUNT @$(call install_copy, nfsutils, 0, 0, 0755, -, /sbin/showmount) endif +ifdef PTXCONF_NFSUTILS_INSTALL_MOUNTNFS + @$(call install_copy, nfsutils, 0, 0, 0755, \ + -, /sbin/mount.nfs) +endif + ifdef PTXCONF_NFSUTILS_INSTALL_STATD @$(call install_copy, nfsutils, 0, 0, 0755, -, /sbin/rpc.statd) @$(call install_copy, nfsutils, 0, 0, 0755, -, /sbin/start-statd) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 39/48] [hexedit] Added simple help text to hexedit
From: Carsten Schlote c.schl...@konzeptpark.de
hexedit uses 'man' to display help. Code changed to use
less on ascii manpage output.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
patches/hexedit-1.2.12/hexedit-help-fix.diff | 44 ++
patches/hexedit-1.2.12/series|1 +
rules/hexedit.make |6 +++
3 files changed, 51 insertions(+), 0 deletions(-)
create mode 100644 patches/hexedit-1.2.12/hexedit-help-fix.diff
diff --git a/patches/hexedit-1.2.12/hexedit-help-fix.diff
b/patches/hexedit-1.2.12/hexedit-help-fix.diff
new file mode 100644
index 000..7012c89
--- /dev/null
+++ b/patches/hexedit-1.2.12/hexedit-help-fix.diff
@@ -0,0 +1,44 @@
+[hexedit] Add some help output to hexedit
+
+Still sucks, but better tha nothing. Not for upstream.
+
+---
+ Makefile.in |5 -
+ interact.c |4 ++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+Index: hexedit-1.2.12/Makefile.in
+===
+--- hexedit-1.2.12.orig/Makefile.in2009-10-06 12:20:28.0 +0200
hexedit-1.2.12/Makefile.in 2009-10-06 12:23:00.0 +0200
+@@ -29,11 +29,14 @@
+ .c.o:
+ $(CC) $(DEFS) $(CFLAGS) $(CPPFLAGS) -c $
+
+-all: $(PRODUCT)
++all: $(PRODUCT) $(PRODUCT).ascii
+
+ $(PRODUCT): $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
++$(PRODUCT).ascii: $(PRODUCT).1
++ groff -T ascii -a $(PRODUCT).1 $(PRODUCT).ascii
++
+ clean:
+ rm -rf *~ *.o core *.cache config.status config.log $(PRODUCT)
+
+Index: hexedit-1.2.12/interact.c
+===
+--- hexedit-1.2.12.orig/interact.c 2005-11-08 17:16:47.0 +0100
hexedit-1.2.12/interact.c 2009-10-06 12:21:24.0 +0200
+@@ -309,8 +309,8 @@
+ char *args[3];
+ int status;
+
+- args[0] = man;
+- args[1] = hexedit;
++ args[0] = less;
++ args[1] = /usr/share/hexedit/hexedit.ascii;
+ args[2] = NULL;
+ endwin();
+ if (fork() == 0) {
diff --git a/patches/hexedit-1.2.12/series b/patches/hexedit-1.2.12/series
index 299a9d8..c4aee85 100644
--- a/patches/hexedit-1.2.12/series
+++ b/patches/hexedit-1.2.12/series
@@ -1,2 +1,3 @@
0001-Makefile.in-use-CPPFLAGS.patch
0002-Makefile.in-add-DESTDIR-support.patch
+hexedit-help-fix.diff
diff --git a/rules/hexedit.make b/rules/hexedit.make
index f8e1dd1..e7cd35d 100644
--- a/rules/hexedit.make
+++ b/rules/hexedit.make
@@ -73,9 +73,15 @@ $(STATEDIR)/hexedit.targetinstall:
@$(call install_fixup, hexedit,DEPENDS,)
@$(call install_fixup, hexedit,DESCRIPTION,missing)
+
@$(call install_copy, hexedit, 0, 0, 0755, -, \
/usr/bin/hexedit)
+# @$(call install_copy, hexedit, 0, 0, 0755, $(HEXEDIT_DIR)/hexedit,
/usr/bin/hexedit)
+ @$(call install_copy, hexedit, 0, 0, 0755, /usr/share/)
+ @$(call install_copy, hexedit, 0, 0, 0755, /usr/share/hexedit/)
+ @$(call install_copy, hexedit, 0, 0, 0755,
$(HEXEDIT_DIR)/hexedit.ascii, /usr/share/hexedit/hexedit.ascii)
+
@$(call install_finish, hexedit)
@$(call touch)
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 40/48] [hal] Fixed select of UDEV__EXTRA_VOLUME_ID
From: Carsten Schlote c.schl...@konzeptpark.de With udev 147 this is no longer available. Commented out. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/hal.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/hal.in b/rules/hal.in index 237c005..21cee6b 100644 --- a/rules/hal.in +++ b/rules/hal.in @@ -9,7 +9,7 @@ menuconfig HAL select DBUS_GLIB select POLICYKIT if HAL__POLKIT # FIXME: why is this dependency necessary? - select UDEV__EXTRA_VOLUME_ID + #select UDEV__EXTRA_VOLUME_ID - no longer existent with udev-147 prompt hal help hal is a dbus service which provides userspace access for all -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 24/48] [miredo] Added miredo 1.2.2
From: Carsten Schlote c.schl...@konzeptpark.de
This packet provides IPV6 networking with the
tereodo protocol.
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 | 16 +++
patches/miredo-1.2.2/mireo-autogen.sh.patch | 81 +++
patches/miredo-1.2.2/series |1 +
rules/miredo.in | 16 +++
rules/miredo.make | 144 +++
9 files changed, 474 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 100644 patches/miredo-1.2.2/autogen.sh
create mode 100644 patches/miredo-1.2.2/mireo-autogen.sh.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
+
[ptxdist] [PATCH 48/48] [attr] Fixed series file typo
From: Carsten Schlote c.schl...@konzeptpark.de I had to change the .gz file to plain text to provide this patchstack and forgot to fix the series file. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- patches/attr-2.4.44/series |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/patches/attr-2.4.44/series b/patches/attr-2.4.44/series index ba0adef..d08e3c0 100644 --- a/patches/attr-2.4.44/series +++ b/patches/attr-2.4.44/series @@ -1,3 +1,3 @@ -attr_2.4.44-1.diff.gz +attr_2.4.44-1.diff fix-buildsystem.diff -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 46/48] [strongswan] Added strongswan
From: Carsten Schlote c.schl...@konzeptpark.de
Not for upstream.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
patches/strongswan-4.2.12/crossfixes.diff | 19 ++
patches/strongswan-4.2.12/series |3 +
.../strongswan-diffs-vendor-kp.diff| 74 ++
rules/strongswan.in| 76 ++
rules/strongswan.make | 257
5 files changed, 429 insertions(+), 0 deletions(-)
create mode 100644 patches/strongswan-4.2.12/crossfixes.diff
create mode 100644 patches/strongswan-4.2.12/series
create mode 100644 patches/strongswan-4.2.12/strongswan-diffs-vendor-kp.diff
create mode 100644 rules/strongswan.in
create mode 100644 rules/strongswan.make
diff --git a/patches/strongswan-4.2.12/crossfixes.diff
b/patches/strongswan-4.2.12/crossfixes.diff
new file mode 100644
index 000..29df297
--- /dev/null
+++ b/patches/strongswan-4.2.12/crossfixes.diff
@@ -0,0 +1,19 @@
+---
+ configure | 80
+---
+ configure.in| 29 ---
+ src/starter/starterstroke.c |1
+ src/starter/starterstroke.c |1 +
+ 1 file changed, 1 insertion(+)
+
+Index: strongswan-4.2.12/src/starter/starterstroke.c
+===
+--- strongswan-4.2.12.orig/src/starter/starterstroke.c 2009-02-05
23:09:08.0 +0100
strongswan-4.2.12/src/starter/starterstroke.c 2009-02-25
11:04:44.0 +0100
+@@ -25,6 +25,7 @@
+ #include netinet/in.h
+ #include arpa/inet.h
+ #include linux/xfrm.h
++#define XFRM_MODE_BEET 4
+
+ #include freeswan.h
+
diff --git a/patches/strongswan-4.2.12/series b/patches/strongswan-4.2.12/series
new file mode 100644
index 000..6097235
--- /dev/null
+++ b/patches/strongswan-4.2.12/series
@@ -0,0 +1,3 @@
+crossfixes.diff
+strongswan-diffs-vendor-kp.diff -p0
+
diff --git a/patches/strongswan-4.2.12/strongswan-diffs-vendor-kp.diff
b/patches/strongswan-4.2.12/strongswan-diffs-vendor-kp.diff
new file mode 100644
index 000..7dac3d7
--- /dev/null
+++ b/patches/strongswan-4.2.12/strongswan-diffs-vendor-kp.diff
@@ -0,0 +1,74 @@
+Patch to add DH Group 1 to build.
+---
+ src/pluto/crypto.c |3 +++
+ src/pluto/crypto.h |2 +-
+ src/pluto/defs.h |2 +-
+ src/starter/args.c |1 +
+ 4 files changed, 6 insertions(+), 2 deletions(-)
+
+Index: src/starter/args.c
+===
+--- src/starter/args.c.orig2008-12-23 07:24:01.0 +0100
src/starter/args.c 2009-01-25 17:40:37.0 +0100
+@@ -106,6 +106,7 @@
+ };
+
+ static const char *LST_pfsgroup[] = {
++modp768,
+ modp1024,
+ modp1536,
+ modp2048,
+Index: src/pluto/crypto.c
+===
+--- src/pluto/crypto.c.orig2008-12-23 07:24:11.0 +0100
src/pluto/crypto.c 2009-01-25 17:40:37.0 +0100
+@@ -40,6 +40,7 @@
+ /* moduli and generator. */
+
+ static MP_INT
++modp768_modulus,
+ modp1024_modulus,
+ modp1536_modulus,
+ modp2048_modulus,
+@@ -457,6 +458,7 @@
+ init_crypto(void)
+ {
+ if (mpz_init_set_str(groupgenerator, MODP_GENERATOR, 10) != 0
++|| mpz_init_set_str(modp768_modulus, MODP768_MODULUS, 16) != 0
+ || mpz_init_set_str(modp1024_modulus, MODP1024_MODULUS, 16) != 0
+ || mpz_init_set_str(modp1536_modulus, MODP1536_MODULUS, 16) != 0
+ || mpz_init_set_str(modp2048_modulus, MODP2048_MODULUS, 16) != 0
+@@ -482,6 +484,7 @@
+
+ const struct oakley_group_desc oakley_group[OAKLEY_GROUP_SIZE] = {
+ # define BYTES(bits) (((bits) + BITS_PER_BYTE - 1) / BITS_PER_BYTE)
++{ OAKLEY_GROUP_MODP768 , modp768_modulus, BYTES(768) },
+ { OAKLEY_GROUP_MODP1024, modp1024_modulus, BYTES(1024) },
+ { OAKLEY_GROUP_MODP1536, modp1536_modulus, BYTES(1536) },
+ { OAKLEY_GROUP_MODP2048, modp2048_modulus, BYTES(2048) },
+Index: src/pluto/crypto.h
+===
+--- src/pluto/crypto.h.orig2008-12-23 07:24:11.0 +0100
src/pluto/crypto.h 2009-01-25 17:40:37.0 +0100
+@@ -33,7 +33,7 @@
+
+ extern const struct oakley_group_desc unset_group;/* magic signifier */
+ extern const struct oakley_group_desc *lookup_group(u_int16_t group);
+-#define OAKLEY_GROUP_SIZE 7
++#define OAKLEY_GROUP_SIZE 8
+ extern const struct oakley_group_desc oakley_group[OAKLEY_GROUP_SIZE];
+
+ /* unification of cryptographic encoding/decoding algorithms
+Index: src/pluto/defs.h
+===
+--- src/pluto/defs.h.orig 2008-12-23 07:24:11.0 +0100
src/pluto/defs.h 2009-01-25 17:40:37.0 +0100
+@@ -34,7 +34,7 @@
+
+ /* Length of temporary buffers */
+
+-#define BUF_LEN 512
++#define BUF_LEN 1024
+
+ /* type of serial number of a state object
[ptxdist] [PATCH 20/48] [udev] Updated to version 147 and appr. changes
From: Carsten Schlote c.schl...@konzeptpark.de
Required for latest upstart 0.6.3
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
patches/udev-147/autogen.sh | 16 +++
patches/udev-147/fix-crosscompile.patch | 21 +
patches/udev-147/series |1 +
rules/udev.in | 41 -
rules/udev.make | 72 +++
5 files changed, 130 insertions(+), 21 deletions(-)
create mode 100644 patches/udev-147/autogen.sh
create mode 100644 patches/udev-147/fix-crosscompile.patch
create mode 100644 patches/udev-147/series
diff --git a/patches/udev-147/autogen.sh b/patches/udev-147/autogen.sh
new file mode 100644
index 000..cd5c6d6
--- /dev/null
+++ b/patches/udev-147/autogen.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+aclocal $ACLOCAL_FLAGS
+
+libtoolize \
+ --force \
+ --copy
+
+autoreconf \
+ --force \
+ --install \
+ --warnings=cross \
+ --warnings=syntax \
+ --warnings=obsolete \
+ --warnings=unsupported
+
diff --git a/patches/udev-147/fix-crosscompile.patch
b/patches/udev-147/fix-crosscompile.patch
new file mode 100644
index 000..521233d
--- /dev/null
+++ b/patches/udev-147/fix-crosscompile.patch
@@ -0,0 +1,21 @@
+---
+ configure.ac |6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: udev-146/configure.ac
+===
+--- udev-146.orig/configure.ac 2009-08-10 03:37:42.0 +0200
udev-146/configure.ac 2009-12-09 10:11:53.0 +0100
+@@ -69,9 +69,9 @@
+ PKG_CHECK_MODULES(USBUTILS, usbutils = 0.82)
+ AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
+
+- AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
+- AC_CHECK_FILES([/usr/share/hwdata/pci.ids],
[pciids=/usr/share/hwdata/pci.ids])
+- AC_CHECK_FILES([/usr/share/misc/pci.ids],
[pciids=/usr/share/misc/pci.ids])
++# AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
++# AC_CHECK_FILES([/usr/share/hwdata/pci.ids],
[pciids=/usr/share/hwdata/pci.ids])
++# AC_CHECK_FILES([/usr/share/misc/pci.ids],
[pciids=/usr/share/misc/pci.ids])
+ AC_ARG_WITH(pci-ids-path,
+ AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]),
+ [PCI_DATABASE=${withval}],
diff --git a/patches/udev-147/series b/patches/udev-147/series
new file mode 100644
index 000..1752ae8
--- /dev/null
+++ b/patches/udev-147/series
@@ -0,0 +1 @@
+fix-crosscompile.patch
diff --git a/rules/udev.in b/rules/udev.in
index 58db642..e68a26a 100644
--- a/rules/udev.in
+++ b/rules/udev.in
@@ -2,7 +2,13 @@
menuconfig UDEV
tristate
prompt udev
+ select HOST_GPERF
select ROOTFS_DEV
+ select ACL
+ select USBUTILS
+ select LIBUSB_COMPAT
+ select PCIUTILS
+ #select GOBJECT_INTROSPECTION # Broken in-trre build tools!
help
udev provides a dynamic device directory containing only the files for
actually present devices. It creates or removes device node files in
the
@@ -98,6 +104,12 @@ menu extras
udev callout to create a device path based unique name for a
device to
implement the Linux Persistent Device Naming scheme
+ config UDEV__EXTRA_PCI_DB
+ bool
+ prompt pci-db
+ help
+ FIXME
+
config UDEV__EXTRA_RULE_GENERATOR
bool
prompt rule_generator
@@ -110,6 +122,18 @@ menu extras
help
Used to build unique IDs for an SCSI media to identify it
again
+ config UDEV__EXTRA_UDEV_ACL
+ bool
+ prompt udev-acl
+ help
+ FIXME
+
+ config UDEV__EXTRA_USB_DB
+ bool
+ prompt usb-db
+ help
+ FIXME
+
config UDEV__EXTRA_USB_ID
bool
prompt usb_id
@@ -118,9 +142,9 @@ menu extras
USB device. This is required to ensure the same hotplugged
device to
appear always at the same device node (via link)
- config UDEV__EXTRA_VOLUME_ID
+ config UDEV__EXTRA_V4L_ID
bool
- prompt volume_id
+ prompt v4l_id
help
FIXME
@@ -148,7 +172,18 @@ menu install options
prompt install default udev rules
help
This will install the generic udev rules files from the udev
package
- under /lib/udev/rules.d/
+ under /lib/udev/rules.d/, except of rules to automatically
load
+ drivers
[ptxdist] [PATCH 19/48] Integrate new host builds into hosttools.in
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- platforms/hosttools.in |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/platforms/hosttools.in b/platforms/hosttools.in index f67c187..0882a6c 100644 --- a/platforms/hosttools.in +++ b/platforms/hosttools.in @@ -2,11 +2,13 @@ source rules/host-cramfs.in source rules/host-e2fsprogs.in source rules/host-genext2fs.in source rules/host-genpart.in +source rules/host-gettext.in source rules/host-liblzo.in source rules/host-mkelfImage.in source rules/host-mtd-utils.in source rules/host-squashfs-tools.in source rules/host-umkimage.in +source rules/host-util-linux-ng.in source rules/host-xz.in # common -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 29/48] [dbench] Fixed compilation of dbench, added config dep
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/dbench.in |1 + rules/dbench.make |7 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rules/dbench.in b/rules/dbench.in index 719b8b7..5255793 100644 --- a/rules/dbench.in +++ b/rules/dbench.in @@ -2,6 +2,7 @@ menuconfig DBENCH tristate + select ATTR prompt dbench help The dbench (disk) and tbench (TCP) benchmarks diff --git a/rules/dbench.make b/rules/dbench.make index 7d8ef62..ef217ff 100644 --- a/rules/dbench.make +++ b/rules/dbench.make @@ -39,12 +39,15 @@ $(DBENCH_SOURCE): DBENCH_PATH= PATH=$(CROSS_PATH) DBENCH_ENV = $(CROSS_ENV) -DBENCH_MAKEVARS = prefix=$(PKGDIR)/$(DBENCH)/usr +DBENCH_MAKEVARS = \ + prefix=$(PKGDIR)/$(DBENCH)/usr + # # autoconf # -DBENCH_AUTOCONF = $(CROSS_AUTOCONF_USR) +DBENCH_AUTOCONF = $(CROSS_AUTOCONF_USR) \ + CFLAGS=-I$(SYSROOT)/usr/include/ # # Target-Install -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 37/48] [ppp] Added lzo compression support. Use internal pon/poff commands
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/ppp.in | 27 +-- rules/ppp.make | 18 +++--- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/rules/ppp.in b/rules/ppp.in index 827d500..60e15a0 100644 --- a/rules/ppp.in +++ b/rules/ppp.in @@ -7,6 +7,7 @@ menuconfig PPP select LIBC_DL select LIBC_RESOLV if PPP_PLUGINS select LIBC_CRYPT if PPP_NEEDS_CRYPT + select LIBLZO if PPP_USE_LZO select LIBPCAP if PPP_FILTER select LIBPCAP_IPV6 if PPP_FILTER PPP_IPV6 select OPENSSL if PPP_SRP @@ -32,6 +33,12 @@ config PPP_SUID Makes the pppd binary SUID for ruMakes the pppd binary SUID for Makes the pppd binary SUID for running as a server. +config PPP_USE_LZO + bool Use LZO library for compression + default n + help + FIXME: This item needs to be documented + config PPP_IPV6 bool prompt enable ipv6 support @@ -202,9 +209,25 @@ config PPP_INST_PPPSTATS intervals for a specified PPP interface. config PPP_INST_PONOFF - bool install pon/poff + bool Install pon, poff scripts + help + FIXME: This item needs to be documented + +config PPP_INST_PLOG + bool Install plog script + default n help - FIXME + FIXME: This item needs to be documented + +config PPP_PLUGIN_RP_PPPOE_DISCOVERY + bool Install pppoe-discovery + select PPP_PLUGINS + select PPP_OE + default n + help + FIXME: This item needs to be documented + +comment startup options config PPP_STARTSCRIPT bool diff --git a/rules/ppp.make b/rules/ppp.make index 5d2c384..0752575 100644 --- a/rules/ppp.make +++ b/rules/ppp.make @@ -3,6 +3,7 @@ # Copyright (C) 2003 by Marc Kleine-Budde kleine-bu...@gmx.de for # GYRO net GmbH i...@gyro-net.de, Hannover, Germany # 2008, 2009 by Juergen Beisert juer...@kreuzholzen.de +# 2008, 2009 by Carsten Schlote c.schl...@konzeptpark.de # # See CREDITS for details about who has contributed to this project. # @@ -53,10 +54,14 @@ PPP_MAKE_PAR := NO # PPP_SHARED_INST_PATH := /usr/lib/pppd/$(PPP_VERSION) +ifndef PTXCONF_PPP_USE_LZO +PPP_LZO := --disable-lzo +endif + $(STATEDIR)/ppp.prepare: @$(call targetinfo) @cd $(PPP_DIR) $(PPP_PATH) $(PPP_ENV) \ - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc $(PPP_LZO) ifdef PTXCONF_PPP_IPV6 @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y) @@ -209,8 +214,15 @@ ifdef PTXCONF_PPP_INST_PPPSTATS endif ifdef PTXCONF_PPP_INST_PONOFF - @$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/pon) - @$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/poff) + @$(call install_copy, ppp, 0, 0, 0755, \ + $(PPP_DIR)/scripts/pon, /usr/sbin/pon, n) + @$(call install_copy, ppp, 0, 0, 0755, \ + $(PPP_DIR)/scripts/poff, /usr/sbin/poff, n) +endif + +ifdef PTXCONF_PPP_INST_PLOG + @$(call install_copy, ppp, 0, 0, 0755, \ + $(PPP_DIR)/scripts/plog, /usr/sbin/plog, n) endif ifdef PTXCONF_PPP_PLUGINS -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 27/48] [banner] Added ptxdist_{vendor|version} tags, simplified banner
From: Carsten Schlote c.schl...@konzeptpark.de
We needed some to find out about the current build release, so
we added the These contain
the same info as the banner, so we changed the banner to
use it.
Banner is no longer composed in initmethod, but roofs packet now
provides /etc/ptxdist-[version|vendor} files.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
generic/etc/init.d/banner| 11 ++-
generic/etc/ptxdist_vendor |1 +
generic/etc/ptxdist_version |1 +
rules/initmethod-bbinit.make | 21 -
rules/rootfs.make| 25 +
5 files changed, 33 insertions(+), 26 deletions(-)
create mode 100644 generic/etc/ptxdist_vendor
create mode 100644 generic/etc/ptxdist_version
diff --git a/generic/etc/init.d/banner b/generic/etc/init.d/banner
index 964c666..64ff14e 100644
--- a/generic/etc/init.d/banner
+++ b/generic/etc/init.d/banner
@@ -2,7 +2,8 @@
#
# /etc/init.d/banner
#
-
+PTXVERSION=$(cat /etc/ptxdist_version)
+PTXVENDOR=$(cat /etc/ptxdist_vendor)
FIGLET=/usr/bin/figlet
FIGLET_FONTS=/usr/share/figlet
PATH=/sbin:/bin:/usr/bin
@@ -11,13 +12,13 @@ test -f $FIGLET || { echo $FIGLET not found 2 ; exit 1;
}
start_proc() {
echo
- echo OSELAS(R)-...@project@@PRJVERSION@
(@ptxd...@-@vers...@.@patchle...@.@SUBLEVEL@@EXTRAVERSION@/@DATE@)
+ echo $PTXVERSION
echo
host=`/bin/hostname`
- if [ -n @VENDOR@ ]; then
- ${FIGLET} -w 0 -f ${FIGLET_FONTS}/standard @VENDOR@
+ if [ ! -n $PTXVENDOR ]; then
+ PTXVENDOR=$host
fi
- ${FIGLET} -w 0 -f ${FIGLET_FONTS}/standard $host
+ ${FIGLET} -w 0 -f ${FIGLET_FONTS}/standard $PTXVENDOR
echo
echo
}
diff --git a/generic/etc/ptxdist_vendor b/generic/etc/ptxdist_vendor
new file mode 100644
index 000..d7a6f17
--- /dev/null
+++ b/generic/etc/ptxdist_vendor
@@ -0,0 +1 @@
+...@vendor@
diff --git a/generic/etc/ptxdist_version b/generic/etc/ptxdist_version
new file mode 100644
index 000..c9a4c9d
--- /dev/null
+++ b/generic/etc/ptxdist_version
@@ -0,0 +1 @@
+OSELAS(R)-...@project@@PRJVERSION@
(@ptxd...@-@vers...@.@patchle...@.@SUBLEVEL@@EXTRAVERSION@/@DATE@)
diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make
index cd9c833..f5a79c0 100644
--- a/rules/initmethod-bbinit.make
+++ b/rules/initmethod-bbinit.make
@@ -91,27 +91,6 @@ $(STATEDIR)/initmethod-bbinit.targetinstall:
# #
ifdef PTXCONF_INITMETHOD_BBINIT_ETC_INITD_BANNER
@$(call install_alternative, initmethod-bbinit, 0, 0, 0755,
/etc/init.d/banner, n)
-
- @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \
- @PROJECT@, $(PTXCONF_PROJECT))
- @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \
- @PRJVERSION@, $(PTXCONF_PROJECT_VERSION))
-
- @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \
- @PTXDIST@, ptxdist)
- @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \
- @VERSION@, $(PTXDIST_VERSION_YEAR))
- @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \
- @PATCHLEVEL@, $(PTXDIST_VERSION_MONTH))
- @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \
- @SUBLEVEL@, $(PTXDIST_VERSION_BUGFIX))
- @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \
- @EXTRAVERSION@, $(PTXDIST_VERSION_SCM))
- @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \
- @DATE@, $(shell date -Iseconds))
-
- @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \
- @VENDOR@, $(PTXCONF_PROJECT_VENDOR))
endif
ifdef PTXCONF_INITMETHOD_BBINIT_ETC_INITD_MODULES
diff --git a/rules/rootfs.make b/rules/rootfs.make
index 244fdce..eb7c11e 100644
--- a/rules/rootfs.make
+++ b/rules/rootfs.make
@@ -216,6 +216,31 @@ ifdef PTXCONF_ROOTFS_SERVICES
@$(call install_alternative, rootfs, 0, 0, 0644, /etc/services)
endif
+ # PTXDist version tag
+
+ @$(call install_alternative, rootfs, 0, 0, 0644, /etc/ptxdist_version,
n)
+ @$(call install_replace, rootfs, /etc/ptxdist_version, \
+ @PROJECT@, $(PTXCONF_PROJECT))
+ @$(call install_replace, rootfs, /etc/ptxdist_version, \
+ @PRJVERSION@, $(PTXCONF_PROJECT_VERSION))
+
+ @$(call install_replace, rootfs, /etc/ptxdist_version, \
+ @PTXDIST@, ptxdist)
+ @$(call install_replace, rootfs, /etc/ptxdist_version, \
+ @VERSION@, $(PTXDIST_VERSION_YEAR))
+ @$(call install_replace, rootfs, /etc/ptxdist_version, \
+ @PATCHLEVEL@, $(PTXDIST_VERSION_MONTH))
+ @$(call install_replace, rootfs, /etc/ptxdist_version, \
+ @SUBLEVEL@, $(PTXDIST_VERSION_BUGFIX))
+ @$(call install_replace, rootfs, /etc/ptxdist_version, \
+ @EXTRAVERSION@,
[ptxdist] [PATCH 30/48] [gettext] Updated to version 0.17
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/gettext.make |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/gettext.make b/rules/gettext.make index ec4e3d1..65b3d59 100644 --- 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 GETTEXT:= gettext-$(GETTEXT_VERSION) GETTEXT_SUFFIX := tar.gz GETTEXT_URL:= $(PTXCONF_SETUP_GNUMIRROR)/gettext/$(GETTEXT).$(GETTEXT_SUFFIX) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 36/48] [sysvinit] Added comments for busybox builtins used.
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/sysvinit.in | 24 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/rules/sysvinit.in b/rules/sysvinit.in index 60fed6c..630ebb9 100644 --- a/rules/sysvinit.in +++ b/rules/sysvinit.in @@ -6,12 +6,20 @@ menuconfig SYSVINIT if SYSVINIT +if BUSYBOX_INIT + comment BusyBox' init is selected +endif + config SYSVINIT_INIT bool prompt init help Install the init program, this init support runlevel +if BUSYBOX_HALT + comment BusyBox' halt is selected +endif + config SYSVINIT_HALT bool prompt halt @@ -24,12 +32,20 @@ config SYSVINIT_SHUTDOWN help shutdown is called by halt and reboot to perform the necesary action +if BUSYBOX_RUNLEVEL + comment BusyBox' runlevel is selected +endif + config SYSVINIT_RUNLEVEL bool prompt runlevel help This tool is used to switch to another runlevel. +if BUSYBOX_KILLALL5 + comment BusyBox' killall5 is selected +endif + config SYSVINIT_KILLALL5 bool prompt killall5 @@ -40,6 +56,10 @@ config SYSVINIT_KILLALL5 Its primary (only) use is in the rc scripts found in the /etc/init.d directory. +if BUSYBOX_SULOGIN + comment BusyBox' sulogin is selected +endif + config SYSVINIT_SULOGIN bool prompt sulogin @@ -65,6 +85,10 @@ config SYSVINIT_LAST help last - show listing of last logged in users +if BUSYBOX_MESG + comment BusyBox' mesg is selected +endif + config SYSVINIT_MESG bool prompt mesg -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 32/48] [mc] Add color highlighting support for Midnight Commander
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- patches/mc-4.6.1/mc-install-fixes.patch | 51 + patches/mc-4.6.1/series |1 + rules/mc.in |7 ++ rules/mc.make | 119 ++- 4 files changed, 175 insertions(+), 3 deletions(-) create mode 100644 patches/mc-4.6.1/mc-install-fixes.patch create mode 100644 patches/mc-4.6.1/series diff --git a/patches/mc-4.6.1/mc-install-fixes.patch b/patches/mc-4.6.1/mc-install-fixes.patch new file mode 100644 index 000..d3adcab --- /dev/null +++ b/patches/mc-4.6.1/mc-install-fixes.patch @@ -0,0 +1,51 @@ +[patch] Disable document creation + +The build system uses some tool with relative path prefix. So it breaks +the build when installing into a different destdir. + +Not for upstream. ptxdist build fix +--- + Makefile.am |2 +- + configure.ac |9 - + 2 files changed, 1 insertion(+), 10 deletions(-) + +Index: Makefile.am +=== +--- Makefile.am.orig 2005-05-31 05:24:26.0 +0200 Makefile.am2009-03-19 12:22:44.0 +0100 +@@ -2,7 +2,7 @@ + + AUTOMAKE_OPTIONS = 1.5 + +-SUBDIRS = intl po m4 vfs slang edit src lib doc syntax ++SUBDIRS = intl po m4 vfs slang edit src lib syntax + + EXTRA_DIST = FAQ HACKING INSTALL.FAST MAINTAINERS README.QNX TODO + +Index: configure.ac +=== +--- configure.ac.orig 2005-07-23 18:52:49.0 +0200 configure.ac 2009-03-19 12:23:16.0 +0100 +@@ -598,7 +598,6 @@ + mc.qpg + pkginfo + prototype +-doc/Makefile + vfs/Makefile + vfs/extfs/Makefile + lib/Makefile +@@ -629,14 +628,6 @@ + vfs/extfs/uzip + vfs/extfs/uzoo + +-doc/mc.1 doc/mcedit.1 doc/mcview.1 doc/mcserv.8 +-doc/es/mc.1 doc/es/Makefile +-doc/hu/mc.1 doc/hu/Makefile +-doc/it/mc.1 doc/it/Makefile +-doc/pl/mc.1 doc/pl/Makefile +-doc/ru/mc.1 doc/ru/Makefile +-doc/sr/mc.1 doc/sr/mcserv.8 doc/sr/Makefile +- + intl/Makefile + po/Makefile.in + ]) diff --git a/patches/mc-4.6.1/series b/patches/mc-4.6.1/series new file mode 100644 index 000..b3c3e84 --- /dev/null +++ b/patches/mc-4.6.1/series @@ -0,0 +1 @@ +mc-install-fixes.patch -p0 diff --git a/rules/mc.in b/rules/mc.in index bbf024d..724c867 100644 --- a/rules/mc.in +++ b/rules/mc.in @@ -34,3 +34,10 @@ config MC_USES_SLANG Build midnight commander with slang endchoice + +config MC_USES_SYNTAX_HIGHLIGHTING + bool Use syntax highlighting + help + Copy syntax higlighting files + + diff --git a/rules/mc.make b/rules/mc.make index af38f41..7ccdee8 100644 --- a/rules/mc.make +++ b/rules/mc.make @@ -46,6 +46,9 @@ MC_ENV:= $(CROSS_ENV) # MC_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ + --with-charset=yes \ + --with-vfs=yes \ + --with-edit=yes \ --with-x=no \ --without-gpm-mouse \ --disable-rpath @@ -58,12 +61,33 @@ ifdef PTXCONF_MC_USES_SLANG MC_AUTOCONF += --with-screen=slang endif +$(STATEDIR)/mc.prepare: + @$(call targetinfo) + @$(call clean, $(MC_DIR)/config.cache) + cd $(MC_DIR) \ + $(MC_PATH) $(MC_ENV) \ + autoreconf + cd $(MC_DIR) \ + $(MC_PATH) $(MC_ENV) \ + ./configure $(MC_AUTOCONF) + @$(call touch) + +# +# Compile +# + +$(STATEDIR)/mc.compile: + @$(call targetinfo) + cd $(MC_DIR) $(MC_PATH) $(MC_ENV) make $(PARALLELMFLAGS) + @$(call touch) + # # Install # $(STATEDIR)/mc.install: @$(call targetinfo) + @$(call install, MC) @$(call touch) # @@ -78,12 +102,101 @@ $(STATEDIR)/mc.targetinstall: @$(call install_fixup,mc,PRIORITY,optional) @$(call install_fixup,mc,VERSION,$(MC_VERSION)) @$(call install_fixup,mc,SECTION,base) - @$(call install_fixup,mc,AUTHOR,Robert Schwebel r.schwe...@pengutronix.de) + @$(call install_fixup,mc,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) @$(call install_fixup,mc,DEPENDS,) @$(call install_fixup,mc,DESCRIPTION,missing) - @$(call install_copy, mc, 0, 0, 0755, $(MC_DIR)/src/mc, \ - /usr/bin/mc) + @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/bin/mc-wrapper.csh) + @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/bin/mc-wrapper.sh) + @$(call install_copy, mc, 0, 0, 0755, -, /usr/share/mc/bin/mc.csh) + @$(call install_copy, mc, 0, 0,
[ptxdist] [PATCH 38/48] [iptables] Added clear DF flag modul for 1.4.5
From: Carsten Schlote c.schl...@konzeptpark.de
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
.../iptables-1.4.5/iptables-1.4.3.DF-patch.diff| 141
patches/iptables-1.4.5/series |1 +
2 files changed, 142 insertions(+), 0 deletions(-)
create mode 100644 patches/iptables-1.4.5/iptables-1.4.3.DF-patch.diff
create mode 100644 patches/iptables-1.4.5/series
diff --git a/patches/iptables-1.4.5/iptables-1.4.3.DF-patch.diff
b/patches/iptables-1.4.5/iptables-1.4.3.DF-patch.diff
new file mode 100644
index 000..b4feb53
--- /dev/null
+++ b/patches/iptables-1.4.5/iptables-1.4.3.DF-patch.diff
@@ -0,0 +1,141 @@
+[iptables-1.4.3] Add ipt_DF module userland module
+
+This patch adds support for libipt_DF module to iptables 1.4.3.
+
+Requires matching kernel patch and module as well!
+
+FIXME: Create kernel-module ptxdist paket for the ipt_DF module instead
+ of patching kernel
+
+Signed-off-by: Carsten Schlote (schl...@vahanus.net)
+---
+ extensions/Makefile |2
+ extensions/libipt_DF.c| 101
++
+ include/linux/netfilter_ipv4/ipt_DF.h | 14
+ 2 files changed, 115 insertions(+)
+
+Index: iptables-1.4.2/extensions/libipt_DF.c
+===
+--- /dev/null 1970-01-01 00:00:00.0 +
iptables-1.4.2/extensions/libipt_DF.c 2009-01-15 21:12:19.0
+0100
+@@ -0,0 +1,101 @@
++/* Shared library add-on to iptables for the DF target
++ * (C) 2002 by Dmitry Labutcky a...@strace.net
++ *
++ * $Id: libipt_DF.c,v 1.6 2002/05/29 13:08:16 laforge Exp $
++ *
++ * This program is distributed under the terms of GNU GPL
++ */
++#include stdio.h
++#include string.h
++#include stdlib.h
++#include getopt.h
++#include iptables.h
++
++#include linux/netfilter_ipv4/ip_tables.h
++#include linux/netfilter_ipv4/ipt_DF.h
++
++static void help(void)
++{
++
++ printf(
++DF target options\n
++ --clear Clear DF flag\n);
++}
++
++
++static struct option opts[] = {
++{ clear, 0, 0, '%' },
++ { .name = NULL }
++};
++
++static int parse(int c, char **argv, int invert, unsigned int *flags,
++ const void *e, struct xt_entry_target **target)
++{
++ /*const struct ipt_entry *entry = e;*/
++ struct ipt_DF_info *info = (void*)(*target)-data;
++
++ switch (c) {
++ case '%':
++ if (invert)
++ exit_error(PARAMETER_PROBLEM, DF: unexpected
`!' with --clear);
++ if (*flags IPT_DF_CLEAR)
++ exit_error(PARAMETER_PROBLEM, DF: Can't
specify --clear twice);
++ info-mode = IPT_DF_CLEAR;
++ *flags |= IPT_DF_CLEAR;
++ break;
++ default:
++ return 0;
++
++ }
++ return 1;
++}
++
++static void final_check(unsigned int flags)
++{
++ if (!flags)
++ exit_error(PARAMETER_PROBLEM,
++ DF target: Parameter --clear is required);
++}
++
++static void print(const void *ip,
++ const struct xt_entry_target *target, int numeric)
++{
++ const struct ipt_DF_info *info = (void *)target-data;
++
++ printf(DF );
++ switch (info-mode) {
++ case IPT_DF_CLEAR:
++ printf(clear df );
++ break;
++ }
++}
++
++static void save(const void *ip, const struct xt_entry_target *target)
++{
++ const struct ipt_DF_info *info = (void *)target-data;
++
++ switch (info-mode) {
++ case IPT_DF_CLEAR:
++ printf(--clear );
++ break;
++ }
++}
++
++static struct xtables_target DF = {
++ .name = DF,
++ .version= XTABLES_VERSION,
++ .family = PF_INET,
++ .size = XT_ALIGN(sizeof(struct ipt_DF_info)),
++ .userspacesize = XT_ALIGN(sizeof(struct ipt_DF_info)),
++ .help = help,
++ .parse = parse,
++ .final_check= final_check,
++ .print = print,
++ .save = save,
++ .extra_opts = opts,
++};
++
++void _init(void)
++{
++ xtables_register_target(DF);
++}
+Index: iptables-1.4.2/include/linux/netfilter_ipv4/ipt_DF.h
+===
+--- /dev/null 1970-01-01 00:00:00.0 +
iptables-1.4.2/include/linux/netfilter_ipv4/ipt_DF.h 2009-01-15
21:06:00.0 +0100
+@@ -0,0 +1,14 @@
++#ifndef _IPT_DF_H
++#define _IPT_DF_H
++
++enum {
++ IPT_DF_CLEAR = 1
++};
++
++struct ipt_DF_info {
++ u_int8_tmode;
++};
++
++
++#endif
++
diff --git a/patches/iptables-1.4.5/series b/patches/iptables-1.4.5/series
new file mode 100644
index
[ptxdist] [PATCH 47/48] Added missing execute flags
From: Carsten Schlote c.schl...@konzeptpark.de While rebuilding the patchstack, the flags got lost, causing the autogen.sh scripts no longer executed. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 = 100755 generic/lib/init/initmethod-upstart-functions.sh mode change 100644 = 100755 patches/libnih-1.0.0/autogen.sh mode change 100644 = 100755 patches/miredo-1.2.2/autogen.sh mode change 100644 = 100755 patches/mountall-1.1/autogen.sh mode change 100644 = 100755 patches/udev-147/autogen.sh mode change 100644 = 100755 patches/upstart-0.6.3/autogen.sh diff --git a/generic/lib/init/initmethod-upstart-functions.sh b/generic/lib/init/initmethod-upstart-functions.sh old mode 100644 new mode 100755 diff --git a/patches/libnih-1.0.0/autogen.sh b/patches/libnih-1.0.0/autogen.sh old mode 100644 new mode 100755 diff --git a/patches/miredo-1.2.2/autogen.sh b/patches/miredo-1.2.2/autogen.sh old mode 100644 new mode 100755 diff --git a/patches/mountall-1.1/autogen.sh b/patches/mountall-1.1/autogen.sh old mode 100644 new mode 100755 diff --git a/patches/udev-147/autogen.sh b/patches/udev-147/autogen.sh old mode 100644 new mode 100755 diff --git a/patches/upstart-0.6.3/autogen.sh b/patches/upstart-0.6.3/autogen.sh old mode 100644 new mode 100755 -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 41/48] [host-gettext] Removed duplicate source rule
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-gettext.make |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/host-gettext.make b/rules/host-gettext.make index 339fba3..6b3812e 100644 --- a/rules/host-gettext.make +++ b/rules/host-gettext.make @@ -32,9 +32,9 @@ endif # Get # -$(HOST_GETTEXT_SOURCE): - @$(call targetinfo) - @$(call get, HOST_GETTEXT) +#$(HOST_GETTEXT_SOURCE): +# @$(call targetinfo) +# @$(call get, HOST_GETTEXT) # # Prepare -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 44/48] Added experimental install_auto
From: Carsten Schlote c.schl...@konzeptpark.de Just to remember me to do that... --- rules/post/install.make | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/rules/post/install.make b/rules/post/install.make index 4d01736..0508cc8 100644 --- a/rules/post/install.make +++ b/rules/post/install.make @@ -387,4 +387,14 @@ install_fixup = \ install_finish = \ $(call xpkg/finish, $(1)) +# +# install_auto +# +# Scans the contents of the packages/pkg/ directory created by $(install) macro and +# calls the macros above with appropriate arguments. Unwanted paths can be filtered +# (like /usr/man). +# +install_auto = \ + echo FIXME + # vim: syntax=make -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 31/48] [libsysfs] Added option to install systool
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/libsysfs.in | 15 ++- rules/libsysfs.make |4 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/rules/libsysfs.in b/rules/libsysfs.in index 501410d..399435d 100644 --- a/rules/libsysfs.in +++ b/rules/libsysfs.in @@ -1,6 +1,6 @@ ## SECTION=system_libraries -config LIBSYSFS +menuconfig LIBSYSFS tristate prompt libsysfs help @@ -8,3 +8,16 @@ config LIBSYSFS provides a tree of system devices. libsysfs provides a stable programming interface to sysfs and eases querying system devices and their attributes. + +if LIBSYSFS + +config LIBSYSFS_SYSTOOL + bool + prompt install sysfs systool + help + Enable this tio get the program 'systool' + to query sysfs entries: it can list devices + by bus, class, and topology. + +endif + diff --git a/rules/libsysfs.make b/rules/libsysfs.make index 123a304..f12eabc 100644 --- a/rules/libsysfs.make +++ b/rules/libsysfs.make @@ -64,6 +64,10 @@ $(STATEDIR)/libsysfs.targetinstall: @$(call install_link, libsysfs, libsysfs.so.2.0.1, /usr/lib/libsysfs.so.2) @$(call install_link, libsysfs, libsysfs.so.2.0.1, /usr/lib/libsysfs.so) +ifdef PTXCONF_LIBSYSFS_SYSTOOL + @$(call install_copy, libsysfs, 0, 0, 0775, -, /usr/bin/systool) +endif + @$(call install_finish, libsysfs) @$(call touch) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 42/48] Added .gitignore files for automatic files.
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/.gitignore |1 + scripts/.gitignore |3 +++ scripts/kconfig/.gitignore |7 +++ 3 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 rules/.gitignore create mode 100644 scripts/.gitignore create mode 100644 scripts/kconfig/.gitignore diff --git a/rules/.gitignore b/rules/.gitignore new file mode 100644 index 000..c45e8a2 --- /dev/null +++ b/rules/.gitignore @@ -0,0 +1 @@ +ptxdist-version.in diff --git a/scripts/.gitignore b/scripts/.gitignore new file mode 100644 index 000..f95e377 --- /dev/null +++ b/scripts/.gitignore @@ -0,0 +1,3 @@ +ptxdist_version.sh +lxdialog + diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore new file mode 100644 index 000..7a3f992 --- /dev/null +++ b/scripts/kconfig/.gitignore @@ -0,0 +1,7 @@ +*.o +lex.zconf.c +lkc_defs.h +mconf +zconf.tab.c +conf +lex.backup -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 43/48] Added getsvn macro
From: Carsten Schlote c.schl...@konzeptpark.de
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
rules/pre/Rules.make | 34 ++
scripts/lib/ptxd_make_get.sh |7 +++
2 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
index 51ed94e..9bfdfc4 100644
--- a/rules/pre/Rules.make
+++ b/rules/pre/Rules.make
@@ -13,6 +13,7 @@ GNU_BUILD := $(shell $(SCRIPTSDIR)/autoconf/config.guess)
GNU_HOST := $(shell echo $(GNU_BUILD) | sed s/-[a-zA-Z0-9_]*-/-host-/)
INSTALL:= install
+SVN:= svn
FAKEROOT := $(PTXDIST_SYSROOT_HOST)/bin/fakeroot -l
$(PTXDIST_SYSROOT_HOST)/lib/libfakeroot.so
CHECK_PIPE_STATUS := \
@@ -390,6 +391,39 @@ extract =
\
#
+# getsvn
+#
+# Export a SVN repository URL into a directory from a repository.
+#
+# $1: Packet label; we export $1_SOURCE
+# $2: dir to export into; if $2 is not given we extract to $(BUILDDIR)
+# $3: version to checkout; if $3 is not given we use HEAD
+#
+getsvn = \
+ PACKET=$($(strip $(1))_URL); \
+ PACKETDIR=$($(strip $(1))_DIR); \
+ URL=$($(strip $(1))_URL); \
+ DEST=$(strip $(2)); \
+ DEST=$${DEST:-$(BUILDDIR)}; \
+ REV=$(strip $(3));\
+ REV=$${REV:-HEAD};\
+ \
+ if [ $$URL = ]; then \
+ echo; \
+ echo Error: empty parameter to \getsvn\(\)\; \
+ echo; \
+ exit -1;\
+ fi; \
+ [ -d $$DEST ] || $(MKDIR) -p $$DEST;\
+ if [ $$PACKETDIR = ]; then \
+ PACKETDIR=$${DEST}; \
+ fi; \
+ \
+ echo checkout: repository=$$URL; \
+ echo checkout: dest=$$PACKETDIR; \
+ $(SVN) export -r $$REV $$URL $$PACKETDIR;
+
+#
# get
#
# Download a package from a given URL. This macro has some magic
diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
index 9a9f964..a571a79 100644
--- a/scripts/lib/ptxd_make_get.sh
+++ b/scripts/lib/ptxd_make_get.sh
@@ -50,6 +50,7 @@ ptxd_make_get_http() {
${url} {
chmod 644 -- ${temp_file}
mv -- ${temp_file} ${PTXDIST_SRCDIR}/${file}
+ touch ${PTXDIST_SRCDIR}/${file}
return
}
@@ -180,6 +181,12 @@ ptxd_make_get() {
ptxd_make_get_download_permitted
ptxd_make_get_http return
;;
+ http*.svn)
+ echo;
+ echo Virtual Subversion URL - skipping!;
+ echo URL: $$URL;
+ return
+ ;;
file*)
local thing=${url/file:\/\///}
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 48/48] [attr] Fixed series file typo
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de I had to change the .gz file to plain text to provide this patchstack and forgot to fix the series file. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de you probably want to squash this 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 42/48] Added .gitignore files for automatic files.
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/.gitignore |1 + scripts/.gitignore |3 +++ scripts/kconfig/.gitignore |7 +++ 3 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 rules/.gitignore create mode 100644 scripts/.gitignore create mode 100644 scripts/kconfig/.gitignore diff --git a/rules/.gitignore b/rules/.gitignore new file mode 100644 index 000..c45e8a2 --- /dev/null +++ b/rules/.gitignore @@ -0,0 +1 @@ +ptxdist-version.in diff --git a/scripts/.gitignore b/scripts/.gitignore new file mode 100644 index 000..f95e377 --- /dev/null +++ b/scripts/.gitignore @@ -0,0 +1,3 @@ +ptxdist_version.sh +lxdialog + diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore new file mode 100644 index 000..7a3f992 --- /dev/null +++ b/scripts/kconfig/.gitignore @@ -0,0 +1,7 @@ +*.o +lex.zconf.c +lkc_defs.h +mconf +zconf.tab.c +conf +lex.backup even without that patch I don't have untracked files in my ptxdist tree. seems to be obsolete. 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 37/48] [ppp] Added lzo compression support. Use internal pon/poff commands
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/ppp.in | 27 +-- rules/ppp.make | 18 +++--- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/rules/ppp.in b/rules/ppp.in index 827d500..60e15a0 100644 --- a/rules/ppp.in +++ b/rules/ppp.in @@ -7,6 +7,7 @@ menuconfig PPP select LIBC_DL select LIBC_RESOLV if PPP_PLUGINS select LIBC_CRYPT if PPP_NEEDS_CRYPT + select LIBLZO if PPP_USE_LZO select LIBPCAP if PPP_FILTER select LIBPCAP_IPV6 if PPP_FILTER PPP_IPV6 select OPENSSL if PPP_SRP @@ -32,6 +33,12 @@ config PPP_SUID Makes the pppd binary SUID for ruMakes the pppd binary SUID for Makes the pppd binary SUID for running as a server. +config PPP_USE_LZO + bool Use LZO library for compression + default n + help + FIXME: This item needs to be documented + config PPP_IPV6 bool prompt enable ipv6 support @@ -202,9 +209,25 @@ config PPP_INST_PPPSTATS intervals for a specified PPP interface. config PPP_INST_PONOFF - bool install pon/poff + bool Install pon, poff scripts + help + FIXME: This item needs to be documented + +config PPP_INST_PLOG + bool Install plog script + default n help - FIXME + FIXME: This item needs to be documented + +config PPP_PLUGIN_RP_PPPOE_DISCOVERY + bool Install pppoe-discovery + select PPP_PLUGINS + select PPP_OE + default n + help + FIXME: This item needs to be documented + +comment startup options config PPP_STARTSCRIPT bool diff --git a/rules/ppp.make b/rules/ppp.make index 5d2c384..0752575 100644 --- a/rules/ppp.make +++ b/rules/ppp.make @@ -3,6 +3,7 @@ # Copyright (C) 2003 by Marc Kleine-Budde kleine-bu...@gmx.de for # GYRO net GmbH i...@gyro-net.de, Hannover, Germany # 2008, 2009 by Juergen Beisert juer...@kreuzholzen.de +# 2008, 2009 by Carsten Schlote c.schl...@konzeptpark.de # # See CREDITS for details about who has contributed to this project. # @@ -53,10 +54,14 @@ PPP_MAKE_PAR := NO # PPP_SHARED_INST_PATH := /usr/lib/pppd/$(PPP_VERSION) +ifndef PTXCONF_PPP_USE_LZO +PPP_LZO := --disable-lzo +endif grep shows me no lzo support in ppp, maybe here's a missing a ppp patch + $(STATEDIR)/ppp.prepare: @$(call targetinfo) @cd $(PPP_DIR) $(PPP_PATH) $(PPP_ENV) \ - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc $(PPP_LZO) ifdef PTXCONF_PPP_IPV6 @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y) @@ -209,8 +214,15 @@ ifdef PTXCONF_PPP_INST_PPPSTATS endif ifdef PTXCONF_PPP_INST_PONOFF - @$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/pon) - @$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/poff) + @$(call install_copy, ppp, 0, 0, 0755, \ + $(PPP_DIR)/scripts/pon, /usr/sbin/pon, n) + @$(call install_copy, ppp, 0, 0, 0755, \ + $(PPP_DIR)/scripts/poff, /usr/sbin/poff, n) +endif we already copy pon, poff. With install_alternative you have even the possibility to use them from your BSP. + +ifdef PTXCONF_PPP_INST_PLOG + @$(call install_copy, ppp, 0, 0, 0755, \ + $(PPP_DIR)/scripts/plog, /usr/sbin/plog, n) endif ifdef PTXCONF_PPP_PLUGINS 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 34/48] [nfsutils] Added option to install mount.nfs
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de we already install mount.nfs, seems to be obsolete cheers, Marc Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/nfsutils.in |4 rules/nfsutils.make |5 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/rules/nfsutils.in b/rules/nfsutils.in index a653d22..f315797 100644 --- a/rules/nfsutils.in +++ b/rules/nfsutils.in @@ -107,6 +107,10 @@ config NFSUTILS_INSTALL_SHOWMOUNT bool prompt Install /sbin/showmount +config NFSUTILS_INSTALL_MOUNTNFS + bool + prompt Install /sbin/mount.nfs + config NFSUTILS_INSTALL_STATD bool prompt Install /sbin/statd diff --git a/rules/nfsutils.make b/rules/nfsutils.make index 9bcd68e..aaafd99 100644 --- a/rules/nfsutils.make +++ b/rules/nfsutils.make @@ -144,6 +144,11 @@ ifdef PTXCONF_NFSUTILS_INSTALL_SHOWMOUNT @$(call install_copy, nfsutils, 0, 0, 0755, -, /sbin/showmount) endif +ifdef PTXCONF_NFSUTILS_INSTALL_MOUNTNFS + @$(call install_copy, nfsutils, 0, 0, 0755, \ + -, /sbin/mount.nfs) +endif + ifdef PTXCONF_NFSUTILS_INSTALL_STATD @$(call install_copy, nfsutils, 0, 0, 0755, -, /sbin/rpc.statd) @$(call install_copy, nfsutils, 0, 0, 0755, -, /sbin/start-statd) -- 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 33/48] [mtd-utils] Some lzo compression fix, more config options
carsten.schl...@gmx.net wrote:
From: Carsten Schlote c.schl...@konzeptpark.de
Added lzo support for host-tools and dependancy. Added options
to install remaining mtd-utils for target.
please split into (at least) 3 patches
Small bugfix for lzo compression.
please send it upstream.
cheers, Marc
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 +
rules/host-mtd-utils.in | 21 +++-
rules/host-mtd-utils.make |5 +
rules/mtd-utils.in| 200
+
rules/mtd-utils.make | 123 +++-
6 files changed, 340 insertions(+), 71 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.c 2009-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
+
diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in
index 7c3b629..eeffe6b 100644
--- a/rules/host-mtd-utils.in
+++ b/rules/host-mtd-utils.in
@@ -1,7 +1,22 @@
-## SECTION=hosttools_noprompt
+## SECTION=hosttools
-config HOST_MTD_UTILS
+menuconfig HOST_MTD_UTILS
tristate
- select HOST_LIBLZO
+ prompt MTD utils
select HOST_ZLIB
select HOST_UTIL_LINUX_NG
+ select HOST_LIBLZO if HOST_MTD_UTILS_USE_LIBLZO
there's already unconditionally lzo support
+ help
+ Install complete set of mtd-utils as host tools.
+
+if HOST_MTD_UTILS
+
+config HOST_MTD_UTILS_USE_LIBLZO
+ bool
+ prompt Enable LZO support
+ default y if MTD_UTILS_USE_LIBLZO
+ help
+ Enable LZO support.
+
+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
#
diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
index cbccf36..940a168 100644
--- a/rules/mtd-utils.in
+++ b/rules/mtd-utils.in
@@ -7,6 +7,7 @@ menuconfig MTD_UTILS
select UTIL_LINUX_NG
select UTIL_LINUX_NG_LIBBLKID
select LIBLZO if MTD_UTILS_USE_LIBLZO
+ select HOST_MTD_UTILS
Re: [ptxdist] [PATCH 31/48] [libsysfs] Added option to install systool
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de applied, cheers, Marc --- rules/libsysfs.in | 15 ++- rules/libsysfs.make |4 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/rules/libsysfs.in b/rules/libsysfs.in index 501410d..399435d 100644 --- a/rules/libsysfs.in +++ b/rules/libsysfs.in @@ -1,6 +1,6 @@ ## SECTION=system_libraries -config LIBSYSFS +menuconfig LIBSYSFS tristate prompt libsysfs help @@ -8,3 +8,16 @@ config LIBSYSFS provides a tree of system devices. libsysfs provides a stable programming interface to sysfs and eases querying system devices and their attributes. + +if LIBSYSFS + +config LIBSYSFS_SYSTOOL + bool + prompt install sysfs systool + help + Enable this tio get the program 'systool' + to query sysfs entries: it can list devices + by bus, class, and topology. + +endif + diff --git a/rules/libsysfs.make b/rules/libsysfs.make index 123a304..f12eabc 100644 --- a/rules/libsysfs.make +++ b/rules/libsysfs.make @@ -64,6 +64,10 @@ $(STATEDIR)/libsysfs.targetinstall: @$(call install_link, libsysfs, libsysfs.so.2.0.1, /usr/lib/libsysfs.so.2) @$(call install_link, libsysfs, libsysfs.so.2.0.1, /usr/lib/libsysfs.so) +ifdef PTXCONF_LIBSYSFS_SYSTOOL + @$(call install_copy, libsysfs, 0, 0, 0775, -, /usr/bin/systool) +endif + @$(call install_finish, libsysfs) @$(call touch) -- 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.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/gettext.make |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/gettext.make b/rules/gettext.make index ec4e3d1..65b3d59 100644 --- 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 GETTEXT := gettext-$(GETTEXT_VERSION) GETTEXT_SUFFIX := tar.gz GETTEXT_URL := $(PTXCONF_SETUP_GNUMIRROR)/gettext/$(GETTEXT).$(GETTEXT_SUFFIX) 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 28/48] [procps] Added installation of alternative /etc/sysctl.conf
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de applied, tnx marc --- generic/etc/sysctl.conf |4 rules/procps.make |2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) create mode 100644 generic/etc/sysctl.conf diff --git a/generic/etc/sysctl.conf b/generic/etc/sysctl.conf new file mode 100644 index 000..b10c21d --- /dev/null +++ b/generic/etc/sysctl.conf @@ -0,0 +1,4 @@ +# +# /etc/sysctl.conf - Configuration file for setting system variables +# See sysctl.conf (5) for information. +# diff --git a/rules/procps.make b/rules/procps.make index 57f8fdb..403714b 100644 --- a/rules/procps.make +++ b/rules/procps.make @@ -90,6 +90,8 @@ endif ifdef PTXCONF_PROCPS_SYSCTL @$(call install_copy, procps, 0, 0, 0755, -, \ /sbin/sysctl) + + @$(call install_alternative, procps, 0, 0, 0644, /etc/sysctl.conf, n) endif ifdef PTXCONF_PROCPS_PS @$(call install_copy, procps, 0, 0, 0755, -, \ -- 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 25/48] [openvpn] Added OpenVPN 2.0.9
carsten.schl...@gmx.net 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 | 23 ++ rules/openvpn.make | 123 2 files changed, 146 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..73785b2 --- /dev/null +++ b/rules/openvpn.in @@ -0,0 +1,23 @@ +## SECTION=networking +menuconfig OPENVPN + tristate + default n default n is default, please remove + prompt OpenVPN + select OPENSSL + select LIBLZO if OPENVPN_LZO +help + This adds OpenSwan to your root filesystem. Plain vanilla + packet. + +if OPENVPN + +config OPENVPN_LZO + bool + default n default n is default, please remove + 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..754657e --- /dev/null +++ b/rules/openvpn.make @@ -0,0 +1,123 @@ +# -*-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) + +# +# Extract +# + +$(STATEDIR)/openvpn.extract: + @$(call targetinfo) + @$(call clean, $(OPENVPN_DIR)) + @$(call extract, OPENVPN) + @$(call patchin, OPENVPN) + @$(call touch) please remove that rule + +# +# Prepare +# + +OPENVPN_PATH := PATH=$(CROSS_PATH) +OPENVPN_ENV := $(CROSS_ENV) + +# +# autoconf +# +OPENVPN_AUTOCONF := $(CROSS_AUTOCONF_USR) + +ifndef PTXCONF_OPENVPN_LZO +OPENVPN_LZO := --disable-lzo +endif add an corresponding enable line, please + +$(STATEDIR)/openvpn.prepare: + @$(call targetinfo, $@) + @$(call clean, $(OPENVPN_DIR)/config.cache) + cd $(OPENVPN_DIR) \ + $(OPENVPN_PATH) $(OPENVPN_ENV) \ + ./configure $(OPENVPN_AUTOCONF) $(OPENVPN_LZO) + @$(call touch, $@) please remove that rule + +# +# Compile +# + +$(STATEDIR)/openvpn.compile: + @$(call targetinfo) + cd $(OPENVPN_DIR) $(OPENVPN_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch) please remove that rule + +# +# Install +# + +$(STATEDIR)/openvpn.install: + @$(call targetinfo) + @$(call install, OPENVPN) + @$(call touch) please remove that rule + +# +# 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,
Re: [ptxdist] [PATCH 24/48] [miredo] Added miredo 1.2.2
carsten.schl...@gmx.net wrote:
From: Carsten Schlote c.schl...@konzeptpark.de
This packet provides IPV6 networking with the
tereodo protocol.
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 | 16 +++
patches/miredo-1.2.2/mireo-autogen.sh.patch | 81 +++
patches/miredo-1.2.2/series |1 +
rules/miredo.in | 16 +++
rules/miredo.make | 144
+++
9 files changed, 474 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 100644 patches/miredo-1.2.2/autogen.sh
create mode 100644 patches/miredo-1.2.2/mireo-autogen.sh.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
Re: [ptxdist] [PATCH 14/48] [attr] Added packet for libattr.so and tools.
carsten.schl...@gmx.net wrote:
From: Carsten Schlote c.schl...@konzeptpark.de
This target build is required for other target tools or
for included acl control functions.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
patches/attr-2.4.44/attr_2.4.44-1.diff | 122 +
patches/attr-2.4.44/fix-buildsystem.diff | 210
+++---
patches/attr-2.4.44/series |5 +-
what's wrong with the existing patches?
rules/attr.in|6 +
rules/attr.make | 26 -
please split new patches and make, in file modifications into seperate
patches
5 files changed, 347 insertions(+), 22 deletions(-)
create mode 100644 patches/attr-2.4.44/attr_2.4.44-1.diff
diff --git a/patches/attr-2.4.44/attr_2.4.44-1.diff
b/patches/attr-2.4.44/attr_2.4.44-1.diff
new file mode 100644
index 000..982ca47
--- /dev/null
+++ b/patches/attr-2.4.44/attr_2.4.44-1.diff
@@ -0,0 +1,122 @@
+--- attr-2.4.44.orig/Makefile
attr-2.4.44/Makefile
+@@ -75,7 +75,6 @@
+ --bindir=/usr/bin \
+ --libdir=/lib \
+ --libexecdir=/usr/lib \
+---enable-lib64=yes \
+ --includedir=/usr/include \
+ --mandir=/usr/share/man \
+ --datadir=/usr/share \
+--- attr-2.4.44.orig/debian/control
attr-2.4.44/debian/control
+@@ -3,9 +3,11 @@
+ Priority: optional
+ Maintainer: Nathan Scott nath...@debian.org
+ Uploaders: Niv Sardi xa...@debian.org, Anibal Monsalve Salazar
ani...@debian.org
+-Build-Depends: autoconf, debhelper (= 5), gettext, libtool
+-Standards-Version: 3.8.0
+-Homepage: http://oss.sgi.com/projects/xfs/
++Build-Depends: autoconf, automake, debhelper (= 7), gettext, libtool
++Standards-Version: 3.8.3
++Homepage: http://savannah.nongnu.org/projects/attr/
++Vcs-Git: git://git.savannah.nongnu.org/attr.git
++Vcs-Browser: http://git.savannah.gnu.org/cgit/attr.git
+
+ Package: attr
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+--- attr-2.4.44.orig/debian/compat
attr-2.4.44/debian/compat
+@@ -1 +1 @@
+-5
++7
+--- attr-2.4.44.orig/debian/watch
attr-2.4.44/debian/watch
+@@ -1,2 +1,2 @@
+ version=3
+-ftp://oss.sgi.com/projects/xfs/cmd_tars/ attr_([\d]+[\d\.]*)-[\d].tar.gz
++http://download.savannah.gnu.org/releases-noredirect/attr/
attr-([\d]+[\d\.]*).src.tar.gz
+--- attr-2.4.44.orig/debian/rules
attr-2.4.44/debian/rules
+@@ -1,5 +1,7 @@
+ #!/usr/bin/make -f
+
++export DH_VERBOSE=1
++
+ package = attr
+ develop = lib$(package)1-dev
+ library = lib$(package)1
+@@ -50,8 +52,14 @@
+ $(pkglib) $(MAKE) -C . install-lib
+ $(pkgme) $(MAKE) -C build src-manifest
+
++sed s/^libdir='\/lib'$$/libdir='\/usr\/lib'/
$(dirdev)/usr/lib/libattr.la $(dirdev)/usr/lib/libattr.la.new
++mv $(dirdev)/usr/lib/libattr.la.new $(dirdev)/usr/lib/libattr.la
++
+ -rm -rf $(dirdev)/usr/share/doc/attr
+ -rm -rf $(dirlib)/usr/share/doc/attr
++-rm -rf $(dirlib)/usr/share/locale
++-rm -rf $(dirlib)/usr/share/man
++-rm -rf $(dirlib)/usr/bin
+
+ dh_installdocs
+ dh_installchangelogs
+--- attr-2.4.44.orig/debian/copyright
attr-2.4.44/debian/copyright
+@@ -1,7 +1,7 @@
+ This package was debianized by Nathan Scott nath...@debian.org on
+ Sun, 19 Nov 2000 07:37:09 -0500.
+
+-It can be downloaded from ftp://oss.sgi.com/projects/xfs/download/
++It can be downloaded from
http://download.savannah.gnu.org/releases-noredirect/attr/
+
+ Copyright:
+
+@@ -16,4 +16,4 @@
+ Certain components (as annotated in the source) are licensed
+ under version 2 of the terms of the GNU General Public License.
+ On Debian systems, the complete text of the GNU General Public
+-License can be found in /usr/share/common-licenses/GPL file.
++License can be found in /usr/share/common-licenses/GPL-2 file.
+--- attr-2.4.44.orig/debian/changelog
attr-2.4.44/debian/changelog
+@@ -1,3 +1,39 @@
++attr (1:2.4.44-1) unstable; urgency=low
++
++ * New upstream release
++ * Fix out-of-date-standards-version
++ * Fix copyright-refers-to-versionless-license-file
++ * Update homepage in debian/control
++ * Add Vcs-Git and Vcs-Browser to debian/control
++ * Update download page in debian/copyright
++ * Update debian/watch
++ * Add automake as a build-dependency
++
++ -- Anibal Monsalve Salazar ani...@debian.org Tue, 25 Aug 2009 11:23:53
+1000
++
++attr (1:2.4.43-3) unstable; urgency=low
++
++ [ Cyril Brulebois ]
++ * Backport the following fix by Petr Salinger from upstream to fix
++FTBFS on GNU/kFreeBSD (Closes: #531950): [git commit b4636a4e9e]
++On Linux, ENOATTR aliases to ENODATA. On other operating systems
++like Irix and BSD*, ENOATTR is a separate error number. Therefore,
++protect the check on “err == ENODATA” with “#ifdef __linux__” in
++strerror_ea() in both getfattr/getfattr.c and
Re: [ptxdist] [PATCH 13/48] [acl] Added packet for libacl.so and tools.
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de This target build is required for other target tools or for included acl control functions. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- patches/acl-2.2.48/fix-crosscompile.patch | 228 + patches/acl-2.2.48/series |1 + rules/acl.in | 24 +++ rules/acl.make| 149 +++ 4 files changed, 402 insertions(+), 0 deletions(-) create mode 100644 patches/acl-2.2.48/fix-crosscompile.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/fix-crosscompile.patch b/patches/acl-2.2.48/fix-crosscompile.patch new file mode 100644 index 000..c7bfd0c --- /dev/null +++ b/patches/acl-2.2.48/fix-crosscompile.patch @@ -0,0 +1,228 @@ please add a canonical patch header +--- + 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 +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
Re: [ptxdist] [PATCH 28/48] [procps] Added installation of alternative /etc/sysctl.conf
Ladislav Michl wrote: On Thu, Jan 07, 2010 at 09:28:07PM +0100, Marc Kleine-Budde wrote: carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de applied, tnx As newer kernels emulates binary interface we probably do not want to support obsolete interfaces, right? http://lwn.net/Articles/361001/ Kernel help says: | CONFIG_SYSCTL_SYSCALL: | | | | sys_sysctl uses binary paths that have been found challenging | | to properly maintain and use. The interface in /proc/sys | | using paths with ascii names is now the primary path to this | | information. | | | | Almost nothing using the binary sysctl interface so if you are | | trying to save some space it is probably safe to disable this, | | making your kernel marginally smaller. ... and your system will get even smaller without sysctl binary. Btw, 'sysctl' branch was merged 24 Dec 2009. Some people can really enjoy Christmas ;-) luckily, I haven't pushed that commit not yet. :) However it's probably interesting for olther kernels than the latest -rc :) Carsten can you please add a notice to PTXCONF_PROCPS_SYSCTL's helptext stating that this is a deprecated interface. 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 28/48] [procps] Added installation of alternative /etc/sysctl.conf
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. -- Carsten Schlote carsten.schl...@gmx.net signature.asc Description: Dies ist ein digital signierter Nachrichtenteil -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 26/48] Fix issue with Ubuntu 'sh' and .postinst
Am Donnerstag, den 07.01.2010, 21:28 +0100 schrieb Marc Kleine-Budde: but I don't have :P Hi Marc Thanks for the late evening review :-) The patch stack currently represents nearly most of my changes to ptxdist. So every piece we can get into mainline, we shrink this damn monster patch-stack :-) For the Ubuntu problem: For some reason the postinst script doesn't work. The inet.conf script wasn't updated in platfrom/root. Unless I changed the bang line to /bin/bash for all postinst. As we use bash for our firmware, the change caused no problems with the target and fixes the problem. I can check that again. Maybe there is some other solution possible. Maybe the problem is already gone. -- Carsten Schlote carsten.schl...@gmx.net signature.asc Description: Dies ist ein digital signierter Nachrichtenteil -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 12/48] [host-libudev] Added packets for host libudev.so and headers
Am Donnerstag, den 07.01.2010, 21:47 +0100 schrieb Marc Kleine-Budde: carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools. See follow up patches. the description could be a bit more specific here, please All these host-lib#? patches are required to build 'nih-dbus-tool', upstart 0.6.3, udev-147, mountall-1.1 and dbus. Together with the 'initmethod' patches they provide an init system as found on Ubuntu 9.10. mountall-1.1 was taken from Ubuntu 10.04 (beta). mountall is compiling, but not yet working correctly and replaced with some simpler method in /etc/init/mountall.conf for now. The nih-dbus-tool is required by some of the tools above to build some dbus interfaces. So I started with the changes for a host libnih build and the host tool. Unfortunately this tool requires a lot of other host libraries and version updates (e.g. gettext 0.17, udev-147, dbus x.y), ... and any problem fixed caused two new ones. I already disabled some fancy features and libraries to avoid even more changes and more host and target builds. Right now, all the host-builds in the patch-stack should be properly selected by the config system as needed. So please pull and cherry-pick all patches, which should be ok for mainline. -- Carsten Schlote carsten.schl...@gmx.net signature.asc Description: Dies ist ein digital signierter Nachrichtenteil -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ptxdist on OS X?
Hi Marc, A day later the download existed. But the -m32 still yields to that ABI issue. Hence I compiled everything with -m64 successfully again. Markus Am 06.01.2010 um 22:12 schrieb Markus Heidt: Hi Marc, I downloaded your last OSELAS snapshot, changed the flag to -m32, ptxdist clean and go: -- target: mpfr-2.3.2.tar.bz2 -- --2010-01-06 22:07:15-- http://www.mpfr.org/mpfr-2.3.2/mpfr-2.3.2.tar.bz2 Resolving www.mpfr.org (www.mpfr.org)... 152.81.144.6 Connecting to www.mpfr.org (www.mpfr.org)|152.81.144.6|:80... connected. HTTP request sent, awaiting response... 403 Forbidden 2010-01-06 22:07:15 ERROR 403: Forbidden. --2010-01-06 22:07:15-- http://www.pengutronix.de/software/ptxdist/temporary-src/mpfr-2.3.2.tar.bz2 Resolving www.pengutronix.de (www.pengutronix.de)... 81.169.182.154 Connecting to www.pengutronix.de (www.pengutronix.de)| 81.169.182.154|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2010-01-06 22:07:16 ERROR 404: Not Found. --2010-01-06 22:07:16-- http://cross-lfs.org/files/packages/svn/mpfr-2.3.2.tar.bz2 Resolving cross-lfs.org (cross-lfs.org)... 208.97.140.69 Connecting to cross-lfs.org (cross-lfs.org)|208.97.140.69|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2010-01-06 22:07:16 ERROR 404: Not Found. Could not download packet URL: http://www.mpfr.org/mpfr-2.3.2/mpfr-2.3.2.tar.bz2 http://cross-lfs.org/files/packages/svn/mpfr-2.3.2.tar.bz2 cheers, Markus Markus Heidt wrote: Thanks Stefan and Marc, The -m64 gcc option suggested by Marc worked as well: you can use -m32, too. But you have to rebuild your complete toolchain. I've found a bugzilla where this problem is discussed [1]. But's it's quite long. BTW: with 10.6 you'll run into a problem discussed here. My dev/osx [2] branch contains a patch, though. BTW: I managed to compile a powerpc toolchain on 10.6 but only on a case sensitive filesystem. cheers, Marc [1] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41180 [2] http://git.pengutronix.de/?p=mkl/OSELAS.Toolchain.git;a=shortlog;h=refs/heads/dev/osx -- 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 | -- ptxdist mailing list ptxdist@pengutronix.de -- ptxdist mailing list ptxdist@pengutronix.de -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 26/48] Fix issue with Ubuntu 'sh' and .postinst
* Marc Kleine-Budde m...@pengutronix.de [08.01.2010 00:10]: carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de The postinst scripts seem to have problem with ubuntu. As we have bash on our target, we can use bash here. but I don't have :P Marc Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/busybox.postinst |2 +- rules/cvs.postinst |2 +- rules/dnsmasq.postinst |2 +- rules/fam.postinst |2 +- rules/inetutils.postinst |2 +- rules/portmap.postinst |2 +- rules/pureftpd.postinst |2 +- rules/rsync.postinst |2 +- rules/urshd.postinst |2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rules/busybox.postinst b/rules/busybox.postinst index 6f56479..ff796a8 100644 --- a/rules/busybox.postinst +++ b/rules/busybox.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/cvs.postinst b/rules/cvs.postinst index 6f56479..ff796a8 100644 --- a/rules/cvs.postinst +++ b/rules/cvs.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/dnsmasq.postinst b/rules/dnsmasq.postinst index 6f56479..ff796a8 100644 --- a/rules/dnsmasq.postinst +++ b/rules/dnsmasq.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/fam.postinst b/rules/fam.postinst index 6f56479..ff796a8 100644 --- a/rules/fam.postinst +++ b/rules/fam.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/inetutils.postinst b/rules/inetutils.postinst index 6f56479..ff796a8 100644 --- a/rules/inetutils.postinst +++ b/rules/inetutils.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/portmap.postinst b/rules/portmap.postinst index 6f56479..ff796a8 100644 --- a/rules/portmap.postinst +++ b/rules/portmap.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/pureftpd.postinst b/rules/pureftpd.postinst index 6f56479..ff796a8 100644 --- a/rules/pureftpd.postinst +++ b/rules/pureftpd.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/rsync.postinst b/rules/rsync.postinst index 6f56479..ff796a8 100644 --- a/rules/rsync.postinst +++ b/rules/rsync.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] diff --git a/rules/urshd.postinst b/rules/urshd.postinst index 6f56479..ff796a8 100644 --- a/rules/urshd.postinst +++ b/rules/urshd.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate inetd.conf if [ -d $DESTDIR/etc/inetd.conf.d ] -- 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 | 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. Regards, Frederik -- ptxdist mailing list ptxdist@pengutronix.de - Geschäftsführung: Klaus Blankenagel Karl-Heinz Malzahn Sitz der Gesellschaft: Ense Amtsgericht: Arnsberg HRB 4452 Diese Nachricht ist als vertraulich einzustufen. Sollten Sie nicht der vorgesehene Empfänger sein, bitten wir Sie höflich um eine kurze Mitteilung und um die Löschung dieser Nachricht. Jede unbefugte Weiterleitung oder Fertigung einer Kopie ist unzulässig. Diese Nachricht dient lediglich dem Austausch von Informationen und entfaltet keine rechtliche Bindungswirkung. Aufgrund der leichten Manipulierbarkeit von E-Mails können wir keine Haftung für den Inhalt übernehmen. - management: Klaus Blankenagel Karl-Heinz Malzahn based in:Ense competent country court: Arnsberg HRB 4452 This message is confidential and may be privileged. If you are not the intended recipient, we kindly ask you to inform the sender and delete this message. Any authorised dissemination or copying hereof is prohibited. This message servers for information purposes only and shall not have any
