Re: [ptxdist] Qt 4.7
On 06/10/11 08:01, ayserd yawsedr wrote: Hi, Im new to ptxdist. Could you please tell me what to do with this file to get Qt4.7? Thanks in advance! Hi, sorry for my late answer, we had holiday yesterday and I did have the time to answer before the weekend. In this mail I'll give you a short explanation howto apply the patches and which files have to be copied. Please note that the patches are not in ptxdist yet. So I'll describe the clean way to add the patches to your local project and not to ptxdist in general. # Copy the qt4 rule files to your local project: mkdir /YOURPROJECT/rules # if not existing cp /usr/local/lib/ptxdist-2011.06.0/rules/qt4.* /YOURPROJECT/rules/ # Apply patch, which offers choice which version of Qt to build cd /YOURPROJECT/ patch -p1 /PathToPatch/ptxdist/0001-Offer-choice-between-Qt-4.6-and-Qt-4.7.patch # Apply patch, which creates series file. # This file contains a list which patches should be applied when building Qt. mkdir /YOURPROJECT/patches # if not existing patch -p1 /PathToPatch/ptxdist/0001-Add-series-for-Qt-4.7.2.patch # Copy my patches to /YOURPROJECT/patches/qt-everywhere-opensource-src-4.7.2/ cp /PathToPatch/0002-disable-ordered-compiling.patch \ /YOURPROJECT/patches/qt-everywhere-opensource-src-4.7.2/ cp /PathToPatch/0004-add-missing-subdir.patch \ /YOURPROJECT/patches/qt-everywhere-opensource-src-4.7.2/ # Copy the following patches from # /usr/local/lib/ptxdist-2011.06.0/patches/qt-everywhere-opensource-src-4.6.3/ to # /YOURPROJECT/patches/qt-everywhere-opensource-src-4.7.2/ 0001-mkspec-for-ptxdist.patch 0003-Hack-hide-cursor-during-startup.patch 0005-Fix-dnd-issue-on-QWS.patch 0008-qmake-make-sure-local-include-dirs-come-first.patch 0009-phonon-fix-colors-for-video-on-qgraphicsview.patch Hope this helps. Best Regards Marius -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Add serdisplib package
On Sun, Jun 12, 2011 at 08:18:42AM +0200, Bernhard Walle wrote: Signed-off-by: Bernhard Walle bernh...@bwalle.de --- Hmmm, installing fails. The It's a handwritten Makefile.in without DESTDIR support. See e.g. patches/libcgi-1.0/0003-makefile-destdir.diff for an example on how to fix this. Michael 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 bernh...@bwalle.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_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 bernh...@bwalle.de) + @$(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 -- 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
Re: [ptxdist] [PATCH] Add sitecopy
On Sun, Jun 12, 2011 at 09:43:58AM +0200, Bernhard Walle wrote: Sitecopy is a simple tool to synchronize local and remote web site via FTP or WebDAV. Signed-off-by: Bernhard Walle bernh...@bwalle.de 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 hmm, from ./configure --help it looks like expat is possible too. I'd like to see an option for that. + 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 bernh...@bwalle.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_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) remove. + +# +# Prepare +# + +# +# autoconf +# +SITECOPY_CONF_TOOL := autoconf configure has a lot of options. Please add --disable-*, --without-* for everything, that's not used. Michael + +# +# 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 bernh...@bwalle.de) + @$(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 -- 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] [PATCH] git-ptx-patches: use --no-signature only when supported
Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de --- Does this patch help? Michael scripts/git-ptx-patches |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches index 8637055..04b1405 100755 --- a/scripts/git-ptx-patches +++ b/scripts/git-ptx-patches @@ -59,8 +59,12 @@ case $remove_old in ;; esac +if git format-patch -h | grep -q signature; then + GIT_EXTRA_ARGS=--no-signature +fi + echo $PTX_PATCHES_HEADER .ptxdist/series -git format-patch -N --no-signature -o .ptxdist/patches/ base | sed -e 's,^.ptxdist/patches/,,' .ptxdist/series +git format-patch -N $GIT_EXTRA_ARGS -o .ptxdist/patches/ base | sed -e 's,^.ptxdist/patches/,,' .ptxdist/series cat .ptxdist/series | _md5sum .ptxdist/series # The first line of the patch is 'From some-git-hash ...' -- 1.7.5.3 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Fix PTXCONF_DROPBEAR_KEY_DIR in /etc/init.d/dropbear
On Sun, Jun 12, 2011 at 06:14:52PM +0200, Bernhard Walle wrote: As far as I can see, 0e0f5d31e0e004717320d732154d700405a13b31 broke it. Tnx. Applied. Michael Signed-off-by: Bernhard Walle bernh...@bwalle.de 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 -- 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
Re: [ptxdist] [PATCH] Add serdisplib package
On Tue, 14 Jun 2011 11:28:14 +0200, Michael Olbrich wrote: On Sun, Jun 12, 2011 at 08:18:42AM +0200, Bernhard Walle wrote: Signed-off-by: Bernhard Walle bernh...@bwalle.de --- Hmmm, installing fails. The It's a handwritten Makefile.in without DESTDIR support. See e.g. patches/libcgi-1.0/0003-makefile-destdir.diff for an example on how to fix this. Sorry, of course already have the patch, but in my ptxdist project and I forgot to copy it to the ptxdist repo before posting the patch. Sorry about that, I'll repost the patch in the evening. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] opkg in ptxdist 2011.06.0 fails
Hello there, I tried migrating from ptxdist 2011.05.0 to 2011.06.0 today and got ask if I wanted to use ipkg or opkg for package management. When answering with opkg and building the project I get the following error: make: *** No rule to make target `/home/adahl/Work/src/isNetCube.rootfs/src/opkg-0.1.8.tar.gz', needed by `/home/adahl/Work/src/isNetCube.rootfs/platform-at91sam9g20ncl/state/host-opkg.get'. Stop. The changes in the config file are as follows: +# PTXCONF_HOST_PACKAGE_MANAGEMENT_IPKG is not set +PTXCONF_HOST_PACKAGE_MANAGEMENT_OPKG=y +PTXCONF_HOST_PACKAGE_MANAGEMENT=opkg -PTXCONF_HOST_IPKG_UTILS=y -PTXCONF_HOST_IPKG=y +# PTXCONF_HOST_IPKG_UTILS is not set +# PTXCONF_HOST_IPKG is not set +PTXCONF_HOST_OPKG_UTILS=y +PTXCONF_HOST_OPKG=y There's no file opkg-0.1.8.tar.gz in the source folder mentioned above. When switching back to ipkg everything works fine so far. Greets Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] warning caused by systemd in rule
Hei hei, after migration to ptxdist 2011.06.0 I get the following warning when running `ptxdist go`: /usr/local/lib/ptxdist-2011.06.0/rules/systemd.in:5:warning: 'select' used by config symbol 'SYSTEMD' refers to undefined symbol 'ROOTFS_RUN' I guess it's safe to ignore, especially when not using systemd, but it comes each time I call `ptxdist go`. Is this already fixed in Git? I had a look but couldn't find a changeset solving this. Greets Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] opkg in ptxdist 2011.06.0 fails
Alexander Dahl wrote: Hello there, I tried migrating from ptxdist 2011.05.0 to 2011.06.0 today and got ask if I wanted to use ipkg or opkg for package management. When answering with opkg and building the project I get the following error: make: *** No rule to make target `/home/adahl/Work/src/isNetCube.rootfs/src/opkg-0.1.8.tar.gz', needed by `/home/adahl/Work/src/isNetCube.rootfs/platform-at91sam9g20ncl/state/host-o pkg.get'. Stop. The changes in the config file are as follows: +# PTXCONF_HOST_PACKAGE_MANAGEMENT_IPKG is not set +PTXCONF_HOST_PACKAGE_MANAGEMENT_OPKG=y +PTXCONF_HOST_PACKAGE_MANAGEMENT=opkg -PTXCONF_HOST_IPKG_UTILS=y -PTXCONF_HOST_IPKG=y +# PTXCONF_HOST_IPKG_UTILS is not set +# PTXCONF_HOST_IPKG is not set +PTXCONF_HOST_OPKG_UTILS=y +PTXCONF_HOST_OPKG=y There's no file opkg-0.1.8.tar.gz in the source folder mentioned above. When switching back to ipkg everything works fine so far. Known bug (hit me a few days before). Just enable also opkg for your target. This issue will be fixed in the next PTXdist release. jbe -- Pengutronix e.K. | Juergen Beisert | Linux Solutions for Science and Industry | Phone: +49-5121-206917-5128 | Vertretung Sued/Muenchen, Germany | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de/ | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] git-ptx-patches: use --no-signature only when supported
On Tue, Jun 14, 2011 at 6:01 AM, Michael Olbrich m.olbr...@pengutronix.de wrote: Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de --- Does this patch help? Michael scripts/git-ptx-patches | 6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches index 8637055..04b1405 100755 --- a/scripts/git-ptx-patches +++ b/scripts/git-ptx-patches @@ -59,8 +59,12 @@ case $remove_old in ;; esac +if git format-patch -h | grep -q signature; then + GIT_EXTRA_ARGS=--no-signature +fi Some manual testing of 'git format-patch -h' has output going to stderr rather than stdout... Does it work for you? -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] git-ptx-patches: use --no-signature only when supported
On Tue, Jun 14, 2011 at 11:53 AM, Michael Olbrich m.olbr...@pengutronix.de wrote: On Tue, Jun 14, 2011 at 10:36:42AM -0400, Jon Ringle wrote: On Tue, Jun 14, 2011 at 6:01 AM, Michael Olbrich m.olbr...@pengutronix.de wrote: Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de +if git format-patch -h | grep -q signature; then + GIT_EXTRA_ARGS=--no-signature +fi Some manual testing of 'git format-patch -h' has output going to stderr rather than stdout... Does it work for you? Yes, 'git format-patch -h | grep -q signature' gives me no output and the correct return value. So that changed too? would this be better: if git format-patch -h 21 | grep -q signature; then Yes. That works better :) -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] git-ptx-patches: use --no-signature only when supported
On Tue, Jun 14, 2011 at 12:02:48PM -0400, Jon Ringle wrote: On Tue, Jun 14, 2011 at 11:53 AM, Michael Olbrich m.olbr...@pengutronix.de wrote: On Tue, Jun 14, 2011 at 10:36:42AM -0400, Jon Ringle wrote: On Tue, Jun 14, 2011 at 6:01 AM, Michael Olbrich m.olbr...@pengutronix.de wrote: Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de +if git format-patch -h | grep -q signature; then + GIT_EXTRA_ARGS=--no-signature +fi Some manual testing of 'git format-patch -h' has output going to stderr rather than stdout... Does it work for you? Yes, 'git format-patch -h | grep -q signature' gives me no output and the correct return value. So that changed too? would this be better: if git format-patch -h 21 | grep -q signature; then Yes. That works better :) Pushed. Michael -- 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] [PATCH] Add serdisplib package
Signed-off-by: Bernhard Walle bernh...@bwalle.de 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 bernh...@bwalle.de +Date: Sat, 28 May 2011 14:58:40 +0200 +Subject: [PATCH] serdisplib: Add Support for DESTDIR + +Signed-off-by: Bernhard Walle bernh...@bwalle.de +--- + 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 bernh...@bwalle.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_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:= \
[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 bernh...@bwalle.de
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 bernh...@bwalle.de
+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 bernh...@bwalle.de
+---
+ 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 openssl/pkcs12.h
+ #include openssl/x509v3.h
+ #include openssl/rand.h
++#include openssl/opensslv.h
+
+ #ifdef NE_HAVE_TS_SSL
+ #include stdlib.h /* 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 bernh...@bwalle.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_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
