date:20150805

[ptxdist] [PATCH] qt5 bump to 5.5.0

2015-08-05 Thread Tim Sander

Hi

Below is a bump of qt to the newest released version.
It adapts the existing patches to qt5 and adds two new modules
Qt3d and QtCanvas3d. I have not had the time to test these.
The new module qtandroidextras is skipped as it is not relevant for ptxdist.

It Works for me (tm).

Signed-off-by: Tim Sander t...@krieglstein.org
---
 ...t-qtwebengine-allow-building-with-ptxdsit.patch | 30 ---
 ...ve-is-an-optional-dependency-for-qtwebkit.patch | 22 --
 ...a-videonode-plugins-require-qtmultimediaq.patch | 23 ---
 ...HACK-put-wayland-scanner-outout-in-srcdir.patch | 24 ---
 ...tures-don-t-use-gold-linker-for-host-tool.patch | 24 ---
 patches/qt-everywhere-opensource-src-5.4.2/series  |  8 -
 ...t-qtwebengine-allow-building-with-ptxdsit.patch | 34 ++
 ...ve-is-an-optional-dependency-for-qtwebkit.patch | 26 +
 ...a-videonode-plugins-require-qtmultimediaq.patch | 27 +
 ...HACK-put-wayland-scanner-outout-in-srcdir.patch | 28 ++
 ...tures-don-t-use-gold-linker-for-host-tool.patch | 28 ++
 patches/qt-everywhere-opensource-src-5.5.0/series  |  5 
 rules/qt5.in   | 10 ++-
 rules/qt5.make | 14 +++--
 14 files changed, 169 insertions(+), 134 deletions(-)
 delete mode 100644 
patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
 delete mode 100644 
patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
 delete mode 100644 
patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
 delete mode 100644 
patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
 delete mode 100644 
patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
 delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/series
 create mode 100644 
patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
 create mode 100644 
patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
 create mode 100644 
patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
 create mode 100644 
patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
 create mode 100644 
patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
 create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/series

diff --git 
a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
 
b/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
deleted file mode 100644
index c18bbbf..000
--- 
a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Michael Olbrich m.olbr...@pengutronix.de
-Date: Tue, 12 May 2015 11:38:35 +0200
-Subject: [PATCH] ptxdist: qtwebengine: allow building with ptxdsit
-
-Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de

- qtwebengine/tools/qmake/mkspecs/features/functions.prf | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/qtwebengine/tools/qmake/mkspecs/features/functions.prf 
b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-index 4c2547d571db..6b5d34b527a5 100644
 a/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-+++ b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-@@ -12,6 +12,7 @@ defineTest(isPlatformSupported) {
-   !isPythonVersionSupported(): return(false)
-   linux-g++*|win32-msvc2013|macx-clang: return(true)
-   boot2qt: return(true)
-+  linux-ptx-g++: return(true)
- 
-   skipBuild(Qt WebEngine can currently only be built for Linux (GCC), 
Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.)
-   return(false)
-@@ -61,7 +62,7 @@ defineReplace(getChromiumSrcDir) {
- }
- 
- defineReplace(extractCFlag) {
--CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
-+CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$PTX_QMAKE_CFLAGS
- !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS
- OPTION = $$find(CFLAGS, $$1)
- OPTION = $$split(OPTION, =)
diff --git 
a/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
 
b/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
deleted file mode 100644
index 2145c91..000
--- 
a/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Michael Olbrich

[ptxdist] openssh and chrony patches

2015-08-05 Thread Clemens Gruber

Hi Michael,

would be great if my OpenSSH patch could make it into the next ptxdist release.

The chrony patch should probably stay in master for one month to ensure it does
not break anything.

Any comments on the two patches? I tested connecting to the host from ArchLinux,
Debian, Windows (Putty) and OSX. No problems so far.

Thanks,
Clemens

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] systemd: make tmpfiles support optional

2015-08-05 Thread Albert Antony

Signed-off-by: Albert Antony alb...@newtec.dk
---
 rules/systemd.in   | 5 +
 rules/systemd.make | 8 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/rules/systemd.in b/rules/systemd.in
index 979e32c..f5f17ae 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -94,5 +94,10 @@ config SYSTEMD_COREDUMP
help
  Enable this only if you need to debug a crashing systemd service
 
+config SYSTEMD_TMPFILES
+   bool
+   default y
+   prompt enable tmpfiles support
+
 endif
 
diff --git a/rules/systemd.make b/rules/systemd.make
index 46a5f97..7bfd33b 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -98,7 +98,7 @@ SYSTEMD_CONF_OPT  := \
--$(call ptx/endis,PTXCONF_SYSTEMD_VCONSOLE)-vconsole \
--enable-bootchart \
--enable-quotacheck \
-   --enable-tmpfiles \
+   --$(call ptx/endis,PTXCONF_SYSTEMD_TMPFILES)-tmpfiles \
--disable-sysusers \
--disable-firstboot \
--$(call ptx/disen,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED)-randomseed \
@@ -161,9 +161,11 @@ endif
 ifndef PTXCONF_SYSTEMD_VCONSOLE
@rm -v 
$(SYSTEMD_PKGDIR)/etc/systemd/system/getty.target.wants/getty@tty1.service
 endif
+ifdef PTXCONF_SYSTEMD_TMPFILES
 #  # don't touch /etc and /home
@rm -v $(SYSTEMD_PKGDIR)/usr/lib/tmpfiles.d/etc.conf
@rm -v $(SYSTEMD_PKGDIR)/usr/lib/tmpfiles.d/home.conf
+endif
 #  # the upstream default (graphical.target) wants display-manager.service
@ln -sf multi-user.target 
$(SYSTEMD_PKGDIR)/lib/systemd/system/default.target
@$(call touch)
@@ -240,7 +242,9 @@ endif
@$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-escape)
@$(call install_copy, systemd, 0, 0, 0755, -, 
/bin/systemd-machine-id-setup)
@$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-notify)
+ifdef PTXCONF_SYSTEMD_TMPFILES
@$(call install_copy, systemd, 0, 0, 0755, -, /bin/systemd-tmpfiles)
+endif
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/busctl)
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/hostnamectl)
 ifdef PTXCONF_SYSTEMD_LOCALES
@@ -293,7 +297,9 @@ endif
@$(call install_tree, systemd, 0, 0, -, /etc/systemd/system/)
@$(call install_tree, systemd, 0, 0, -, /etc/dbus-1/system.d/)
 
+ifdef PTXCONF_SYSTEMD_TMPFILES
@$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/)
+endif
@$(call install_copy, systemd, 0, 0, 0644, -, 
/usr/lib/sysctl.d/50-default.conf)
 
 ifdef PTXCONF_SYSTEMD_COREDUMP
-- 
2.0.0


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] qt5 bump to 5.5.0

2015-08-05 Thread Philipp Zabel

Hi Tim,

Am Mittwoch, den 05.08.2015, 11:42 +0200 schrieb Tim Sander:
 Hi
 
 Below is a bump of qt to the newest released version.
 It adapts the existing patches to qt5 and adds two new modules
 Qt3d and QtCanvas3d. I have not had the time to test these.
 The new module qtandroidextras is skipped as it is not relevant for ptxdist.
 
 It Works for me (tm).
 
 Signed-off-by: Tim Sander t...@krieglstein.org

I have started to work on this, too. See my (relative) changes below.

First, please consider generating the patch series with
git format-patch -N --no-signature and when moving files around, use
git format-patch -M for the patch you send to the list. That is really
helpful to see changes in the patches.

[...]
 diff --git a/rules/qt5.in b/rules/qt5.in
 index 2670ac4..a78b075 100644
 --- a/rules/qt5.in
 +++ b/rules/qt5.in
 @@ -11,7 +11,7 @@ menuconfig QT5
   select GCCLIBS_CXX
   select GCCLIBS_GCC_S
   select ZLIB
 - select DBUS if QT5_DBUS || QT5_MODULE_QTWEBENGINE
 + select DBUS if QT5_DBUS

Why? The qtwebengine build fails when dbus is not yet installed.

[...]
 diff --git a/rules/qt5.make b/rules/qt5.make
 index 330ad55..9f2e32a 100644
 --- a/rules/qt5.make
 +++ b/rules/qt5.make
 @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_QT5) += qt5
  #
  # Paths and names
  #
 -QT5_VERSION  := 5.4.2
 -QT5_MD5  := c23bd0f14d66e7901d24906a1edce9b0
 +QT5_VERSION  := 5.5.0
 +QT5_MD5  := 24d387fbb0e3042cc48aeaff5627bbb6

Sure? I have downloaded a qt-everywhere-opensource-src-5.5.0.tar.xz with
md5sum 65d5282f3dee0336da9ed1f77148952f. See
http://download.qt.io/official_releases/qt/5.5/5.5.0/single/qt-everywhere-opensource-src-5.5.0.tar.xz.mirrorlist
Also patch 0005 doesn't apply.

  QT5  := qt-everywhere-opensource-src-$(QT5_VERSION)
  QT5_SUFFIX   := tar.xz
  QT5_URL  := \
 @@ -136,7 +136,11 @@ QT5_CONF_OPT := \
   $(call ptx/ifdef, PTXCONF_QT5_PREPARE_EXAMPLES,-make examples) \
   -skip qtactiveqt \
   -skip qtandroidextras \
 + $(call ptx/qt5-module, QT3D, qt3d) \
 + -skip qtactiveqt \
 + -skip qtandroidextras \

These two are already set directly above.

best regards
Philipp

--8--
 ...ebengine-fix-build-by-allowing-empty-sysr.patch | 22 +
 ...-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch | 23 ++
 patches/qt-everywhere-opensource-src-5.5.0/series  |  2 ++
 rules/qt5.in   | 13 +---
 rules/qt5.make | 14 +++--
 5 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 
patches/qt-everywhere-opensource-src-5.5.0/0006-ptxdist-qtwebengine-fix-build-by-allowing-empty-sysr.patch
 create mode 100644 
patches/qt-everywhere-opensource-src-5.5.0/0007-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch

diff --git 
a/patches/qt-everywhere-opensource-src-5.5.0/0006-ptxdist-qtwebengine-fix-build-by-allowing-empty-sysr.patch
 
b/patches/qt-everywhere-opensource-src-5.5.0/0006-ptxdist-qtwebengine-fix-build-by-allowing-empty-sysr.patch
new file mode 100644
index 000..03fbc83
--- /dev/null
+++ 
b/patches/qt-everywhere-opensource-src-5.5.0/0006-ptxdist-qtwebengine-fix-build-by-allowing-empty-sysr.patch
@@ -0,0 +1,22 @@
+From: Philipp Zabel p.za...@pengutronix.de
+Date: Tue, 4 Aug 2015 12:48:00 +0200
+Subject: [PATCH] ptxdist: qtwebengine: fix build by allowing empty sysroot
+
+Signed-off-by: Philipp Zabel p.za...@pengutronix.de
+---
+ qtwebengine/src/3rdparty/chromium/build/common.gypi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qtwebengine/src/3rdparty/chromium/build/common.gypi 
b/qtwebengine/src/3rdparty/chromium/build/common.gypi
+index 17089589340e..5fd4d2ee587e 100644
+--- a/qtwebengine/src/3rdparty/chromium/build/common.gypi
 b/qtwebengine/src/3rdparty/chromium/build/common.gypi
+@@ -926,7 +926,7 @@
+   'use_allocator%': 'none',
+   # sysroot needs to be an absolute path otherwise it generates
+   # incorrect results when passed to pkg-config
+-  'sysroot%': '!(cd (DEPTH)  pwd 
-P)/chrome/installer/linux/debian_wheezy_arm-sysroot',
++  #'sysroot%': '!(cd (DEPTH)  pwd 
-P)/chrome/installer/linux/debian_wheezy_arm-sysroot',
+ }], # OS==linux and target_arch==arm and chromeos==0
+ 
+ ['OS==linux and branding==Chrome and buildtype==Official and 
chromeos==0', {
diff --git 
a/patches/qt-everywhere-opensource-src-5.5.0/0007-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
 
b/patches/qt-everywhere-opensource-src-5.5.0/0007-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
new file mode 100644
index 000..cbc4864
--- /dev/null
+++ 
b/patches/qt-everywhere-opensource-src-5.5.0/0007-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
@@ -0,0 +1,23 @@
+From: Philipp Zabel p.za...@pengutronix.de
+Date: Tue, 4 Aug 2015 13:53:28 +0200

Re: [ptxdist] [PATCH] qt5 bump to 5.5.0

2015-08-05 Thread Tim Sander

Hi Philipp
Am Mittwoch, 5. August 2015, 17:43:51 schrieb Philipp Zabel:
  -   select DBUS if QT5_DBUS || QT5_MODULE_QTWEBENGINE
  +   select DBUS if QT5_DBUS
 Why? The qtwebengine build fails when dbus is not yet installed.
Probably a typing accident. I overlooked this.
 

  -QT5_VERSION:= 5.4.2
  -QT5_MD5:= c23bd0f14d66e7901d24906a1edce9b0
  +QT5_VERSION:= 5.5.0
  +QT5_MD5:= 24d387fbb0e3042cc48aeaff5627bbb6
 
 Sure? I have downloaded a qt-everywhere-opensource-src-5.5.0.tar.xz with
 md5sum 65d5282f3dee0336da9ed1f77148952f. See
 http://download.qt.io/official_releases/qt/5.5/5.5.0/single/qt-everywhere-op
 ensource-src-5.5.0.tar.xz.mirrorlist Also patch 0005 doesn't apply.
Strange mine has the above but as this might be the newer version i just updated
the md5 hash.

  +   $(call ptx/qt5-module, QT3D, qt3d) \
  +   -skip qtactiveqt \
  +   -skip qtandroidextras \
 
 These two are already set directly above.
Oops.

Below is a patchset done with -M:

Signed-off-by: Tim Sander t...@krieglstein.org
---
 ...1-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch | 14 +-
 ...eclarative-is-an-optional-dependency-for-qtwebkit.patch | 10 +++---
 ...ultimedia-videonode-plugins-require-qtmultimediaq.patch |  6 +-
 .../0004-HACK-put-wayland-scanner-outout-in-srcdir.patch   |  6 +-
 ...turesfeatures-don-t-use-gold-linker-for-host-tool.patch |  6 +-
 .../series |  3 ---
 rules/qt5.in   |  8 
 rules/qt5.make | 12 ++--
 8 files changed, 49 insertions(+), 16 deletions(-)
 rename patches/{qt-everywhere-opensource-src-5.4.2 = 
qt-everywhere-opensource-src-5.5.0}/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
 (75%)
 rename patches/{qt-everywhere-opensource-src-5.4.2 = 
qt-everywhere-opensource-src-5.5.0}/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
 (74%)
 rename patches/{qt-everywhere-opensource-src-5.4.2 = 
qt-everywhere-opensource-src-5.5.0}/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
 (80%)
 rename patches/{qt-everywhere-opensource-src-5.4.2 = 
qt-everywhere-opensource-src-5.5.0}/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
 (86%)
 rename patches/{qt-everywhere-opensource-src-5.4.2 = 
qt-everywhere-opensource-src-5.5.0}/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
 (84%)
 rename patches/{qt-everywhere-opensource-src-5.4.2 = 
qt-everywhere-opensource-src-5.5.0}/series (72%)

diff --git 
a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
 
b/patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
similarity index 75%
rename from 
patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
rename to 
patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
index c18bbbf..f7d86ad 100644
--- 
a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
+++ 
b/patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
@@ -1,6 +1,7 @@
+From 18d8d3381e3caca32b2c253f34917280cca47972 Mon Sep 17 00:00:00 2001
 From: Michael Olbrich m.olbr...@pengutronix.de
 Date: Tue, 12 May 2015 11:38:35 +0200
-Subject: [PATCH] ptxdist: qtwebengine: allow building with ptxdsit
+Subject: [PATCH 1/8] ptxdist: qtwebengine: allow building with ptxdsit
 
 Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de
 ---
@@ -8,10 +9,10 @@ Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/qtwebengine/tools/qmake/mkspecs/features/functions.prf 
b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-index 4c2547d571db..6b5d34b527a5 100644
+index ef0320da1af0..460f9a91c49f 100644
 --- a/qtwebengine/tools/qmake/mkspecs/features/functions.prf
 +++ b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-@@ -12,6 +12,7 @@ defineTest(isPlatformSupported) {
+@@ -16,6 +16,7 @@ defineTest(isPlatformSupported) {
!isPythonVersionSupported(): return(false)
linux-g++*|win32-msvc2013|macx-clang: return(true)
boot2qt: return(true)
@@ -19,12 +20,15 @@ index 4c2547d571db..6b5d34b527a5 100644
  
skipBuild(Qt WebEngine can currently only be built for Linux (GCC), 
Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.)
return(false)
-@@ -61,7 +62,7 @@ defineReplace(getChromiumSrcDir) {
+@@ -72,7 +73,7 @@ defineReplace(getChromiumSrcDir) {
  }
  
  defineReplace(extractCFlag) {
 -CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
 +CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$PTX_QMAKE_CFLAGS
- !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS
  OPTION = $$find(CFLAGS,

[ptxdist] [PATCH] qt5 bump to 5.5.0

[ptxdist] openssh and chrony patches

[ptxdist] [PATCH] systemd: make tmpfiles support optional

Re: [ptxdist] [PATCH] qt5 bump to 5.5.0

Re: [ptxdist] [PATCH] qt5 bump to 5.5.0

5 matches

Site Navigation

Mail list logo

Footer information