Re: [ptxdist] [PATCH] libnl: version bump 1.1 - 2.0
Bump On Fri, Jun 10, 2011 at 9:28 AM, Jon Ringle j...@ringle.org wrote: Signed-off-by: Jon Ringle j...@ringle.org --- rules/libnl.make | 15 --- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/rules/libnl.make b/rules/libnl.make index e34595d..c735ed1 100644 --- a/rules/libnl.make +++ b/rules/libnl.make @@ -17,23 +17,15 @@ PACKAGES-$(PTXCONF_LIBNL) += libnl # # Paths and names # -LIBNL_VERSION := 1.1 -LIBNL_MD5 := ae970ccd9144e132b68664f98e7ceeb1 +LIBNL_VERSION := 2.0 +LIBNL_MD5 := 6aaf1e9802a17a7d702bb0638044ffa7 LIBNL := libnl-$(LIBNL_VERSION) LIBNL_SUFFIX := tar.gz -LIBNL_URL := http://people.suug.ch/~tgr/libnl/files/$(LIBNL).$(LIBNL_SUFFIX) +LIBNL_URL := http://www.infradead.org/~tgr/libnl/files/$(LIBNL).$(LIBNL_SUFFIX) LIBNL_SOURCE := $(SRCDIR)/$(LIBNL).$(LIBNL_SUFFIX) LIBNL_DIR := $(BUILDDIR)/$(LIBNL) # -# Get -# - -$(LIBNL_SOURCE): - @$(call targetinfo) - @$(call get, LIBNL) - -# # Prepare # @@ -59,6 +51,7 @@ $(STATEDIR)/libnl.targetinstall: @$(call install_fixup, libnl,DESCRIPTION,missing) @$(call install_lib, libnl, 0, 0, 0644, libnl) + @$(call install_lib, libnl, 0, 0, 0644, libnl-genl) ifdef PTXCONF_LIBNL_MONITOR @$(call install_copy, libnl, 0, 0, 0755, -, /usr/sbin/nl-monitor) -- 1.7.0.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libpcap: Add support for libnl-2.0
Bump On Fri, Jun 10, 2011 at 9:28 AM, Jon Ringle j...@ringle.org wrote: Upstream commit that enables support for libnl-2: https://github.com/mcr/libpcap/commit/bc937fc4ff6715e9bee939041fa02be0755d7d58 patch series rebuilt with git-ptx-patches Signed-off-by: Jon Ringle j...@ringle.org --- ...FLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch | 12 +- .../0002-build-and-install-share-lib-only.patch | 38 +++ .../0002-dont-compile-static-lib.diff | 34 -- .../0003-pcap-config-add-SYSROOT-support.patch | 57 ...-for-libnl-2.x-adapted-from-a-newer-versi.patch | 343 .../0004-pcap-config-add-SYSROOT-support.patch | 55 patches/libpcap-1.1.1/series | 7 +- 7 files changed, 450 insertions(+), 96 deletions(-) create mode 100644 patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch delete mode 100644 patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff create mode 100644 patches/libpcap-1.1.1/0003-pcap-config-add-SYSROOT-support.patch create mode 100644 patches/libpcap-1.1.1/0004-Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch delete mode 100644 patches/libpcap-1.1.1/0004-pcap-config-add-SYSROOT-support.patch diff --git a/patches/libpcap-1.1.1/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch b/patches/libpcap-1.1.1/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch index 25e5c9d..d772bc0 100644 --- a/patches/libpcap-1.1.1/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch +++ b/patches/libpcap-1.1.1/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch @@ -1,7 +1,6 @@ -From 80513b7c807126fddedf114d6cc35f873f9ebd16 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde m...@pengutronix.de Date: Sun, 10 Jan 2010 00:47:38 +0100 -Subject: [PATCH 1/4] add CFLAGS, CPPFLAGS and LDFLAGS to Makefile.in +Subject: [PATCH] add CFLAGS, CPPFLAGS and LDFLAGS to Makefile.in the build system is autoconf but not automake :( It doesn't care about CFLAGS or CPPFLAGS from outside. @@ -10,10 +9,10 @@ This patch adds them. Signed-off-by: Marc Kleine-Budde m...@pengutronix.de --- Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 1 files changed, 1 insertions(+), 1 deletions(-) -Index: b/Makefile.in -=== +diff --git a/Makefile.in b/Makefile.in +index f576462..ee9bfca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,7 +58,7 @@ V_RPATH_OPT = @V_RPATH_OPT@ @@ -25,3 +24,6 @@ Index: b/Makefile.in INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-- +1.7.0.4 + diff --git a/patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch b/patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch new file mode 100644 index 000..c1bf462 --- /dev/null +++ b/patches/libpcap-1.1.1/0002-build-and-install-share-lib-only.patch @@ -0,0 +1,38 @@ +From: Michael Olbrich m.olbr...@pengutronix.de +Date: Fri, 10 Jun 2011 08:57:31 -0400 +Subject: [PATCH] build and install share lib only + +This patch removes the static library from the dependency list +for all and install. This way libpcap.a is not built and +tcpdump cannot link against it. + +Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de +--- + Makefile.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index ee9bfca..6cab4e5 100644 +--- a/Makefile.in b/Makefile.in +@@ -324,7 +324,7 @@ EXTRA_DIST = \ + Win32/Src/inet_net.c \ + Win32/Src/inet_pton.c + +-all: libpcap.a shared pcap-config ++all: shared pcap-config + + libpcap.a: $(OBJ) + @rm -f $@ +@@ -497,7 +497,7 @@ selpolltest: selpolltest.c libpcap.a + opentest: opentest.c libpcap.a + $(CC) $(CFLAGS) -I. -L. -o opentest $(srcdir)/opentest.c libpcap.a $(LIBS) + +-install: install-shared install-archive pcap-config ++install: install-shared pcap-config + [ -d $(DESTDIR)$(libdir) ] || \ + (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + [ -d $(DESTDIR)$(includedir) ] || \ +-- +1.7.0.4 + diff --git a/patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff b/patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff deleted file mode 100644 index fefd05e..000 --- a/patches/libpcap-1.1.1/0002-dont-compile-static-lib.diff +++ /dev/null @@ -1,34 +0,0 @@ -From: Michael Olbrich m.olbr...@pengutronix.de -Subject: build and install share lib only - -This patch removes the static library from the dependency list -for all and install. This way libpcap.a is not built and -tcpdump cannot link against it. - -Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: b/Makefile.in -===
Re: [ptxdist] [PATCH] git-ptx-patches: Allow patches before base tag
Bump
On Tue, Jun 14, 2011 at 1:52 PM, Jon Ringle j...@ringle.org wrote:
The patch series I have for the Linux kernel includes incremental patches
from upstream like
patch-2.6.33.1.bz2
patch-2.6.33.1-2.bz2
followed by a patch series for my board.
But ptxdist messes this up when applying the patch series with git.
This patch allows one to mark the base tag in the series with:
#base
Patches between # generated by git-ptx-patches and #base are left
untouched in the series
e.g.:
# generated by git-ptx-patches
patch-2.6.33.1.bz2
patch-2.6.33.1-2.bz2
patch-2.6.33.2-3.bz2
#base
0001-000-mspd-kernel_linux_33_6_00_6.patch.patch
0002-xfrm-fix-comcerto-hacks-by-Mindspeed.patch
0003-si3220-Fix-for-2.6.33.patch
# 25a3096f40bc8d841c8bf3ec24dd101f - git-ptx-patches magic
Signed-off-by: Jon Ringle j...@ringle.org
---
scripts/git-ptx-patches | 31 +--
scripts/lib/ptxd_make_world_patchin.sh | 17 -
2 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches
index c5eb405..898a1dc 100755
--- a/scripts/git-ptx-patches
+++ b/scripts/git-ptx-patches
@@ -31,6 +31,15 @@ if grep -q $PTX_PATCHES_HEADER .ptxdist/series; then
fi
fi
+if grep -q #base .ptxdist/series; then
+ sed -n /$PTX_PATCHES_HEADER/,/#base/p .ptxdist/series
.ptxdist/series.base
+ # Remove patches before #base so they don't get rm'd with remove_old=yes
+ sed /$PTX_PATCHES_HEADER/,/#base/d .ptxdist/series .ptxdist/series
+else
+ echo $PTX_PATCHES_HEADER .ptxdist/series.base
+ echo #base .ptxdist/series.base
+fi
+
if [ x$1 = x--force-remove ]; then
remove_old=force
fi
@@ -53,7 +62,13 @@ case $remove_old in
.ptxdist/patches/) continue ;;
.ptxdist/patches/series) continue ;;
.ptxdist/patches/autogen.sh) continue ;;
- *) rm -rf $file ;;
+ *)
+ if grep -q
${file##\.ptxdist/patches/} .ptxdist/series.base; then
+ echo Keep base patch ${file}
+ else
+ rm -rf $file
+ fi
+ ;;
esac
done
;;
@@ -63,8 +78,9 @@ if git format-patch -h 21 | grep -q signature; then
GIT_EXTRA_ARGS=--no-signature
fi
-echo $PTX_PATCHES_HEADER .ptxdist/series
-git format-patch -N $GIT_EXTRA_ARGS -o .ptxdist/patches/ base | sed -e
's,^.ptxdist/patches/,,' .ptxdist/series
+cat .ptxdist/series.base .ptxdist/series
+git format-patch -N $GIT_EXTRA_ARGS -o .ptxdist/patches/ base | sed -e
's,^.ptxdist/patches/,,' .ptxdist/series.1
+cat .ptxdist/series.1 .ptxdist/series
cat .ptxdist/series | _md5sum .ptxdist/series
# The first line of the patch is 'From some-git-hash ...'
@@ -75,14 +91,17 @@ while read patch para; do
series|autogen.sh) continue ;;
*) ;;
esac
- if grep -q $patch .ptxdist/series; then
+ if grep -q $patch .ptxdist/series.1; then
p=.ptxdist/patches/$patch
lines=$(cat $p | wc -l)
lines=$[lines-1]
tail -n$lines $p .$patch.ptx-patches
mv .$patch.ptx-patches $p
else
- echo Old patch \$patch\!
+ if grep -q $patch .ptxdist/series.base; then
+ echo Base patch \$patch\!
+ else
+ echo Old patch \$patch\!
+ fi
fi
done
-
diff --git a/scripts/lib/ptxd_make_world_patchin.sh
b/scripts/lib/ptxd_make_world_patchin.sh
index bbb7490..1f0d3c0 100644
--- a/scripts/lib/ptxd_make_world_patchin.sh
+++ b/scripts/lib/ptxd_make_world_patchin.sh
@@ -112,6 +112,10 @@ ptxd_make_world_patchin_apply_git_compat()
esac
case ${patch} in
+ #base)
+ mv ${pkg_patchin_dir}/.ptxdist/git-patches/series{,.base} ||
return
+ continue
+ ;;
|#*) continue ;; # skip empty lines and comments
*.gz) cat=zcat ;;
*.bz2) cat=bzcat ;;
@@ -130,7 +134,6 @@ ptxd_make_world_patchin_apply_git_compat()
}
export -f ptxd_make_world_patchin_apply_git_compat
-
#
# apply patch series with git
#
@@ -141,6 +144,18 @@ ptxd_make_world_patchin_apply_git()
#
ptxd_make_world_patchin_apply_git_compat || return
+ if [ -f ${pkg_patchin_dir}/.ptxdist/git-patches/series.base ]; then
+ mv ${pkg_patchin_dir}/.ptxdist/git-patches/series{,.1} || return
+ mv ${pkg_patchin_dir}/.ptxdist/git-patches/series{.base,} || return
+
+ git quiltimport \
+
Re: [ptxdist] [PATCH] libpcap: Add support for libnl-2.0
On Thu, Jun 16, 2011 at 01:01:17PM -0400, Jon Ringle wrote: Bump I've this on my todo. However, I know that there are other packages using libnl, and I need to see how it affects them. Unfortunately I'm rather busy lately. Regards,.. 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
Re: [ptxdist] Qt 4.7
Hi Marius, thank you very much! 2011/6/14 Marius Brehler mar...@linux.sungazer.de 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 -- ptxdist mailing list ptxdist@pengutronix.de
