[ptxdist] [PATCH] zlib: Fix build on non-Linux hosts
The build system of zlib uses 'uname' to determine the operating system for which it compiles zlib. However, on non-Linux hosts, this leads to wrong results. Fixes Darwin (tested on Mac OS 10.7 Lion), doesn't break Linux (verified with current Arch Linux on x86_64). Signed-off-by: Bernhard Walle --- rules/zlib.make |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rules/zlib.make b/rules/zlib.make index 0d437e3..2013384 100644 --- a/rules/zlib.make +++ b/rules/zlib.make @@ -40,6 +40,7 @@ $(ZLIB_SOURCE): ZLIB_CONF_ENV := \ $(CROSS_ENV) \ + uname=Linux \ CROSS_PREFIX=$(PTXCONF_COMPILER_PREFIX) \ CFLAGS="$(CROSS_CPPFLAGS) -O2 -g" -- 1.7.7.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] i2c-tools: version bump (3.0.3 -> 3.1.0)
Signed-off-by: Bernhard Walle --- rules/i2c-tools.make |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/i2c-tools.make b/rules/i2c-tools.make index 6ee8582..a8d2d00 100644 --- a/rules/i2c-tools.make +++ b/rules/i2c-tools.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_I2C_TOOLS) += i2c-tools # # Paths and names # -I2C_TOOLS_VERSION := 3.0.3 -I2C_TOOLS_MD5 := 511376eed04455cdb277ef19c5f73bb4 +I2C_TOOLS_VERSION := 3.1.0 +I2C_TOOLS_MD5 := f15019e559e378c6e9d5d6299a00df21 I2C_TOOLS := i2c-tools-$(I2C_TOOLS_VERSION) I2C_TOOLS_SUFFIX := tar.bz2 I2C_TOOLS_URL := http://dl.lm-sensors.org/i2c-tools/releases/$(I2C_TOOLS).$(I2C_TOOLS_SUFFIX) -- 1.7.8.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Update host-cmake to 2.8.7
Signed-off-by: Bernhard Walle
---
...-only-look-for-Python-with-version-number.patch |0
patches/{cmake-2.8.6 => cmake-2.8.7}/series|0
rules/host-cmake.make |4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename patches/{cmake-2.8.6 =>
cmake-2.8.7}/0001-only-look-for-Python-with-version-number.patch (100%)
rename patches/{cmake-2.8.6 => cmake-2.8.7}/series (100%)
diff --git
a/patches/cmake-2.8.6/0001-only-look-for-Python-with-version-number.patch
b/patches/cmake-2.8.7/0001-only-look-for-Python-with-version-number.patch
similarity index 100%
rename from
patches/cmake-2.8.6/0001-only-look-for-Python-with-version-number.patch
rename to
patches/cmake-2.8.7/0001-only-look-for-Python-with-version-number.patch
diff --git a/patches/cmake-2.8.6/series b/patches/cmake-2.8.7/series
similarity index 100%
rename from patches/cmake-2.8.6/series
rename to patches/cmake-2.8.7/series
diff --git a/rules/host-cmake.make b/rules/host-cmake.make
index 03e560a..b3fb413 100644
--- a/rules/host-cmake.make
+++ b/rules/host-cmake.make
@@ -17,8 +17,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake
#
# Paths and names
#
-HOST_CMAKE_VERSION := 2.8.6
-HOST_CMAKE_MD5 := 2147da452fd9212bb9b4542a9eee9d5b
+HOST_CMAKE_VERSION := 2.8.7
+HOST_CMAKE_MD5 := e1b237aeaed880f65dec9c20602452f6
HOST_CMAKE := cmake-$(HOST_CMAKE_VERSION)
HOST_CMAKE_SUFFIX := tar.gz
HOST_CMAKE_URL :=
http://www.cmake.org/files/v2.8/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
--
1.7.8.1
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] strace: Version bump to 4.6
Signed-off-by: Bernhard Walle --- rules/strace.make |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/strace.make b/rules/strace.make index 3598c9c..2ac89e4 100644 --- a/rules/strace.make +++ b/rules/strace.make @@ -18,10 +18,10 @@ PACKAGES-$(PTXCONF_STRACE) += strace # # Paths and names # -STRACE_VERSION := 4.5.20 -STRACE_MD5 := 64dfe10d9db0c1e34030891695ffca4b +STRACE_VERSION := 4.6 +STRACE_MD5 := e537b2b1afeec70c0e6e27a0d0fd671e STRACE := strace-$(STRACE_VERSION) -STRACE_SUFFIX := tar.bz2 +STRACE_SUFFIX := tar.xz STRACE_URL := $(PTXCONF_SETUP_SFMIRROR)/strace/$(STRACE).$(STRACE_SUFFIX) STRACE_SOURCE := $(SRCDIR)/$(STRACE).$(STRACE_SUFFIX) STRACE_DIR := $(BUILDDIR)/$(STRACE) -- 1.7.8 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] alsa-lib: Allow installation of /etc/asound.conf
* Juergen Beisert [2011-11-08 15:29]: > bernh...@bwalle.de wrote: > > [...] > > diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make > > index 929ab4e..bfec83f 100644 > > --- a/rules/alsa-lib.make > > +++ b/rules/alsa-lib.make > > @@ -207,6 +207,12 @@ endif > > /usr/share/alsa/pcm/dsnoop.conf) > > endif > > > > +ifdef PTXCONF_ALSA_LIB_ASOUND_CONF > > + @$(call install_copy, alsa-lib, 0, 0, 0644, \ > > + $(PTXDIST_WORKSPACE)/projectroot/etc/asound.conf, \ > > + /etc/asound.conf) > > +endif > > + > > You should use the 'install_alternative' macro here. It's more flexible and > you also can store this special file in the platform instead of the BSP > project (as this file is more related to the platform than the BSP). Ah, yes, sorry. It's still from my first steps with ptxdist and after the latest ALSA update I had to adjust my copied alsa-lib.*, so I thought it's better to send it mainline. Unfortunately, I didn't take a closer look ... Updated patch will follow. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH RESEND 2/2] bash: Use host-bison
From: Bernhard Walle This commit contains also two small whitespace fixes. Signed-off-by: Bernhard Walle --- rules/bash.in |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/bash.in b/rules/bash.in index 7ef65a9..fd5a9a6 100644 --- a/rules/bash.in +++ b/rules/bash.in @@ -4,14 +4,15 @@ menuconfig BASH select LIBC_DL select GCCLIBS_GCC_S select NCURSES if BASH_CURSES + select HOST_BISON help The GNU Bourne Again SHell Bash is an sh-compatible command language interpreter that executes - commands read from the standard input or from a file. Bash also - incorporates useful features from the Korn and C shells (ksh and csh). + commands read from the standard input or from a file. Bash also + incorporates useful features from the Korn and C shells (ksh and csh). Bash is ultimately intended to be a conformant implementation of the - IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2). + IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2). Included in the bash package is the Programmable Completion Code, by Ian Macdonald. -- 1.7.7.2 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH RESEND 1/2] Add host-bison package
From: Bernhard Walle Since we have host-flex, it makes also sense to get independent of the bison installation of the host. Signed-off-by: Bernhard Walle --- rules/host-bison.in |8 rules/host-bison.make | 32 rules/pre/bison.make |5 + 3 files changed, 45 insertions(+), 0 deletions(-) create mode 100644 rules/host-bison.in create mode 100644 rules/host-bison.make create mode 100644 rules/pre/bison.make diff --git a/rules/host-bison.in b/rules/host-bison.in new file mode 100644 index 000..41bb930 --- /dev/null +++ b/rules/host-bison.in @@ -0,0 +1,8 @@ +## SECTION=hosttools_noprompt + +config HOST_BISON + tristate + help + The parser generator (replaces yacc). + +# vim: syntax=kconfig diff --git a/rules/host-bison.make b/rules/host-bison.make new file mode 100644 index 000..d62b0b4 --- /dev/null +++ b/rules/host-bison.make @@ -0,0 +1,32 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Bernhard Walle +# +# 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_BISON) += host-bison + +# +# Paths and names +# +HOST_BISON_VERSION := 2.5 +HOST_BISON_MD5 := 9dba20116b13fc61a0846b0058fbe004 +HOST_BISON := bison-$(HOST_BISON_VERSION) +HOST_BISON_SUFFIX := tar.bz2 +HOST_BISON_URL := http://ftp.gnu.org/gnu/bison/$(HOST_BISON).$(HOST_BISON_SUFFIX) +HOST_BISON_SOURCE := $(SRCDIR)/$(HOST_BISON).$(HOST_BISON_SUFFIX) +HOST_BISON_DIR := $(HOST_BUILDDIR)/$(HOST_BISON) + +# +# autoconf +# +HOST_BISON_CONF_TOOL := autoconf + +# vim: syntax=make diff --git a/rules/pre/bison.make b/rules/pre/bison.make new file mode 100644 index 000..cfbee38 --- /dev/null +++ b/rules/pre/bison.make @@ -0,0 +1,5 @@ +# -*-makefile-*- + +ifdef PTXCONF_HOST_BISON +export BISON_PKGDATADIR=$(PTXCONF_SYSROOT_HOST)/share/bison +endif -- 1.7.7.2 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] host-tz-database: Update tzdata to 2011n
Signed-off-by: Bernhard Walle --- rules/host-tz-database.make |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make index 180e2bd..453c120 100644 --- a/rules/host-tz-database.make +++ b/rules/host-tz-database.make @@ -31,8 +31,8 @@ TZCODE_SOURCE := $(SRCDIR)/$(TZCODE).$(TZCODE_SUFFIX) TZCODE_DIR := $(HOST_TZDATABASE_DIR) TZCODE_STRIP_LEVEL := 0 -TZDATA_VERSION := 2011i -TZDATA_MD5 := c7a86ec34f30f8d6aa77ef94902a3047 +TZDATA_VERSION := 2011n +TZDATA_MD5 := 20dbfb28efa008ddbf6dd34601ea40fa TZDATA := tzdata$(TZDATA_VERSION) TZDATA_SUFFIX := tar.gz TZDATA_URL := \ -- 1.7.7.2 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ptxdist options help
Hi, * Erwin Rol [2011-11-03 23:48]: > > could someone explain the idea behind the following ptxdist options ? > > Build Type (development) > [ ] use pre-built production release > [ ] built on top of another platform Don't know about that options, but I'm also interested in the second two options. Hopefully somebody of the ptxdist gurus (Michael? Jürgen?) can comment if that's correct and answer my remaining questions: > [ ] create dev packages This option creates (in addition to the ipk packages that can be installed on the target and that are used to create the target image) for each package a PKGNAME_$HASH_$ARCH-dev.tar.gz (in platform-$PLATFORM/packages) that contains everything the packages installs, not only the subset that is selected by the package.mk. Especially it contains header files for libraries that are not on the target. So some kind of $package.deb + $package-dev.deb. This package can be used in this step: > [ ] use dev packages If a development package is available, then ptxdist uses the contents of the development package to package the ipk package and to build the sysroot. It doesn't compile the package from source. This even works if the source isn't available. One remaining question: What exactly is the checksum? Is it honoured in the process when ptxdist checks if it uses the development package instead of building it from source? The ptxdist sources are a bit hard to read in that area ... at least for me. ;) Wouldn't it make sense to include the version number of the package in the file name? Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] sqlite: Update to 3.7.9
See http://www.sqlite.org/releaselog/3_7_9.html for a full changelog. Signed-off-by: Bernhard Walle --- rules/sqlite.make |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/sqlite.make b/rules/sqlite.make index a86e394..9491c4e 100644 --- a/rules/sqlite.make +++ b/rules/sqlite.make @@ -20,8 +20,8 @@ PACKAGES-$(PTXCONF_SQLITE) += sqlite # # Paths and names # -SQLITE_VERSION := 3070800 -SQLITE_MD5 := 6bfb46d73caaa1bbbcd2b52184b6c542 +SQLITE_VERSION := 3070900 +SQLITE_MD5 := dce303524736fe89a76b8ed29d566352 SQLITE_TYPE:= autoconf ifeq ($(SQLITE_TYPE),) SQLITE := sqlite-$(SQLITE_VERSION) -- 1.7.7.2 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Install a iconv libraries
* Robert Schwebel [2011-11-01 17:28]: > > On Tue, Nov 01, 2011 at 02:07:59AM +0100, Ludovic BOUE wrote: > > My program returns empty string from iconv function. > > I think iconv is not well tested (if at all) in ptxdist, so any help in > that area is welcome! Basically it works. I use it to convert utf-8 to iso8859-1 for a LCD display. The only special thing I did in ptxdist is to generate an utf-8 locale. My ptxdist project is at https://bitbucket.org/bwalle/ptxdist-vetero, and my adjusted locales.in and locales.make are at https://bitbucket.org/bwalle/ptxdist-vetero/src/54844be01185/rules. HTH a bit. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] ptxd_ipkg_rev_smaller: fix compare with empty micro
* Jon Ringle [2011-10-19 21:55]: > > > What do you think about the bash implementation found here: > http://lists.us.dell.com/pipermail/dkms-devel/2004-July/000142.html If it is correct and works, why not. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] ptxd_ipkg_rev_smaller: fix compare with empty micro
Am 19.10.2011 19:46, schrieb Robert Schwebel:
On Tue, Oct 18, 2011 at 04:42:46AM -0400, Jon Ringle wrote:
After more testing, I found that there were other situations where the version
comparison does not work well.
I ended up replacing the implementation of ptxd_ipkg_rev_smaller() with
something much simpler, albeit dependent on dpkg that seems to work well:
ptxd_ipkg_rev_smaller() {
dpkg --compare-versions $1 lt $2
}
Hmm, that makes us dependend on dpkg (and thus on Debian). PTXdist tries
hard to run on any distribution, so I'm not happy with this.
Maybe Perl would be okay?
http://www.emdebian.org/trac/browser/current/target/dpkg/trunk/scripts/Dpkg/Version.pm?rev=6998
Seems to be quite official, and the Dpkg::ErrorHandling and
Dpkg::Gettext could be easily removed.
Regards,
Bernhard
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libptxdist: explicitly use sed to run migrate_*
* Andreas Bießmann [2011-10-17 09:06]: > > >It's not really nice, but I think it's better than patching lots of > >tools. And having scripts as executable programs is IMO still better > >than having to call the interpreter manually (which is necessary with > >your $PTXDIST_SED approach. > > But how should we handle a script's sheebang? If we require the > scripts/migrate tools to be executable scripts we need to preprocess > the scripts to adopt the sheebang to e.g. $PTXDIST_BINDIR. I think > it is much more portable to have the shell scripts kall the > interpreter with the respective configuration, e.g. > $PTXDIST_BINDIR/sed -f scripts/migrate/migrate_platform. sed is the only exception I know that requires an argument. #!/usr/bin/env perl, #!/usr/bin/env python, #!/usr/bin/env ruby works. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libptxdist: explicitly use sed to run migrate_*
Hi, * Michael Olbrich [2011-10-14 16:04]: > Hmmm, I just had another idea: How about fixing the environment in ptxdist: > > mkdir / > ln -s @PYTHON@ /python > ln -s @SED@ /sed > [...] > export PATH=:$PATH > [...] > > just do this as early as possible in ptxdist and PATH will provide the > correct tools. Do you think that could work? That's what I'm doing in the Arch Linux ptxdist package [1]. Arch Linux has /usr/bin/python pointing to /usr/bin/python3 instead of python2. There's a configure flag for ptxdist and Python, but that doesn't work. I sent a patch [2], but even that patch doesn't fix everything (there's still some ipkg problem). Because I was too lazy I changed it that way (modifying PATH). I'm doing - 8< export PATH=$(dirname $(readlink -f "$0")):$PATH - >8 which inclues /usr/lib/ptxdist-2011.xx.y/bin into $PATH and that works. It's not really nice, but I think it's better than patching lots of tools. And having scripts as executable programs is IMO still better than having to call the interpreter manually (which is necessary with your $PTXDIST_SED approach. Regards, Bernhard [1] http://aur.archlinux.org/packages.php?ID=49649 [2] http://www.mail-archive.com/ptxdist@pengutronix.de/msg04264.html -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [ANNOUNCE] PTXdist 2011.10.1 released
Hi Michael, * Michael Olbrich [2011-10-10 14:53]: > > I've just released PTXdist 2011.10.1. Just one patch this time, but an > annoying issue, the Qt 4.7.4 md5sum changed. could you also provide a tarball at http://www.pengutronix.de/software/ptxdist/download/? Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/2] udev: Use ptxdist kernel headers
Am 20.09.11 05:37, schrieb Jon Ringle: >> >> diff --git a/rules/udev.make b/rules/udev.make >> index ac2f0d4..b57bd01 100644 >> --- a/rules/udev.make >> +++ b/rules/udev.make >> @@ -47,6 +47,11 @@ $(UDEV_SOURCE): >> >> # >> # autoconf >> + >> +UDEV_CONF_ENV := \ >> + $(CROSS_ENV) \ >> + CPPFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)" >> + > > This breaks udev for me. #include includes the wrong header > file: So why do you enable the option at all if your toolchain has up-to-date kernel headers? Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] Add host-bison package
From: Bernhard Walle Since we have host-flex, it makes also sense to get independent of the bison installation of the host. Signed-off-by: Bernhard Walle --- rules/host-bison.in |8 rules/host-bison.make | 32 rules/pre/bison.make |5 + 3 files changed, 45 insertions(+), 0 deletions(-) create mode 100644 rules/host-bison.in create mode 100644 rules/host-bison.make create mode 100644 rules/pre/bison.make diff --git a/rules/host-bison.in b/rules/host-bison.in new file mode 100644 index 000..41bb930 --- /dev/null +++ b/rules/host-bison.in @@ -0,0 +1,8 @@ +## SECTION=hosttools_noprompt + +config HOST_BISON + tristate + help + The parser generator (replaces yacc). + +# vim: syntax=kconfig diff --git a/rules/host-bison.make b/rules/host-bison.make new file mode 100644 index 000..d62b0b4 --- /dev/null +++ b/rules/host-bison.make @@ -0,0 +1,32 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Bernhard Walle +# +# 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_BISON) += host-bison + +# +# Paths and names +# +HOST_BISON_VERSION := 2.5 +HOST_BISON_MD5 := 9dba20116b13fc61a0846b0058fbe004 +HOST_BISON := bison-$(HOST_BISON_VERSION) +HOST_BISON_SUFFIX := tar.bz2 +HOST_BISON_URL := http://ftp.gnu.org/gnu/bison/$(HOST_BISON).$(HOST_BISON_SUFFIX) +HOST_BISON_SOURCE := $(SRCDIR)/$(HOST_BISON).$(HOST_BISON_SUFFIX) +HOST_BISON_DIR := $(HOST_BUILDDIR)/$(HOST_BISON) + +# +# autoconf +# +HOST_BISON_CONF_TOOL := autoconf + +# vim: syntax=make diff --git a/rules/pre/bison.make b/rules/pre/bison.make new file mode 100644 index 000..cfbee38 --- /dev/null +++ b/rules/pre/bison.make @@ -0,0 +1,5 @@ +# -*-makefile-*- + +ifdef PTXCONF_HOST_BISON +export BISON_PKGDATADIR=$(PTXCONF_SYSROOT_HOST)/share/bison +endif -- 1.7.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] bash: Use host-bison
From: Bernhard Walle This commit contains also two small whitespace fixes. Signed-off-by: Bernhard Walle --- rules/bash.in |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/bash.in b/rules/bash.in index 7ef65a9..fd5a9a6 100644 --- a/rules/bash.in +++ b/rules/bash.in @@ -4,14 +4,15 @@ menuconfig BASH select LIBC_DL select GCCLIBS_GCC_S select NCURSES if BASH_CURSES + select HOST_BISON help The GNU Bourne Again SHell Bash is an sh-compatible command language interpreter that executes - commands read from the standard input or from a file. Bash also - incorporates useful features from the Korn and C shells (ksh and csh). + commands read from the standard input or from a file. Bash also + incorporates useful features from the Korn and C shells (ksh and csh). Bash is ultimately intended to be a conformant implementation of the - IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2). + IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2). Included in the bash package is the Programmable Completion Code, by Ian Macdonald. -- 1.7.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/2] Add host-bison package
Hi, thanks for the review. I'll post the updated patch. Am 29.08.11 12:04, schrieb Michael Olbrich: >> --- /dev/null >> > +++ b/rules/pre/bison.make >> > @@ -0,0 +1,5 @@ >> > +# -*-makefile-*- >> > + >> > +ifdef PTXCONF_HOST_BISON >> > +export BISON_PKGDATADIR=$(PTXCONF_SYSROOT_HOST)/share/bison >> > +endif > What is this for? Without this, bison doesn't find its runtime files ($(PTXCONF_SYSROOT_HOST)/share/bison/m4sugar/m4sugar.m4). It uses PREFIX (DATADIR) which is /usr/share. I tried to set --prefix to $(PTXCONF_SYSROOT_HOST) and DESTDIR to '', but it didn't work. Don't remember the cause. Setting the environment variable was the easiest solution without patching the source code, but if you don't accept that, I can investigate the isse again and find a better solution. But give me some days as I'm quite busy... Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] bash: Use host-bison
Hi, if you install ptxdist from binary packages (what we're doing internally on our build hosts), bison is not necessarily available. Sure, it can be added as dependency, but it's not always needed (busybox sh doesn't need it, for example). Adding bison as host tool has the additional advantage that always the same version is used. In fact, the independence of the host is what I really like in ptxdist. But if you disagree, what's the reason for host-flex? The configure script also checks for flex. I think either host-flex and host-yacc or none of them. :-) Regards, Bernhard On Sun, 28 Aug 2011 17:16:01 +0200 Michael Olbrich wrote: > Any special reason why this is needed? ptxdists configure already requires > yacc/bison. I'm not certain if it's necessary (I think kconfig uses > pregenerated files), but as long as it's there I don't see the need for an > extra host tool. > > Michael > > On Thu, Aug 25, 2011 at 02:53:16PM +0200, bernh...@bwalle.de wrote: > > From: Bernhard Walle > > > > This commit contains also two small whitespace fixes. > > > > Signed-off-by: Bernhard Walle > > --- > > rules/bash.in |7 --- > > 1 files changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/rules/bash.in b/rules/bash.in > > index 7ef65a9..fd5a9a6 100644 > > --- a/rules/bash.in > > +++ b/rules/bash.in > > @@ -4,14 +4,15 @@ menuconfig BASH > > select LIBC_DL > > select GCCLIBS_GCC_S > > select NCURSES if BASH_CURSES > > + select HOST_BISON > > help > > The GNU Bourne Again SHell > > Bash is an sh-compatible command language interpreter that executes > > - commands read from the standard input or from a file. Bash also > > - incorporates useful features from the Korn and C shells (ksh and csh). > > + commands read from the standard input or from a file. Bash also > > + incorporates useful features from the Korn and C shells (ksh and csh). > > > > Bash is ultimately intended to be a conformant implementation of the > > - IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2). > > + IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2). > > > > Included in the bash package is the Programmable Completion Code, > > by Ian Macdonald. > > -- > > 1.7.6.1 > > > > > > -- > > ptxdist mailing list > > ptxdist@pengutronix.de > > > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | > > -- > ptxdist mailing list > ptxdist@pengutronix.de -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] udev: Use ptxdist kernel headers
Am 16.08.2011 15:56, schrieb Michael Olbrich: > On Mon, Aug 15, 2011 at 07:34:58PM +0200, bernh...@bwalle.de wrote: >> From: Bernhard Walle >> >> When a toolchain without kernel headers (such as the Lite version from >> Codesourcery) or with very old kernel header is used, udev doesn't build >> because videodev.h is missing. >> >> This patch adds the $(KERNEL_HEADERS_INCLUDE_DIR) to the include path of >> udev like it's done for busybox or barebox. >> >> Tested on ARM with kernel headers 2.6.36.4 (the version >> OSELAS.Toolchain() is currently using). > > You need to select KERNEL_HEADERS as well otherwise udev might be build > before the kernel headers are available. But how to express the fact that we don't want to force the kernel headers to be built. But if they are built, they should be built before udev. Does "select KERNEL_HEADERS if KERNEL_HEADERS" work? Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] OSELAS.Toolchain: fixup_ptxconfigs.sh
Hi, if I run ./fixup_ptxconfigs.sh, I get an error message in line 280 that "./p" doesn't exist. What is ./p? Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [oselas] [PATCH] Add i486 toolchain
Am 15.08.2011 12:31, schrieb Marc Kleine-Budde: > > You have to build the compiler with no fpu support - and probably the > glibc, too. In theory it's clear, but it didn't work. I'll check which args I did use and will post them, once I'm at home... Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [oselas] [PATCH] Add i486 toolchain
* Marc Kleine-Budde [2011-08-15 12:25]: > On 08/15/2011 12:20 PM, Juergen Beisert wrote: > > Marc Kleine-Budde wrote: > >> On 08/14/2011 12:51 PM, Bernhard Walle wrote: > >>> The toolchain has been tested with a so-called Bifferboard > >>> (http://bifferos.co.uk/) which has a S3282 BGA CPU (R861x/R321x > >>> equivalent) that understands 486SX instructions. > >> > >> What about the FPU? Does the cpu support float instructions? Does the > >> toolchain genereate them? > > > > 486*SX* means no FPU. 486*DX* means with FPU. > > What does "cat /proc/cpuinfo" show? > > So the processor doesn't support fpu, does the toolchain generate FPU > instructions? No, the CPU has no FPU. But the kernel is able to emulate the FPU, so it's just slow but it works. I just didn't manage to create a i486 toolchain with soft-float. See also http://old.nabble.com/i486-toolchain-with-softfloat-td31879412.html. The hint about multilib didn't help either. Do you have any ideas? Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Update kexec-tools to 2.0.2
This version adds support for armv7l. Tested on OMAP3530 (Beagle board). Signed-off-by: Bernhard Walle --- rules/kexec-tools.make |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make index 1f541b8..78f3221 100644 --- a/rules/kexec-tools.make +++ b/rules/kexec-tools.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_KEXEC_TOOLS) += kexec-tools # # Paths and names # -KEXEC_TOOLS_VERSION:= 2.0.1 -KEXEC_TOOLS_MD5:= 67c1a396fdf67b984dad939a59a01571 +KEXEC_TOOLS_VERSION:= 2.0.2 +KEXEC_TOOLS_MD5:= 35d05fed1c97008ac34c5bfb929295eb KEXEC_TOOLS:= kexec-tools-$(KEXEC_TOOLS_VERSION) KEXEC_TOOLS_SUFFIX := tar.bz2 KEXEC_TOOLS_URL:= http://www.kernel.org/pub/linux/kernel/people/horms/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX) -- 1.7.6 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] valgrind: Also patch configure.in, not only configure
While it's a good idea to avoid running autoreconf just because two
letters that have changed, it makes sense to add the change in the
configure.in file, so that autoreconf doesn't break the build.
Signed-off-by: Bernhard Walle
---
...ure-allow-all-arm-don-t-restrict-to-armv7.patch | 21 +--
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git
a/patches/valgrind-3.6.1/0001-configure-allow-all-arm-don-t-restrict-to-armv7.patch
b/patches/valgrind-3.6.1/0001-configure-allow-all-arm-don-t-restrict-to-armv7.patch
index b2fe6c2..63447b7 100644
---
a/patches/valgrind-3.6.1/0001-configure-allow-all-arm-don-t-restrict-to-armv7.patch
+++
b/patches/valgrind-3.6.1/0001-configure-allow-all-arm-don-t-restrict-to-armv7.patch
@@ -4,11 +4,10 @@ Subject: [PATCH] configure: allow all arm, don't restrict to
armv7
Signed-off-by: Marc Kleine-Budde
---
- configure |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure|2 +-
+ configure.in |2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/configure b/configure
-index 699137b..1179122 100755
--- a/configure
+++ b/configure
@@ -5262,7 +5262,7 @@ $as_echo "ok (${host_cpu})" >&6; }
@@ -20,6 +19,14 @@ index 699137b..1179122 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${host_cpu})" >&5
$as_echo "ok (${host_cpu})" >&6; }
ARCH_MAX="arm"
---
-1.7.4.1
-
+--- a/configure.in
b/configure.in
+@@ -158,7 +158,7 @@ case "${host_cpu}" in
+ esac
+ ;;
+
+- armv7*)
++ arm*)
+ AC_MSG_RESULT([ok (${host_cpu})])
+ ARCH_MAX="arm"
+ ;;
--
1.7.6
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] valgrind: Fix build with Linux 3.0
While valgrind shouldn't check the Linux kernel version of the host, it
does and this commit fixes the build if the host is running a 3.0
kernel.
Signed-off-by: Bernhard Walle
---
.../0002-configure-fix-build-with-linux-3.0.patch | 47
patches/valgrind-3.6.1/series |1 +
2 files changed, 48 insertions(+), 0 deletions(-)
create mode 100644
patches/valgrind-3.6.1/0002-configure-fix-build-with-linux-3.0.patch
diff --git
a/patches/valgrind-3.6.1/0002-configure-fix-build-with-linux-3.0.patch
b/patches/valgrind-3.6.1/0002-configure-fix-build-with-linux-3.0.patch
new file mode 100644
index 000..3c4d931
--- /dev/null
+++ b/patches/valgrind-3.6.1/0002-configure-fix-build-with-linux-3.0.patch
@@ -0,0 +1,47 @@
+Fix build with Linux 3.0
+
+This commit is from the Valgrind SVN
+(svn://svn.valgrind.org/valgrind/trunk):
+
+
+r11796 | bart | 2011-06-05 10:51:47 +0200 (So, 05. Jun 2011) | 4 Zeilen
+
+Make Valgrind build on Linux kernel 3.0 and beyond. Closes #274926. An official
+statement that the Linux kernel 3.0 API and ABI is compatible with Linux kernel
+2.6 can be found here: http://lkml.org/lkml/2011/5/29/204.
+
+
+
+To avoid running autoreconf, the change has also been made in configure
+directly.
+
+
+Signed-off-by: Bernhard Walle
+
+---
+ configure|2 +-
+ configure.in |2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure.in
b/configure.in
+@@ -220,7 +220,7 @@ case "${host_os}" in
+ kernel=`uname -r`
+
+ case "${kernel}" in
+- 2.6.*)
++ 2.6.*|3.*)
+ AC_MSG_RESULT([2.6 family (${kernel})])
+ AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using
Linux 2.6.x])
+ ;;
+--- a/configure
b/configure
+@@ -5348,7 +5348,7 @@ $as_echo_n "checking for the kernel vers
+ kernel=`uname -r`
+
+ case "${kernel}" in
+- 2.6.*)
++ 2.6.*|3.*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6 family
(${kernel})" >&5
+ $as_echo "2.6 family (${kernel})" >&6; }
+
diff --git a/patches/valgrind-3.6.1/series b/patches/valgrind-3.6.1/series
index 4db899d..8bbcb5f 100644
--- a/patches/valgrind-3.6.1/series
+++ b/patches/valgrind-3.6.1/series
@@ -1,3 +1,4 @@
# generated by git-ptx-patches
0001-configure-allow-all-arm-don-t-restrict-to-armv7.patch
# bfabec993b2d4636784bbd5fd034c019 - git-ptx-patches magic
+0002-configure-fix-build-with-linux-3.0.patch
--
1.7.6
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] state of ext3 on OSELAS Generic
Hi, Am 01.08.2011 08:50, schrieb Raz: > Hello > I am trying to create ext3 image and I came across the bellow discussion. See that commit http://git.pengutronix.de/?p=ptxdist.git;a=commit;h=2e2bf6b952c86f4ee25c61876b80bd290e8389b9. It's not yet in a released version of ptxdist, so you need to use the git version. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Make it possible to create ext3 file system images
* Michael Olbrich [2011-07-15 15:30]: > > +# # errors we want to see. > > + @echo -n "Adding a journal to root.ext2 ..." > > + @cd $(image/work_dir) > > this line does not make any sense. Indeed, yes, of course. Thanks for the review! Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Make it possible to create ext3 file system images
Signed-off-by: Bernhard Walle --- platforms/image_ext2.in|8 rules/post/image_ext2.make | 12 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/platforms/image_ext2.in b/platforms/image_ext2.in index b28c5e3..c26efd0 100644 --- a/platforms/image_ext2.in +++ b/platforms/image_ext2.in @@ -30,4 +30,12 @@ config IMAGE_EXT2_GZIP help FIXME: This item needs to be documented +config IMAGE_EXT2_JOURNAL + bool + select HOST_E2FSPROGS + prompt "Add a journal to the ext2 file system image, making it ext3" + help + Enable this option if you want to mount the root file system as + ext3 image. + endif diff --git a/rules/post/image_ext2.make b/rules/post/image_ext2.make index 849c8fe..ed7d037 100644 --- a/rules/post/image_ext2.make +++ b/rules/post/image_ext2.make @@ -24,6 +24,18 @@ $(IMAGEDIR)/root.ext2: $(STATEDIR)/image_working_dir ) | $(FAKEROOT) -- @echo "done." +ifdef PTXCONF_IMAGE_EXT2_JOURNAL +# # Since genext2fs cannot generate ext3 images, we use tune2fs to create +# # the journal entry and then run e2fsck to update the revision from 0 +# # to 1 to prevent a mount warning. Since both programs lack a quiet +# # mode we use output redirection (and since we're operating on files +# # and not on real block devices, it's very unlikely that there are +# # errors we want to see. + @echo -n "Adding a journal to root.ext2 ..." + @tune2fs -j "$(IMAGEDIR)/root.ext2" > /dev/null + @e2fsck -y "$(IMAGEDIR)/root.ext2" > /dev/null 2>&1 + @echo "done." +endif $(IMAGEDIR)/root.ext2.gz: $(IMAGEDIR)/root.ext2 @echo -n "Creating root.ext2.gz from root.ext2..."; -- 1.7.6 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Fix CMAKE_SYSTEM_PROCESSOR entry in cmake toolchain file
This fixes commit 51aaa12b07b03b8e60909539a3dabf6594f462f2. Without that
fix, the CMAKE_SYSTEM_PROCESSOR entry in the toolchain file was actually
empty.
Signed-off-by: Bernhard Walle
---
rules/post/ptxd_make_cmake_toolchain.make |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/rules/post/ptxd_make_cmake_toolchain.make
b/rules/post/ptxd_make_cmake_toolchain.make
index da49bc6..1eeb3ff 100644
--- a/rules/post/ptxd_make_cmake_toolchain.make
+++ b/rules/post/ptxd_make_cmake_toolchain.make
@@ -10,6 +10,7 @@
$(PTXDIST_CMAKE_TOOLCHAIN_TARGET):
@$(CROSS_ENV) \
+ PTXCONF_ARCH_STRING="${PTXCONF_ARCH_STRING}" \
ptxd_make_cmake_toolchain_target "${@}"
$(PTXDIST_CMAKE_TOOLCHAIN_HOST):
--
1.7.6
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] Make it possible to create ext3 file system images
Signed-off-by: Bernhard Walle --- platforms/image_ext2.in|8 rules/post/image_ext2.make | 13 + 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/platforms/image_ext2.in b/platforms/image_ext2.in index b28c5e3..c26efd0 100644 --- a/platforms/image_ext2.in +++ b/platforms/image_ext2.in @@ -30,4 +30,12 @@ config IMAGE_EXT2_GZIP help FIXME: This item needs to be documented +config IMAGE_EXT2_JOURNAL + bool + select HOST_E2FSPROGS + prompt "Add a journal to the ext2 file system image, making it ext3" + help + Enable this option if you want to mount the root file system as + ext3 image. + endif diff --git a/rules/post/image_ext2.make b/rules/post/image_ext2.make index 849c8fe..edddf56 100644 --- a/rules/post/image_ext2.make +++ b/rules/post/image_ext2.make @@ -24,6 +24,19 @@ $(IMAGEDIR)/root.ext2: $(STATEDIR)/image_working_dir ) | $(FAKEROOT) -- @echo "done." +ifdef PTXCONF_IMAGE_EXT2_JOURNAL +# # Since genext2fs cannot generate ext3 images, we use tune2fs to create +# # the journal entry and then run e2fsck to update the revision from 0 +# # to 1 to prevent a mount warning. Since both programs lack a quiet +# # mode we use output redirection (and since we're operating on files +# # and not on real block devices, it's very unlikely that there are +# # errors we want to see. + @echo -n "Adding a journal to root.ext2 ..." + @cd $(image/work_dir) + @tune2fs -j "$(IMAGEDIR)/root.ext2" >> /dev/null + @e2fsck -y "$(IMAGEDIR)/root.ext2" >> /dev/null 2>&1 + @echo "done." +endif $(IMAGEDIR)/root.ext2.gz: $(IMAGEDIR)/root.ext2 @echo -n "Creating root.ext2.gz from root.ext2..."; -- 1.7.6 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Memory Status
* Josef Holzmayr [2011-07-15 09:39]: > > How can I determine how much RAM is > > available for my use (user application). > > Type "man free" into a terminal application on your development > machine and use the knowledge gained to apply the command to your > target. :-) "cat /proc/meminfo" might also be an option if busybox has been compiled without "free". Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Update cmake to 2.8.5
Version bump, my projects did build after the update on both x86 (i486) and ARM. Signed-off-by: Bernhard Walle --- rules/host-cmake.make |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-cmake.make b/rules/host-cmake.make index db4d982..fa65679 100644 --- a/rules/host-cmake.make +++ b/rules/host-cmake.make @@ -17,8 +17,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake # # Paths and names # -HOST_CMAKE_VERSION := 2.8.4 -HOST_CMAKE_MD5 := 209b7d1d04b2e00986538d74ba764fcf +HOST_CMAKE_VERSION := 2.8.5 +HOST_CMAKE_MD5 := 3c5d32cec0f4c2dc45f4c2e84f4a20c5 HOST_CMAKE := cmake-$(HOST_CMAKE_VERSION) HOST_CMAKE_SUFFIX := tar.gz HOST_CMAKE_URL := http://www.cmake.org/files/v2.8/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX) -- 1.7.6 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Add modeline for vim to *.in files
* Alexander Dahl [2011-06-23 19:42]: > Hello, > > On 23.06.2011 18:37, Bernhard Walle wrote: > > Well, IMO setting the filetype is better than just the syntax, because > > then you can add > > > > autocmd FileType kconfig set ts=8 sw=8 noet > > autocmd FileType makeset ts=8 sw=8 noet > > > > to your .vimrc. > > I would also recommend setting the file type. However the noet option > would be helpful in the mode line itself because Makefiles don't work > without tabs. Should one let this option of the user or override in the > mode line because it's the only sense making setting? What do you think? For Makefiles you're right, for Kconfig it's a matter of taste. But I would use 'noexpandtab' because it's also readable for non vim-gurus (although I myself use 'noet'). But let one of the ptxdist maintainers comment on the issue... Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Add modeline for vim to *.in files
* Alexander Dahl [2011-06-23 18:10]: > Hei hei, > > On Thu, 23 Jun 2011 17:48:02 +0200, Bernhard Walle wrote: > > Set the file type to kconfig. The *.make files have a modeline for vim, > > so why not also for the Kconfig files. > > % grep vim: rules/*.in > rules/argtable2.in:# vim: syntax=kconfig > rules/calibrator.in:# vim: syntax=kconfig > rules/hackbench.in:# vim: syntax=kconfig > > I would recommend altering these instead of adding an addtional line. > ;-) Granted. > Despite of that: +1, very handy for vim users. > > If you're already on this topic: Would you mind adapting the modeline > for the rules/*.make files to something like this? > > # vim: ft=make noet Well, IMO setting the filetype is better than just the syntax, because then you can add autocmd FileType kconfig set ts=8 sw=8 noet autocmd FileType makeset ts=8 sw=8 noet to your .vimrc. > But I guess the templates used by `ptxdist newpackage` should be > changed too, so freshly created packages get modelines in the same > style. My patch touched also the templates. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Update gnuplot to 4.4.3
Also install Gnuplot runtime files which are needed for some formats
like Postscript or HTML5/Javascript when the configuration option is
selected.
Disable lua regardless whether lua is available or not.
Signed-off-by: Bernhard Walle
---
patches/gnuplot-4.2.6/series |1 -
.../{gnuplot-4.2.6 => gnuplot-4.4.3}/autogen.sh|0
.../gnuplot-4.4.3-cc-for-build.diff} |0
patches/gnuplot-4.4.3/series |1 +
rules/gnuplot.in | 26 ++-
rules/gnuplot.make | 26 ++-
6 files changed, 44 insertions(+), 10 deletions(-)
delete mode 100644 patches/gnuplot-4.2.6/series
rename patches/{gnuplot-4.2.6 => gnuplot-4.4.3}/autogen.sh (100%)
rename patches/{gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff =>
gnuplot-4.4.3/gnuplot-4.4.3-cc-for-build.diff} (100%)
create mode 100644 patches/gnuplot-4.4.3/series
diff --git a/patches/gnuplot-4.2.6/series b/patches/gnuplot-4.2.6/series
deleted file mode 100644
index 12cf91b..000
--- a/patches/gnuplot-4.2.6/series
+++ /dev/null
@@ -1 +0,0 @@
-gnuplot-4.2.2-cc-for-build.diff
diff --git a/patches/gnuplot-4.2.6/autogen.sh b/patches/gnuplot-4.4.3/autogen.sh
similarity index 100%
rename from patches/gnuplot-4.2.6/autogen.sh
rename to patches/gnuplot-4.4.3/autogen.sh
diff --git a/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
b/patches/gnuplot-4.4.3/gnuplot-4.4.3-cc-for-build.diff
similarity index 100%
rename from patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
rename to patches/gnuplot-4.4.3/gnuplot-4.4.3-cc-for-build.diff
diff --git a/patches/gnuplot-4.4.3/series b/patches/gnuplot-4.4.3/series
new file mode 100644
index 000..76fe674
--- /dev/null
+++ b/patches/gnuplot-4.4.3/series
@@ -0,0 +1 @@
+gnuplot-4.4.3-cc-for-build.diff
diff --git a/rules/gnuplot.in b/rules/gnuplot.in
index bf9b87b..e7062e7 100644
--- a/rules/gnuplot.in
+++ b/rules/gnuplot.in
@@ -16,11 +16,33 @@ menuconfig GNUPLOT
many printers, (La)TeX, (x)fig, Postscript, and so on.
Data files and self-defined functions can be manipulated by internal
- C-like language. Can perform smoothing, spline-fitting, or nonlinear
- fits. Can work with complex numbers.
+ C-like language. Can perform smoothing, spline-fitting, or nonlinear
+ fits. Can work with complex numbers.
if GNUPLOT
+config GNUPLOT_HELP
+ bool
+ prompt "Install interactive help"
+ help
+ Installs the interactive help files on the target.
+ Requires about 600 kByte of space.
+
+config GNUPLOT_POSTSCRIPT
+ bool
+ prompt "Install Postscript prolog files"
+ help
+ Installs the prolog files needed to generate Postscript output. If you
+ don't need Postscript, you can turn off that setting. Requires about
+ 100 kByte of space.
+
+config GNUPLOT_JS
+ bool
+ prompt "Install JavaScript runtime files"
+ help
+ Installs some JavaScript files and PNG images which will be needed if
+ HTML5 output should be generated. Requires about 300 kByte of disk
space.
+
config GNUPLOT_FITERRVARS
bool
prompt "Support for fitting error variables"
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index 4de83b0..896087c 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot
#
# Paths and names
#
-GNUPLOT_VERSION:= 4.2.6
-GNUPLOT_MD5:= c10468d74030e8bed0fd6865a45cf1fd
+GNUPLOT_VERSION:= 4.4.3
+GNUPLOT_MD5:= 639603752996f4923bc02c895fa03b45
GNUPLOT:= gnuplot-$(GNUPLOT_VERSION)
GNUPLOT_SUFFIX := tar.gz
GNUPLOT_URL:=
$(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX)
@@ -49,7 +49,6 @@ GNUPLOT_ENV := $(CROSS_ENV)
GNUPLOT_AUTOCONF = \
$(CROSS_AUTOCONF_USR) \
--disable-history-file \
- --disable-mouse \
--disable-x11-mbfonts \
--enable-binary-data-file \
--disable-with-image \
@@ -76,7 +75,8 @@ GNUPLOT_AUTOCONF = \
--without-lisp-files \
--without-row-help \
--without-tutorial \
- --without-wx-config
+ --without-wx-config \
+ --without-lua
ifdef PTXCONF_GNUPLOT_FITERRVARS
GNUPLOT_AUTOCONF += --enable-fiterrvars
@@ -85,9 +85,9 @@ GNUPLOT_AUTOCONF += --disable-fiterrvars
endif
ifdef PTXCONF_GNUPLOT_X
-GNUPLOT_AUTOCONF += --with-x
+GNUPLOT_AUTOCONF += --with-x --enable-mouse
else
-GNUPLOT_AUTOCONF += --without-x
+GNUPLOT_AUTOCONF += --without-x --disable-mouse
endif
ifdef PTXCONF_GNUPLOT_PLOT
@@ -138,8 +138,20 @@ $(STATEDIR)/gnuplot.targetinstall:
@$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/bin/gnuplot)
+ifdef PTXCONF_GNUPLOT_HELP
+ @$(call install_copy, gnuplot, 0, 0, 0644, -,
/usr/share/gnuplot/4.4/gnuplot.gih)
+end
[ptxdist] [PATCH] Update gnuplot to 4.4.3
Also install Gnuplot runtime files which are needed for some formats
like Postscript or HTML5/Javascript.
Signed-off-by: Bernhard Walle
---
patches/gnuplot-4.2.6/series |1 -
.../{gnuplot-4.2.6 => gnuplot-4.4.3}/autogen.sh|0
.../gnuplot-4.4.3-cc-for-build.diff} |0
patches/gnuplot-4.4.3/series |1 +
rules/gnuplot.make | 10 ++
5 files changed, 7 insertions(+), 5 deletions(-)
delete mode 100644 patches/gnuplot-4.2.6/series
rename patches/{gnuplot-4.2.6 => gnuplot-4.4.3}/autogen.sh (100%)
rename patches/{gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff =>
gnuplot-4.4.3/gnuplot-4.4.3-cc-for-build.diff} (100%)
create mode 100644 patches/gnuplot-4.4.3/series
diff --git a/patches/gnuplot-4.2.6/series b/patches/gnuplot-4.2.6/series
deleted file mode 100644
index 12cf91b..000
--- a/patches/gnuplot-4.2.6/series
+++ /dev/null
@@ -1 +0,0 @@
-gnuplot-4.2.2-cc-for-build.diff
diff --git a/patches/gnuplot-4.2.6/autogen.sh b/patches/gnuplot-4.4.3/autogen.sh
similarity index 100%
rename from patches/gnuplot-4.2.6/autogen.sh
rename to patches/gnuplot-4.4.3/autogen.sh
diff --git a/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
b/patches/gnuplot-4.4.3/gnuplot-4.4.3-cc-for-build.diff
similarity index 100%
rename from patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
rename to patches/gnuplot-4.4.3/gnuplot-4.4.3-cc-for-build.diff
diff --git a/patches/gnuplot-4.4.3/series b/patches/gnuplot-4.4.3/series
new file mode 100644
index 000..76fe674
--- /dev/null
+++ b/patches/gnuplot-4.4.3/series
@@ -0,0 +1 @@
+gnuplot-4.4.3-cc-for-build.diff
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index 4de83b0..bbfa340 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot
#
# Paths and names
#
-GNUPLOT_VERSION:= 4.2.6
-GNUPLOT_MD5:= c10468d74030e8bed0fd6865a45cf1fd
+GNUPLOT_VERSION:= 4.4.3
+GNUPLOT_MD5:= 639603752996f4923bc02c895fa03b45
GNUPLOT:= gnuplot-$(GNUPLOT_VERSION)
GNUPLOT_SUFFIX := tar.gz
GNUPLOT_URL:=
$(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX)
@@ -49,7 +49,6 @@ GNUPLOT_ENV := $(CROSS_ENV)
GNUPLOT_AUTOCONF = \
$(CROSS_AUTOCONF_USR) \
--disable-history-file \
- --disable-mouse \
--disable-x11-mbfonts \
--enable-binary-data-file \
--disable-with-image \
@@ -86,8 +85,10 @@ endif
ifdef PTXCONF_GNUPLOT_X
GNUPLOT_AUTOCONF += --with-x
+GNUPLOT_AUTOCONF += --enable-mouse
else
GNUPLOT_AUTOCONF += --without-x
+GNUPLOT_AUTOCONF += --disable-mouse
endif
ifdef PTXCONF_GNUPLOT_PLOT
@@ -137,9 +138,10 @@ $(STATEDIR)/gnuplot.targetinstall:
@$(call install_fixup, gnuplot,DESCRIPTION,missing)
@$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/bin/gnuplot)
+ @$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot)
ifdef PTXCONF_GNUPLOT_X
- @$(call install_copy, gnuplot, 0, 0, 0755, -,
/usr/libexec/gnuplot/4.2/gnuplot_x11)
+ @$(call install_copy, gnuplot, 0, 0, 0755, -,
/usr/libexec/gnuplot/4.4/gnuplot_x11)
endif
@$(call install_finish, gnuplot)
--
1.7.5.4
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Update gnuplot to 4.4.3
* Michael Olbrich [2011-06-21 12:25]: > Geht auf !x86 nicht: > > ./doc2gih ./gnuplot.doc gnuplot.gih > ./doc2gih: 1: Syntax error: word unexpected (expecting ")") > > doc2gih wird fuers target compiliert. > > GNUPLOT_MAKE_OPT := -C src/ > GNUPLOT_INSTALL_OPT := $(GNUPLOT_MAKE_OPT) install > > anstelle der momentanen compile stage sollte helfen. It's much simpler: My check whether the build fix has been integrated upstream was wrong. However, I also recognised that the runtime files (including the interactive help) is not installed. The new patch version installs these. While we can discuss if it makes sense to have the help file on the target (maybe an option?), we definitively need the runtime files, e.g. the Postscript files if EPS should be generated. Should I make configuratino options to disable some formats that need runtime files? When generating SVG (what is what I am doing) I don't need HTML5 runtime files. However, in my case it doesn't matter because my space is quite unlimited. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Update gnuplot to 4.4.3
The patch gnuplot-4.2.2-cc-for-build.diff has been integrated upstream
and is superfluous.
Signed-off-by: Bernhard Walle
---
patches/gnuplot-4.2.6/autogen.sh |1 -
.../gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff | 89
patches/gnuplot-4.2.6/series |1 -
rules/gnuplot.make | 11 +--
4 files changed, 5 insertions(+), 97 deletions(-)
delete mode 12 patches/gnuplot-4.2.6/autogen.sh
delete mode 100644 patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
delete mode 100644 patches/gnuplot-4.2.6/series
diff --git a/patches/gnuplot-4.2.6/autogen.sh b/patches/gnuplot-4.2.6/autogen.sh
deleted file mode 12
index 9f8a4cb..000
--- a/patches/gnuplot-4.2.6/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
b/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
deleted file mode 100644
index e0f63b9..000
--- a/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-Subject: gnuplot: build documentation generator tools with CC_FOR_BUILD
-From: Robert Schwebel
-
-When cross compiling gnuplot, it tries to build the documentation
-generation tools in docs/ with the cross compiler, not with
-CC_FOR_BUILD.
-
-Signed-off-by: Robert Schwebel
-
-# 20091222 rsc:
https://sourceforge.net/tracker/?func=detail&aid=2918992&group_id=2055&atid=302055
-
- configure.in | 40
- docs/Makefile.in |2 +-
- 2 files changed, 41 insertions(+), 1 deletion(-)
-
-Index: gnuplot-4.2.4/docs/Makefile.in
-===
gnuplot-4.2.4.orig/docs/Makefile.in2009-01-06 18:46:41.0
+0100
-+++ gnuplot-4.2.4/docs/Makefile.in 2009-01-06 18:46:46.0 +0100
-@@ -70,7 +70,7 @@
-
- INFO_DEPS = $(srcdir)/gnuplot.info
-
--CC = @CC@
-+CC = @CC_FOR_BUILD@
- CPP= @CPP@
- DEFS = @DEFS@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I.. -I$(top_builddir)
-Index: gnuplot-4.2.4/configure.in
-===
gnuplot-4.2.4.orig/configure.in2009-01-06 18:46:41.0 +0100
-+++ gnuplot-4.2.4/configure.in 2009-01-06 18:46:56.0 +0100
-@@ -12,6 +12,8 @@
- AM_CONFIG_HEADER(config.h:config.hin)
- AM_INIT_AUTOMAKE(1.7.9)
-
-+AM_MAINTAINER_MODE
-+
- VERSION_MAJOR="`cat $srcdir/VERSION`"
- PATCHLEVEL="`cat $srcdir/PATCHLEVEL`"
-
-@@ -27,6 +29,46 @@
- AC_C_INLINE
- AC_C_STRINGIZE
-
-+
-+if test "${build}" != "${host}"
-+then
-+ CC=${CC-${host_alias}-gcc}
-+ CFLAGS=${CFLAGS-"-g -O2"}
-+ CXX=${CXX-${host_alias}-c++}
-+ CXXFLAGS=${CXXFLAGS-"-g -O2"}
-+ CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-+else
-+ CC_FOR_BUILD="\$(CC)"
-+ AC_PROG_CC
-+
-+ # We must set the default linker to the linker used by gcc for the correct
-+ # operation of libtool. If LD is not defined and we are using gcc, try to
-+ # set the LD default to the ld used by gcc.
-+ if test -z "$LD"
-+ then
-+if test "$GCC" = yes
-+then
-+ case $build in
-+ *-*-mingw*)
-+gcc_prog_ld=`$CC -print-prog-name=ld 2>&1 | tr -d '\015'` ;;
-+ *)
-+gcc_prog_ld=`$CC -print-prog-name=ld 2>&1` ;;
-+ esac
-+ case $gcc_prog_ld in
-+ # Accept absolute paths.
-+ [[\\/]* | [A-Za-z]:[\\/]*)]
-+LD="$gcc_prog_ld" ;;
-+ esac
-+fi
-+ fi
-+
-+ CXX=${CXX-"c++"}
-+ CFLAGS=${CFLAGS-"-g -O2"}
-+ CXXFLAGS=${CXXFLAGS-"-g -O2"}
-+fi
-+AC_SUBST(CC_FOR_BUILD)
-+
-+
- dnl Various programs
- dnl X/Emacs for building lisp packages and creating .texi version of docs
- # If set to t, that means we are running in a shell under Emacs.
diff --git a/patches/gnuplot-4.2.6/series b/patches/gnuplot-4.2.6/series
deleted file mode 100644
index 12cf91b..000
--- a/patches/gnuplot-4.2.6/series
+++ /dev/null
@@ -1 +0,0 @@
-gnuplot-4.2.2-cc-for-build.diff
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index 4de83b0..0a2ed36 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot
#
# Paths and names
#
-GNUPLOT_VERSION:= 4.2.6
-GNUPLOT_MD5:= c10468d74030e8bed0fd6865a45cf1fd
+GNUPLOT_VERSION:= 4.4.3
+GNUPLOT_MD5:= 639603752996f4923bc02c895fa03b45
GNUPLOT:= gnuplot-$(GNUPLOT_VERSION)
GNUPLOT_SUFFIX := tar.gz
GNUPLOT_URL:=
$(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX)
@@ -49,7 +49,6 @@ GNUPLOT_ENV := $(CROSS_ENV)
GNUPLOT_AUTOCONF = \
$(CROSS_AUTOCONF_USR) \
--disable-history-file \
- --disable-mouse \
--disable-x11-mbfonts \
--enable-binary-data-file \
--disable-with-image \
@@ -85,
[ptxdist] [PATCH] Update gnuplot to 4.4.3
Signed-off-by: Bernhard Walle --- rules/gnuplot.make |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rules/gnuplot.make b/rules/gnuplot.make index 4de83b0..d8fabf6 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot # # Paths and names # -GNUPLOT_VERSION:= 4.2.6 -GNUPLOT_MD5:= c10468d74030e8bed0fd6865a45cf1fd +GNUPLOT_VERSION:= 4.4.3 +GNUPLOT_MD5:= 639603752996f4923bc02c895fa03b45 GNUPLOT:= gnuplot-$(GNUPLOT_VERSION) GNUPLOT_SUFFIX := tar.gz GNUPLOT_URL:= $(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX) @@ -49,7 +49,6 @@ GNUPLOT_ENV := $(CROSS_ENV) GNUPLOT_AUTOCONF = \ $(CROSS_AUTOCONF_USR) \ --disable-history-file \ - --disable-mouse \ --disable-x11-mbfonts \ --enable-binary-data-file \ --disable-with-image \ @@ -86,8 +85,10 @@ endif ifdef PTXCONF_GNUPLOT_X GNUPLOT_AUTOCONF += --with-x +GNUPLOT_AUTOCONF += --enable-mouse else GNUPLOT_AUTOCONF += --without-x +GNUPLOT_AUTOCONF += --disable-mouse endif ifdef PTXCONF_GNUPLOT_PLOT @@ -139,7 +140,7 @@ $(STATEDIR)/gnuplot.targetinstall: @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/bin/gnuplot) ifdef PTXCONF_GNUPLOT_X - @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.2/gnuplot_x11) + @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.4/gnuplot_x11) endif @$(call install_finish, gnuplot) -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Add lpc21isp package
* Bernhard Walle [2011-06-20 10:46]: > * Bernhard Walle [2011-06-20 09:57]: > > * Michael Olbrich [2011-06-18 10:19]: > > > > > > patchin: quilt: apply 'ptxdist-git/patches/lpc21isp-1.79/series' > > > Applying patch lpc21isp-fix-arm.diff > > > patching file lpc21isp.h > > > Hunk #1 FAILED at 37. > > > 1 out of 1 hunk FAILED -- rejects in file lpc21isp.h > > > Patch lpc21isp-fix-arm.diff does not apply (enforce with -f) > > > > Hm ..., I don't understand why. I just re-applied the patch on a clean > > tarball and it works. Using -p1 patches without '-p1' in the series file > > should be also ok. Can you check why the patch doesn't apply here. > > Now it's clear. The source code (and the patch) has Windows line > endings, but git-send-email strips the ^M. Will play with some git > options. :) Didn't find any options. I hope this attached and with gzip compressed version is okay ... Regards, Bernhard 0001-Add-lpc21isp-package.patch.gz Description: Binary data -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Add lpc21isp package
* Bernhard Walle [2011-06-20 09:57]: > * Michael Olbrich [2011-06-18 10:19]: > > > > patchin: quilt: apply 'ptxdist-git/patches/lpc21isp-1.79/series' > > Applying patch lpc21isp-fix-arm.diff > > patching file lpc21isp.h > > Hunk #1 FAILED at 37. > > 1 out of 1 hunk FAILED -- rejects in file lpc21isp.h > > Patch lpc21isp-fix-arm.diff does not apply (enforce with -f) > > Hm ..., I don't understand why. I just re-applied the patch on a clean > tarball and it works. Using -p1 patches without '-p1' in the series file > should be also ok. Can you check why the patch doesn't apply here. Now it's clear. The source code (and the patch) has Windows line endings, but git-send-email strips the ^M. Will play with some git options. :) Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Add lpc21isp package
Hi, * Michael Olbrich [2011-06-18 10:19]: > > patchin: quilt: apply 'ptxdist-git/patches/lpc21isp-1.79/series' > Applying patch lpc21isp-fix-arm.diff > patching file lpc21isp.h > Hunk #1 FAILED at 37. > 1 out of 1 hunk FAILED -- rejects in file lpc21isp.h > Patch lpc21isp-fix-arm.diff does not apply (enforce with -f) Hm ..., I don't understand why. I just re-applied the patch on a clean tarball and it works. Using -p1 patches without '-p1' in the series file should be also ok. Can you check why the patch doesn't apply here. > > +$(STATEDIR)/lpc21isp.compile: > > + @$(call targetinfo) > > + make -C $(LPC21ISP_DIR) CC=$(CROSS_CC) clean > > any special need for this? otherwise don't clean here. It's a relict from when I packaged the ZIP file which includes a pre-built binary. Can be removed now. I will resend a patch with the other remarks applied. Thanks for the review. > > +$(STATEDIR)/lpc21isp.clean: > > + @$(call targetinfo) > > + @-cd $(LPC21ISP_DIR) && \ > > + $(LPC21ISP_ENV) $(LPC21ISP_PATH) $(MAKE) clean > > why? clean_pkg removes LPC21ISP_DIR anyways. Just remove the clean stage, > to use the default. Well, it's just from the template ptxdist generates. It's hard to see at the first place what the default behaviour is, i.e. what can be removed. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Add serdisplib package
Signed-off-by: Bernhard Walle --- patches/serdisplib-1.97.9/autogen.sh |1 + ...serdisplib-1.97.9-add-Support-for-DESTDIR.patch | 70 patches/serdisplib-1.97.9/series |1 + rules/serdisplib.in| 17 + rules/serdisplib.make | 64 ++ 5 files changed, 153 insertions(+), 0 deletions(-) create mode 12 patches/serdisplib-1.97.9/autogen.sh create mode 100644 patches/serdisplib-1.97.9/serdisplib-1.97.9-add-Support-for-DESTDIR.patch create mode 100644 patches/serdisplib-1.97.9/series create mode 100644 rules/serdisplib.in create mode 100644 rules/serdisplib.make diff --git a/patches/serdisplib-1.97.9/autogen.sh b/patches/serdisplib-1.97.9/autogen.sh new file mode 12 index 000..9f8a4cb --- /dev/null +++ b/patches/serdisplib-1.97.9/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/serdisplib-1.97.9/serdisplib-1.97.9-add-Support-for-DESTDIR.patch b/patches/serdisplib-1.97.9/serdisplib-1.97.9-add-Support-for-DESTDIR.patch new file mode 100644 index 000..ef8b9a1 --- /dev/null +++ b/patches/serdisplib-1.97.9/serdisplib-1.97.9-add-Support-for-DESTDIR.patch @@ -0,0 +1,70 @@ +From f2c935dac0bca0d0754457968fd57f9ff227af18 Mon Sep 17 00:00:00 2001 +From: Bernhard Walle +Date: Sat, 28 May 2011 14:58:40 +0200 +Subject: [PATCH] serdisplib: Add Support for DESTDIR + +Signed-off-by: Bernhard Walle +--- + Makefile.in |6 +++--- + src/Makefile.in |8 + tools/Makefile.in |8 + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 7a1a7eb..101966c 100644 +--- a/Makefile.in b/Makefile.in +@@ -9,9 +9,9 @@ top_srcdir = @top_srcdir@ + srcdir = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-bindir = @bindir@ +-libdir = @libdir@ +-mandir = @mandir@ ++bindir = $(DESTDIR)@bindir@ ++libdir = $(DESTDIR)@libdir@ ++mandir = $(DESTDIR)@mandir@ + abs_top_srcdir=@abs_top_srcdir@ + base_abs_top_srcdir=$(shell /bin/basename $(abs_top_srcdir)) + current_timestamp=$(shell /bin/date '+%Y%m%d-%H%M') +diff --git a/src/Makefile.in b/src/Makefile.in +index 930b65a..c554f2c 100644 +--- a/src/Makefile.in b/src/Makefile.in +@@ -22,10 +22,10 @@ top_srcdir = @top_srcdir@ + srcdir = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-bindir = @bindir@ +-libdir = @libdir@ +-mandir = @mandir@ +-includedir = @includedir@ ++bindir = $(DESTDIR)@bindir@ ++libdir = $(DESTDIR)@libdir@ ++mandir = $(DESTDIR)@mandir@ ++includedir = $(DESTDIR)@includedir@ + + CC=@CC@ + AR=@AR@ -r +diff --git a/tools/Makefile.in b/tools/Makefile.in +index 8d29739..5a748f7 100644 +--- a/tools/Makefile.in b/tools/Makefile.in +@@ -10,10 +10,10 @@ top_srcdir = @top_srcdir@ + srcdir = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-bindir = @bindir@ +-libdir = @libdir@ +-mandir = @mandir@ +-includedir = @includedir@ ++bindir = $(DESTDIR)@bindir@ ++libdir = $(DESTDIR)@libdir@ ++mandir = $(DESTDIR)@mandir@ ++includedir = $(DESTDIR)@includedir@ + + CC=@CC@ + AR=@AR@ -r +-- +1.7.5.2 + diff --git a/patches/serdisplib-1.97.9/series b/patches/serdisplib-1.97.9/series new file mode 100644 index 000..5e2373e --- /dev/null +++ b/patches/serdisplib-1.97.9/series @@ -0,0 +1 @@ +serdisplib-1.97.9-add-Support-for-DESTDIR.patch diff --git a/rules/serdisplib.in b/rules/serdisplib.in new file mode 100644 index 000..4a2ea4e --- /dev/null +++ b/rules/serdisplib.in @@ -0,0 +1,17 @@ +## SECTION=system_libraries + +config SERDISPLIB + tristate + prompt "serdisplib" + select LIBUSB_COMPAT + help + Library to drive serial displays with built-in controllers. + +config SERDISPLIB_TESTSERDISP + bool + prompt "Install testserdisp on target" + depends on SERDISPLIB + help + If selected, the testserdisp test program will be installed on + the target. + diff --git a/rules/serdisplib.make b/rules/serdisplib.make new file mode 100644 index 000..5a9971c --- /dev/null +++ b/rules/serdisplib.make @@ -0,0 +1,64 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Bernhard Walle +# +# 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_SERDISPLIB) += serdisplib + +# +# Paths and names +# +SERDISPLIB_VERSION := 1.97.9 +SERDISPLIB_MD5 := 130552ec60d01e974712a60274f34de7 +SERDISPLIB := serdisplib-$(SERDISPLIB_VERSION) +SERDISPLIB_SUFFIX := tar.gz +SERDISPLIB_URL := $(PTXCONF_SETUP_SFMIRROR)/project/serdisplib/serdisplib/$(SERDISPLIB_VERSION)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX) +SERDISPLIB_SOURCE := $(SRCDIR)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX) +SERDISPLIB_DIR
[ptxdist] [PATCH] Add sitecopy
Sitecopy is a simple tool to synchronize local and remote web site via FTP or
WebDAV.
Signed-off-by: Bernhard Walle
diff -r 22739a15eec4 -r c6a44fc1b614 patches/sitecopy-0.16.6/series
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/patches/sitecopy-0.16.6/seriesDi Jun 14 21:54:48 2011 +0200
@@ -0,0 +1,1 @@
+sitecopy-neon-openssl.diff
diff -r 22739a15eec4 -r c6a44fc1b614
patches/sitecopy-0.16.6/sitecopy-neon-openssl.diff
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/patches/sitecopy-0.16.6/sitecopy-neon-openssl.diffDi Jun 14
21:54:48 2011 +0200
@@ -0,0 +1,36 @@
+From: Bernhard Walle
+Subject: Fix build with OpenSSL 1.x
+
+See
http://lists.manyfish.co.uk/pipermail/neon-commits/2009-September/000827.html.
+
+Signed-off-by: Bernhard Walle
+---
+ lib/neon/ne_openssl.c | 10 ++
+ 1 file changed, 10 insertions(+)
+
+--- a/lib/neon/ne_openssl.c
b/lib/neon/ne_openssl.c
+@@ -36,6 +36,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #ifdef NE_HAVE_TS_SSL
+ #include /* for abort() */
+@@ -615,6 +616,15 @@ void ne_ssl_context_destroy(ne_ssl_conte
+ ne_free(ctx);
+ }
+
++/* OpenSSL 1.0 removed SSL_SESSION_cmp for no apparent reason - hoping
++ * it is reasonable to assume that comparing the session IDs is
++ * sufficient. */
++static int SSL_SESSION_cmp(SSL_SESSION *a, SSL_SESSION *b)
++{
++return a->session_id_length == b->session_id_length
++&& memcmp(a->session_id, b->session_id, a->session_id_length) == 0;
++}
++
+ /* For internal use only. */
+ int ne__negotiate_ssl(ne_session *sess)
+ {
diff -r 22739a15eec4 -r c6a44fc1b614 rules/sitecopy.in
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/rules/sitecopy.in Di Jun 14 21:54:48 2011 +0200
@@ -0,0 +1,57 @@
+## SECTION=networking
+
+menuconfig SITECOPY
+ tristate
+ prompt "sitecopy "
+ select EXPATif SITECOPY_XML_EXPAT
+ select LIBXML2 if SITECOPY_XML_LIBXML2
+ select OPENSSL if SITECOPY_OPENSSL
+ help
+ Synchronize local and remote web site via FTP or WebDAV
+
+if SITECOPY
+
+config SITECOPY_FTP
+ bool
+ prompt "FTP support enabled"
+ help
+ Build with FTP support. No additional dependencies.
+
+config SITECOPY_RSH
+ bool
+ prompt "rsh/rcp support enabled"
+ help
+ Build with rsh/rcp support. No additional dependencies.
+
+config SITECOPY_SFTP
+ bool
+ prompt "sftp/scp support enabled"
+ help
+ Build with sftp/scp support. No additional dependencies.
+
+config SITECOPY_WEBDAV
+ bool
+ prompt "WebDAV support enabled"
+ help
+ Build with WebDAV support. No additional dependencies.
+
+config SITECOPY_OPENSSL
+ bool
+ prompt "SSL support with OpenSSL"
+ help
+ Build with SSL support. Required OpenSSL to be built.
+
+choice
+ prompt "xml library "
+ default SITECOPY_XML_EXPAT
+
+ config SITECOPY_XML_EXPAT
+ bool
+ prompt "expat "
+
+ config SITECOPY_XML_LIBXML2
+ bool
+ prompt "libxml2"
+endchoice
+
+endif
diff -r 22739a15eec4 -r c6a44fc1b614 rules/sitecopy.make
--- /dev/null Do Jan 01 00:00:00 1970 +
+++ b/rules/sitecopy.make Di Jun 14 21:54:48 2011 +0200
@@ -0,0 +1,100 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2011 by Bernhard Walle
+#
+# 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_SITECOPY) += sitecopy
+
+#
+# Paths and names
+#
+SITECOPY_VERSION := 0.16.6
+SITECOPY_MD5 := b3aeb5a5f00af3db90b408e8c32a6c01
+SITECOPY := sitecopy-$(SITECOPY_VERSION)
+SITECOPY_SUFFIX:= tar.gz
+SITECOPY_URL :=
http://www.manyfish.co.uk/sitecopy/$(SITECOPY).$(SITECOPY_SUFFIX)
+SITECOPY_SOURCE:= $(SRCDIR)/$(SITECOPY).$(SITECOPY_SUFFIX)
+SITECOPY_DIR := $(BUILDDIR)/$(SITECOPY)
+SITECOPY_LICENSE := unknown
+
+#
+# Prepare
+#
+
+#
+# autoconf
+#
+SITECOPY_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+ --disable-gnomefe \
+ --enable-threadsafe-ssl=posix \
+ --disable-nls \
+ --enable-threads=posix \
+ --disable-rpath \
+ --without-pakchois \
+ --without-socks \
+ --without-gssapi
+
+ifdef PTXCONF_SITECOPY_SFTP
+SITECOPY_AUTOCONF += --enable-sftp
+else
+SITECOPY_AUTOCONF += --disable-sftp
+endif
+
+ifdef PTXCONF_SITECOPY_RSH
+SITECOPY_AUTOCONF += --enable-rsh
+else
+SITECOPY_AUTOCONF += --disable-rsh
+endif
+
+ifdef
[ptxdist] [PATCH] Add serdisplib package
Signed-off-by: Bernhard Walle diff -r 738d48773e7a -r 22739a15eec4 patches/serdisplib-1.97.9/autogen.sh --- /dev/null Do Jan 01 00:00:00 1970 + +++ b/patches/serdisplib-1.97.9/autogen.sh Di Jun 14 21:01:32 2011 +0200 @@ -0,0 +1,1 @@ +../autogen.sh \ No newline at end of file diff -r 738d48773e7a -r 22739a15eec4 patches/serdisplib-1.97.9/serdisplib-1.97.9-add-Support-for-DESTDIR.patch --- /dev/null Do Jan 01 00:00:00 1970 + +++ b/patches/serdisplib-1.97.9/serdisplib-1.97.9-add-Support-for-DESTDIR.patch Di Jun 14 21:01:32 2011 +0200 @@ -0,0 +1,70 @@ +From f2c935dac0bca0d0754457968fd57f9ff227af18 Mon Sep 17 00:00:00 2001 +From: Bernhard Walle +Date: Sat, 28 May 2011 14:58:40 +0200 +Subject: [PATCH] serdisplib: Add Support for DESTDIR + +Signed-off-by: Bernhard Walle +--- + Makefile.in |6 +++--- + src/Makefile.in |8 + tools/Makefile.in |8 + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 7a1a7eb..101966c 100644 +--- a/Makefile.in b/Makefile.in +@@ -9,9 +9,9 @@ top_srcdir = @top_srcdir@ + srcdir = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-bindir = @bindir@ +-libdir = @libdir@ +-mandir = @mandir@ ++bindir = $(DESTDIR)@bindir@ ++libdir = $(DESTDIR)@libdir@ ++mandir = $(DESTDIR)@mandir@ + abs_top_srcdir=@abs_top_srcdir@ + base_abs_top_srcdir=$(shell /bin/basename $(abs_top_srcdir)) + current_timestamp=$(shell /bin/date '+%Y%m%d-%H%M') +diff --git a/src/Makefile.in b/src/Makefile.in +index 930b65a..c554f2c 100644 +--- a/src/Makefile.in b/src/Makefile.in +@@ -22,10 +22,10 @@ top_srcdir = @top_srcdir@ + srcdir = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-bindir = @bindir@ +-libdir = @libdir@ +-mandir = @mandir@ +-includedir = @includedir@ ++bindir = $(DESTDIR)@bindir@ ++libdir = $(DESTDIR)@libdir@ ++mandir = $(DESTDIR)@mandir@ ++includedir = $(DESTDIR)@includedir@ + + CC=@CC@ + AR=@AR@ -r +diff --git a/tools/Makefile.in b/tools/Makefile.in +index 8d29739..5a748f7 100644 +--- a/tools/Makefile.in b/tools/Makefile.in +@@ -10,10 +10,10 @@ top_srcdir = @top_srcdir@ + srcdir = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-bindir = @bindir@ +-libdir = @libdir@ +-mandir = @mandir@ +-includedir = @includedir@ ++bindir = $(DESTDIR)@bindir@ ++libdir = $(DESTDIR)@libdir@ ++mandir = $(DESTDIR)@mandir@ ++includedir = $(DESTDIR)@includedir@ + + CC=@CC@ + AR=@AR@ -r +-- +1.7.5.2 + diff -r 738d48773e7a -r 22739a15eec4 patches/serdisplib-1.97.9/series --- /dev/null Do Jan 01 00:00:00 1970 + +++ b/patches/serdisplib-1.97.9/series Di Jun 14 21:01:32 2011 +0200 @@ -0,0 +1,1 @@ +serdisplib-1.97.9-add-Support-for-DESTDIR.patch diff -r 738d48773e7a -r 22739a15eec4 rules/serdisplib.in --- /dev/null Do Jan 01 00:00:00 1970 + +++ b/rules/serdisplib.in Di Jun 14 21:01:32 2011 +0200 @@ -0,0 +1,17 @@ +## SECTION=system_libraries + +config SERDISPLIB + tristate + prompt "serdisplib" + select LIBUSB_COMPAT + help + Library to drive serial displays with built-in controllers. + +config SERDISPLIB_TESTSERDISP + bool + prompt "Install testserdisp on target" + depends on SERDISPLIB + help + If selected, the testserdisp test program will be installed on + the target. + diff -r 738d48773e7a -r 22739a15eec4 rules/serdisplib.make --- /dev/null Do Jan 01 00:00:00 1970 + +++ b/rules/serdisplib.make Di Jun 14 21:01:32 2011 +0200 @@ -0,0 +1,73 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Bernhard Walle +# +# 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_SERDISPLIB) += serdisplib + +# +# Paths and names +# +SERDISPLIB_VERSION := 1.97.9 +SERDISPLIB_MD5 := 130552ec60d01e974712a60274f34de7 +SERDISPLIB := serdisplib-$(SERDISPLIB_VERSION) +SERDISPLIB_SUFFIX := tar.gz +SERDISPLIB_URL := http://ignum.dl.sourceforge.net/project/serdisplib/serdisplib/$(SERDISPLIB_VERSION)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX) +SERDISPLIB_SOURCE := $(SRCDIR)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX) +SERDISPLIB_DIR := $(BUILDDIR)/$(SERDISPLIB) +SERDISPLIB_LICENSE := GPL + +# +# Get +# + +$(SERDISPLIB_SOURCE): + @$(call targetinfo) + @$(call get, SERDISPLIB) + +# +# Prepare +# + +#SERDISPLIB_CONF_ENV := $(CROSS_ENV) + +# +# autoconf +# +SERDISPLIB_CONF_TOOL := autoconf +SERDISPLIB_CONF_OPT:= \ + $(CROSS_AUTOCONF_
[ptxdist] [PATCH] Fix PTXCONF_DROPBEAR_KEY_DIR in /etc/init.d/dropbear
As far as I can see, 0e0f5d31e0e004717320d732154d700405a13b31 broke it. Signed-off-by: Bernhard Walle diff -r 5e07f35294bf -r 0f1bda2b5dab generic/etc/init.d/dropbear --- a/generic/etc/init.d/dropbear So Jun 12 09:45:55 2011 +0200 +++ b/generic/etc/init.d/dropbear So Jun 12 18:04:54 2011 +0200 @@ -16,6 +16,10 @@ test -z "$DROPBEAR_BANNER" || \ DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -b $DROPBEAR_BANNER" +test -n "$DROPBEAR_RSAKEY" || \ + DROPBEAR_RSAKEY=$DROPBEAR_RSAKEY_DEFAULT +test -n "$DROPBEAR_DSSKEY" || \ + DROPBEAR_DSSKEY=$DROPBEAR_DSSKEY_DEFAULT test -n "$DROPBEAR_KEYTYPES" || \ DROPBEAR_KEYTYPES="rsa dss" -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Update gnuplot to 4.4.3
Latest and greatest. I didn't discover problems. Signed-off-by: Bernhard Walle diff -r cdce85a6b513 -r 5e07f35294bf rules/gnuplot.make --- a/rules/gnuplot.makeSo Jun 12 09:38:23 2011 +0200 +++ b/rules/gnuplot.makeSo Jun 12 09:45:55 2011 +0200 @@ -16,8 +16,8 @@ # # Paths and names # -GNUPLOT_VERSION:= 4.2.6 -GNUPLOT_MD5:= c10468d74030e8bed0fd6865a45cf1fd +GNUPLOT_VERSION:= 4.4.3 +GNUPLOT_MD5:= 639603752996f4923bc02c895fa03b45 GNUPLOT:= gnuplot-$(GNUPLOT_VERSION) GNUPLOT_SUFFIX := tar.gz GNUPLOT_URL:= $(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX) -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Add sitecopy
Sitecopy is a simple tool to synchronize local and remote web site via FTP or WebDAV. Signed-off-by: Bernhard Walle diff -r aaf41af0b677 -r cdce85a6b513 rules/sitecopy.in --- /dev/null Do Jan 01 00:00:00 1970 + +++ b/rules/sitecopy.in So Jun 12 09:38:23 2011 +0200 @@ -0,0 +1,8 @@ +## SECTION=networking + +config SITECOPY + tristate + prompt "sitecopy" + select LIBXML2 + help + Synchronize local and remote web site via FTP or WebDAV diff -r aaf41af0b677 -r cdce85a6b513 rules/sitecopy.make --- /dev/null Do Jan 01 00:00:00 1970 + +++ b/rules/sitecopy.make So Jun 12 09:38:23 2011 +0200 @@ -0,0 +1,64 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Bernhard Walle +# +# 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_SITECOPY) += sitecopy + +# +# Paths and names +# +SITECOPY_VERSION := 0.16.6 +SITECOPY_MD5 := b3aeb5a5f00af3db90b408e8c32a6c01 +SITECOPY := sitecopy-$(SITECOPY_VERSION) +SITECOPY_SUFFIX:= tar.gz +SITECOPY_URL := http://www.manyfish.co.uk/sitecopy/$(SITECOPY).$(SITECOPY_SUFFIX) +SITECOPY_SOURCE:= $(SRCDIR)/$(SITECOPY).$(SITECOPY_SUFFIX) +SITECOPY_DIR := $(BUILDDIR)/$(SITECOPY) +SITECOPY_LICENSE := unknown + +# +# Get +# + +$(SITECOPY_SOURCE): + @$(call targetinfo) + @$(call get, SITECOPY) + +# +# Prepare +# + +# +# autoconf +# +SITECOPY_CONF_TOOL := autoconf + +# +# Target-Install +# + +$(STATEDIR)/sitecopy.targetinstall: + @$(call targetinfo) + + @$(call install_init, sitecopy) + @$(call install_fixup, sitecopy,PRIORITY,optional) + @$(call install_fixup, sitecopy,SECTION,base) + @$(call install_fixup, sitecopy,AUTHOR,"Bernhard Walle ") + @$(call install_fixup, sitecopy,DESCRIPTION,missing) + + @$(call install_copy, sitecopy, 0, 0, 0755, -, /usr/bin/sitecopy) + + @$(call install_finish, sitecopy) + + @$(call touch) + +# vim: syntax=make -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Add serdisplib package
Signed-off-by: Bernhard Walle --- rules/serdisplib.in | 17 + rules/serdisplib.make | 64 + 2 files changed, 81 insertions(+), 0 deletions(-) create mode 100644 rules/serdisplib.in create mode 100644 rules/serdisplib.make diff --git a/rules/serdisplib.in b/rules/serdisplib.in new file mode 100644 index 000..4a2ea4e --- /dev/null +++ b/rules/serdisplib.in @@ -0,0 +1,17 @@ +## SECTION=system_libraries + +config SERDISPLIB + tristate + prompt "serdisplib" + select LIBUSB_COMPAT + help + Library to drive serial displays with built-in controllers. + +config SERDISPLIB_TESTSERDISP + bool + prompt "Install testserdisp on target" + depends on SERDISPLIB + help + If selected, the testserdisp test program will be installed on + the target. + diff --git a/rules/serdisplib.make b/rules/serdisplib.make new file mode 100644 index 000..5a9971c --- /dev/null +++ b/rules/serdisplib.make @@ -0,0 +1,64 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Bernhard Walle +# +# 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_SERDISPLIB) += serdisplib + +# +# Paths and names +# +SERDISPLIB_VERSION := 1.97.9 +SERDISPLIB_MD5 := 130552ec60d01e974712a60274f34de7 +SERDISPLIB := serdisplib-$(SERDISPLIB_VERSION) +SERDISPLIB_SUFFIX := tar.gz +SERDISPLIB_URL := $(PTXCONF_SETUP_SFMIRROR)/project/serdisplib/serdisplib/$(SERDISPLIB_VERSION)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX) +SERDISPLIB_SOURCE := $(SRCDIR)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX) +SERDISPLIB_DIR := $(BUILDDIR)/$(SERDISPLIB) +SERDISPLIB_LICENSE := GPL + + +# +# Prepare +# + +# +# autoconf +# +SERDISPLIB_CONF_TOOL := autoconf +SERDISPLIB_CONF_OPT:= \ + $(CROSS_AUTOCONF_USR) \ + --enable-libusb + +# +# Target-Install +# + +$(STATEDIR)/serdisplib.targetinstall: + @$(call targetinfo) + + @$(call install_init, serdisplib) + @$(call install_fixup, serdisplib,PRIORITY,optional) + @$(call install_fixup, serdisplib,SECTION,base) + @$(call install_fixup, serdisplib,AUTHOR,"Bernhard Walle ") + @$(call install_fixup, serdisplib,DESCRIPTION,missing) + + @$(call install_lib, serdisplib, 0, 0, 0644, libserdisp) + +ifdef PTXCONF_SERDISPLIB_TESTSERDISP + @$(call install_copy, serdisplib, 0, 0, 0755, -, /usr/bin/testserdisp) +endif + + @$(call install_finish, serdisplib) + + @$(call touch) + +# vim: syntax=make -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Add serdisplib package
Signed-off-by: Bernhard Walle --- rules/serdisplib.in | 17 +++ rules/serdisplib.make | 73 + 2 files changed, 90 insertions(+), 0 deletions(-) create mode 100644 rules/serdisplib.in create mode 100644 rules/serdisplib.make diff --git a/rules/serdisplib.in b/rules/serdisplib.in new file mode 100644 index 000..4a2ea4e --- /dev/null +++ b/rules/serdisplib.in @@ -0,0 +1,17 @@ +## SECTION=system_libraries + +config SERDISPLIB + tristate + prompt "serdisplib" + select LIBUSB_COMPAT + help + Library to drive serial displays with built-in controllers. + +config SERDISPLIB_TESTSERDISP + bool + prompt "Install testserdisp on target" + depends on SERDISPLIB + help + If selected, the testserdisp test program will be installed on + the target. + diff --git a/rules/serdisplib.make b/rules/serdisplib.make new file mode 100644 index 000..01c53b3 --- /dev/null +++ b/rules/serdisplib.make @@ -0,0 +1,73 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Bernhard Walle +# +# 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_SERDISPLIB) += serdisplib + +# +# Paths and names +# +SERDISPLIB_VERSION := 1.97.9 +SERDISPLIB_MD5 := 130552ec60d01e974712a60274f34de7 +SERDISPLIB := serdisplib-$(SERDISPLIB_VERSION) +SERDISPLIB_SUFFIX := tar.gz +SERDISPLIB_URL := http://ignum.dl.sourceforge.net/project/serdisplib/serdisplib/$(SERDISPLIB_VERSION)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX) +SERDISPLIB_SOURCE := $(SRCDIR)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX) +SERDISPLIB_DIR := $(BUILDDIR)/$(SERDISPLIB) +SERDISPLIB_LICENSE := GPL + +# +# Get +# + +$(SERDISPLIB_SOURCE): + @$(call targetinfo) + @$(call get, SERDISPLIB) + +# +# Prepare +# + +#SERDISPLIB_CONF_ENV := $(CROSS_ENV) + +# +# autoconf +# +SERDISPLIB_CONF_TOOL := autoconf +SERDISPLIB_CONF_OPT:= \ + $(CROSS_AUTOCONF_USR) \ + --enable-libusb + +# +# Target-Install +# + +$(STATEDIR)/serdisplib.targetinstall: + @$(call targetinfo) + + @$(call install_init, serdisplib) + @$(call install_fixup, serdisplib,PRIORITY,optional) + @$(call install_fixup, serdisplib,SECTION,base) + @$(call install_fixup, serdisplib,AUTHOR,"Bernhard Walle ") + @$(call install_fixup, serdisplib,DESCRIPTION,missing) + + @$(call install_lib, serdisplib, 0, 0, 0644, libserdisp) + +ifdef PTXCONF_SERDISPLIB_TESTSERDISP + @$(call install_copy, serdisplib, 0, 0, 0755, -, /usr/bin/testserdisp) +endif + + @$(call install_finish, serdisplib) + + @$(call touch) + +# vim: syntax=make -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Qt 4.7
* Tim Sander [2011-06-08 16:39]: > Hi Marius > > because we have to use Qt 4.7, I have ported most of the patches written > > for Qt 4.6.3 to work with Qt 4.7.2. > > I also added a menu entry to the qt4.in to give the user the choise > > which version of Qt to build (4.6 or 4.7) and I modified the makefile to > > recognize this choise. > > > > Is their any interest to adopt this changes to PTXdist? In this caise, I > > would clean up my patches a little bit and would send them afterwards to > > this mailinglist. > I for one would be interested in your changes. +1. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] busybox: Fix build with make 3.82
This is the original patch from upstream http://git.busybox.net/busybox/commit/?h=1_18_stable&id=adbe3b5b982874071b9b826cea1632fc00c85982. Signed-off-by: Bernhard Walle --- .../0001-reactivate-check-for-tty.patch|2 +- ...nstant-unsigned-to-avoid-integer-overflow.patch |2 +- ...ild-system-make-3.82-fix.-Closes-bug-2323.patch | 46 patches/busybox-1.17.1/series |3 +- 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 patches/busybox-1.17.1/0003-build-system-make-3.82-fix.-Closes-bug-2323.patch diff --git a/patches/busybox-1.17.1/0001-reactivate-check-for-tty.patch b/patches/busybox-1.17.1/0001-reactivate-check-for-tty.patch index 059d2f6..d42fb51 100644 --- a/patches/busybox-1.17.1/0001-reactivate-check-for-tty.patch +++ b/patches/busybox-1.17.1/0001-reactivate-check-for-tty.patch @@ -27,5 +27,5 @@ index 9befa2b..e65e25c 100644 case 'd': input_mode = set_default; -- -1.7.1 +1.7.5.1 diff --git a/patches/busybox-1.17.1/0002-make-constant-unsigned-to-avoid-integer-overflow.patch b/patches/busybox-1.17.1/0002-make-constant-unsigned-to-avoid-integer-overflow.patch index a29ff31..3a2c88d 100644 --- a/patches/busybox-1.17.1/0002-make-constant-unsigned-to-avoid-integer-overflow.patch +++ b/patches/busybox-1.17.1/0002-make-constant-unsigned-to-avoid-integer-overflow.patch @@ -21,5 +21,5 @@ index b55af6d..4ec4b08 100644 #else COMPRESS_MAGIC = 0x9d1f, -- -1.7.1 +1.7.5.1 diff --git a/patches/busybox-1.17.1/0003-build-system-make-3.82-fix.-Closes-bug-2323.patch b/patches/busybox-1.17.1/0003-build-system-make-3.82-fix.-Closes-bug-2323.patch new file mode 100644 index 000..ecd8653 --- /dev/null +++ b/patches/busybox-1.17.1/0003-build-system-make-3.82-fix.-Closes-bug-2323.patch @@ -0,0 +1,46 @@ +From: Denys Vlasenko +Date: Sun, 22 Aug 2010 07:28:46 + +Subject: [PATCH] build system: make 3.82 fix. Closes bug 2323 + +Signed-off-by: Denys Vlasenko +Signed-off-by: Bernhard Walle +--- + Makefile | 13 +++-- + 1 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 03e9885..a1e9cce 100644 +--- a/Makefile b/Makefile +@@ -433,7 +433,12 @@ ifeq ($(config-targets),1) + -include $(srctree)/arch/$(ARCH)/Makefile + export KBUILD_DEFCONFIG + +-config %config: scripts_basic outputmakefile gen_build_files FORCE ++config: scripts_basic outputmakefile gen_build_files FORCE ++ $(Q)mkdir -p include ++ $(Q)$(MAKE) $(build)=scripts/kconfig $@ ++ $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease ++ ++%config: scripts_basic outputmakefile gen_build_files FORCE + $(Q)mkdir -p include + $(Q)$(MAKE) $(build)=scripts/kconfig $@ + $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease +@@ -1285,9 +1290,13 @@ endif + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) + + # Modules +-/ %/: prepare scripts FORCE ++%/: prepare scripts FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) ++/: prepare scripts FORCE ++ $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ ++ $(build)=$(build-dir) ++ + %.ko: prepare scripts FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) $(@:.ko=.o) +-- +1.7.5.1 + diff --git a/patches/busybox-1.17.1/series b/patches/busybox-1.17.1/series index aaa104a..559fd11 100644 --- a/patches/busybox-1.17.1/series +++ b/patches/busybox-1.17.1/series @@ -1,4 +1,5 @@ # generated by git-ptx-patches 0001-reactivate-check-for-tty.patch 0002-make-constant-unsigned-to-avoid-integer-overflow.patch -# c20526b5b00fb9214f7c11f09bfa60c8 - git-ptx-patches magic +0003-build-system-make-3.82-fix.-Closes-bug-2323.patch +# e028d583e9f6b6fec5ad3deb8a550489 - git-ptx-patches magic -- 1.7.5.1 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Define CMAKE_SYSTEM_PROCESSOR
* Michael Olbrich [2011-05-09 12:36]: > > any reason, why you're using PTXDIST_IPKG_ARCH_STRING instead of > PTXCONF_ARCH_STRING? No, PTXDIST_IPKG_ARCH_STRING was just the one I found. Should I resend the patch with PTXCONF_ARCH_STRING? Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Use PYTHON from configure in rules/pre/Rules.make
Arch Linux is probably the only Linux distribution currently that points
/usr/bin/python to /usr/bin/python2. So one has to use explicitly
/usr/bin/python2 to use Python 2.
Since there is already an option in the configure script, use that
script to generate rules/pre/Rules.make from rules/pre/Rules.make.in
and install the replaced version.
Signed-off-by: Bernhard Walle
---
.gitignore |1 +
configure.ac|1 +
rules/pre/{Rules.make => Rules.make.in} |2 +-
3 files changed, 3 insertions(+), 1 deletions(-)
rename rules/pre/{Rules.make => Rules.make.in} (99%)
diff --git a/.gitignore b/.gitignore
index 2548524..483ef50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
/Makefile
/.done
/.tarball-version
+/rules/pre/Rules.make
*.orig
*.swp
diff --git a/configure.ac b/configure.ac
index 7a34e7a..474ff1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -419,6 +419,7 @@ AC_SUBST(BASH_COMPLETION_DIR)
AC_MSG_RESULT([])
AC_CONFIG_FILES( \
Makefile \
+ rules/pre/Rules.make \
)
AC_OUTPUT
AC_MSG_RESULT([])
diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make.in
similarity index 99%
rename from rules/pre/Rules.make
rename to rules/pre/Rules.make.in
index c531a50..b8b5d23 100644
--- a/rules/pre/Rules.make
+++ b/rules/pre/Rules.make.in
@@ -323,7 +323,7 @@ HOST_ENV_PKG_CONFIG := \
PKG_CONFIG_LIBDIR="$(PTXDIST_SYSROOT_HOST)/lib/pkgconfig:$(PTXDIST_SYSROOT_HOST)/share/pkgconfig"
HOST_ENV_PYTHONPATH:= \
- PYTHONPATH="$(shell python -c 'import distutils.sysconfig as sysconfig;
\
+ PYTHONPATH="$(shell @PYTHON@ -c 'import distutils.sysconfig as
sysconfig; \
print "%s" %
sysconfig.get_python_lib(prefix="'"$(PTXDIST_SYSROOT_HOST)"'")')"
HOST_ENV := \
--
1.7.5
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] Download file verification
* Robert Schwebel [2011-05-03 20:14]: > On Tue, May 03, 2011 at 09:39:09AM +0200, Bernhard Walle wrote: > > > Michael has a branch which is still work-in-progress which adds > > > checksumming. > > > > That's good news. But I didn't find that branch on the public git > > server. Did I miss something? > > Michael will take care of that, probably after the 2011.05.0 release. Ah, ok, that's good news. Thanks a lot! Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Download file verification
* Robert Schwebel [2011-05-02 17:23]: > On Mon, May 02, 2011 at 04:57:53PM +0200, Bernhard Walle wrote: > > Please correct me if I'm wrong: ptxdist doesn't have a checksum > > mechanism to verify that a downloaded file (e.g. a tarball from > > upstream) is the same as it was when the package has been created. > > > > Some other build systems like OpenEmbedded or desktop build systems > > like ABS (Arch Linux) / Gentoo store a md5sum (or sha1 or something > > else) in the package description file. > > > > Is it planned to add such a feature to ptxdist? Would a patch that > > adds the feature get accepted or do you think that it's too much > > effort to maintain? > > Michael has a branch which is still work-in-progress which adds > checksumming. That's good news. But I didn't find that branch on the public git server. Did I miss something? Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Download file verification
Hello, Please correct me if I'm wrong: ptxdist doesn't have a checksum mechanism to verify that a downloaded file (e.g. a tarball from upstream) is the same as it was when the package has been created. Some other build systems like OpenEmbedded or desktop build systems like ABS (Arch Linux) / Gentoo store a md5sum (or sha1 or something else) in the package description file. Is it planned to add such a feature to ptxdist? Would a patch that adds the feature get accepted or do you think that it's too much effort to maintain? Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
