[ptxdist] [PATCH 1/4] dnsmasq: fix overwritten PKG_CONFIG

[ptxdist] [PATCH 1/4] dnsmasq: fix overwritten PKG_CONFIG

[Robert Schwebel]

The dnsmasq package has a handwritten Makefile, which overwrites the
PKG_CONFIG set by ptxdist.

Set the variable to the right value.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/dnsmasq.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index a9e3e49..494b34f 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -59,7 +59,7 @@ ifdef DNSMASQ_DNSSEC
 DNSMASQ_COPT += -DHAVE_DNSSEC
 endif
 
-DNSMASQ_MAKEVARS := PREFIX=/usr AWK=awk COPTS='$(DNSMASQ_COPT)'
+DNSMASQ_MAKEVARS := PREFIX=/usr AWK=awk COPTS='$(DNSMASQ_COPT)' PKG_CONFIG='$(PTXDIST_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config'
 
 $(STATEDIR)/dnsmasq.prepare:
 	@$(call targetinfo)
-- 
2.8.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/4] lighttpd: create /etc/lighttpd/conf.d in any case

[Robert Schwebel]

Otherwhise 'systemctl status lighttpd' shows that include_shell in
lighttpd.conf tries to glob in a non-existing directory.

While being there, test if there are *.conf files before including them,
which also would give an error.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 projectroot/etc/lighttpd/lighttpd.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projectroot/etc/lighttpd/lighttpd.conf b/projectroot/etc/lighttpd/lighttpd.conf
index 34468ea..86048f0 100644
--- a/projectroot/etc/lighttpd/lighttpd.conf
+++ b/projectroot/etc/lighttpd/lighttpd.conf
@@ -69,5 +69,5 @@ mimetype.assign		= (
 
 index-file.names = ( "index.html" )
 
-include_shell "cat conf.d/*.conf"
+include_shell "[ \"$(ls -A conf.d/)\" ] && cat conf.d/*.conf"
 
-- 
2.8.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/4] mono: version bump 2.10.1 -> 3.2.6

[Robert Schwebel]

The patch 0001-Fix-sgen-build-on-PPC-linux.patch is not necessary any
more, as the configure scripts do the PowerPC detection differently.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 .../0001-Fix-sgen-build-on-PPC-linux.patch         | 28 ----------
 patches/mono-2.10.1/series                         |  3 --
 rules/mono.make                                    | 61 ++++++++++++++++------
 3 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 patches/mono-2.10.1/0001-Fix-sgen-build-on-PPC-linux.patch
 delete mode 100644 patches/mono-2.10.1/series

diff --git a/patches/mono-2.10.1/0001-Fix-sgen-build-on-PPC-linux.patch b/patches/mono-2.10.1/0001-Fix-sgen-build-on-PPC-linux.patch
deleted file mode 100644
index 01d45d7..0000000
--- a/patches/mono-2.10.1/0001-Fix-sgen-build-on-PPC-linux.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 20 Apr 2011 09:19:50 +0200
-Subject: [PATCH] Fix sgen build on PPC linux.
-
-This is part of the upstream commit 4a812850f8af461619530dfd7c6e7f4531fdcf8d
-from Zoltan Varga <vargaz@gmail.com>
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- mono/metadata/sgen-archdep.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mono/metadata/sgen-archdep.h b/mono/metadata/sgen-archdep.h
-index a1e3e6d..cde4ef5 100644
---- a/mono/metadata/sgen-archdep.h
-+++ b/mono/metadata/sgen-archdep.h
-@@ -102,7 +102,7 @@
- 	((a)[14] = (gpointer) (UCONTEXT_REG_R15 (ctx)));	\
- 	} while (0)
- 
--#elif defined(__ppc__)
-+#elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__)
- 
- #define REDZONE_SIZE	224
- 
--- 
-1.7.4.1
-
diff --git a/patches/mono-2.10.1/series b/patches/mono-2.10.1/series
deleted file mode 100644
index 1e99997..0000000
--- a/patches/mono-2.10.1/series
+++ /dev/null
@@ -1,3 +0,0 @@
-# generated by git-ptx-patches
-0001-Fix-sgen-build-on-PPC-linux.patch
-# 0986299811d2f60314c4897bb298f9af  - git-ptx-patches magic
diff --git a/rules/mono.make b/rules/mono.make
index 87265de..d8d4099 100644
--- a/rules/mono.make
+++ b/rules/mono.make
@@ -18,8 +18,8 @@ endif
 #
 # Paths and names
 #
-MONO_VERSION	:= 2.10.1
-MONO_MD5	:= ae8d1875447527599e68dd6c1d82bc11
+MONO_VERSION	:= 3.2.6
+MONO_MD5	:= 076e815090f9807f273b06a98e76e274
 MONO		:= mono-$(MONO_VERSION)
 MONO_SUFFIX	:= tar.bz2
 MONO_URL	:= http://download.mono-project.com/sources/mono/$(MONO).$(MONO_SUFFIX)
@@ -29,6 +29,19 @@ MONO_LICENSE	:= unknown
 MONO_DEVPKG	:= NO
 
 # ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/mono.extract:
+	@$(call targetinfo)
+	@$(call clean, $(MONO_DIR))
+	@$(call extract, MONO)
+#	# The mono archive has some stray .git files in it's externals-subdirs
+	@find $(MONO_DIR) -name .git -print0 | xargs -0 rm -v
+	@$(call patchin, MONO)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
@@ -45,7 +58,7 @@ MONO_CONF_OPT	:= \
 	--disable-solaris-tar-check \
 	--disable-nls \
 	--disable-mcs-build \
-	--enable-quiet-build \
+	--enable-silent-rules \
 	--disable-parallel-mark \
 	--disable-dev-random \
 	--enable-shared-handles \
@@ -53,32 +66,50 @@ MONO_CONF_OPT	:= \
 	--disable-big-arrays \
 	--disable-dtrace \
 	--disable-llvm \
+	--disable-loadedllvm \
 	--disable-mono-debugger \
 	--with-libgdiplus=installed \
-	--with-glib=embedded \
 	--with-gc=included \
 	--with-tls=pthread \
 	--with-sigaltstack=no \
 	--with-static_mono=no \
+	--with-shared_mono=yes \
 	--with-xen_opt=no \
 	--with-large-heap=no \
 	--with-ikvm-native=yes \
-	--with-jit=yes \
-	--with-interp=no \
-	--without-x \
 	--with-profile2=no \
 	--with-profile4=no \
-	--with-moonlight=no \
+	--with-profile4_5=no \
+	--with-monodroid=no \
 	--with-monotouch=no \
+	--with-mobile=no \
 	--with-oprofile=no \
 	--with-malloc-mempools=no \
-	--with-mcs-docs=no
-
-#  --enable-minimal=LIST      drop support for LIST subsystems.
-#     LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug,
-#     reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd,soft_debug.
-
-#  --with-glib=embedded|system    Choose glib API: system or embedded (default to system)
+	--with-mcs-docs=no \
+	--with-lazy-gc-thread-creation=no \
+	--enable-libraries \
+	--enable-executables \
+	--disable-extension-module \
+	--disable-small-config \
+	--enable-system-aot \
+	--enable-boehm \
+	--disable-nacl-codegen \
+	--disable-nacl-gc \
+	--disable-icall-symbol-map \
+	--enable-icall-export \
+	--disable-icall-tables \
+	--with-jumptables=no \
+	--with-sgen=no
+
+# --enable-minimal=LIST      drop support for LIST subsystems.
+# --with-crosspkgdir=/path/to/pkg-config/dir      Change pkg-config dir to custom dir
+#
+# LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug,
+# appdomains, verifier, reflection_emit, reflection_emit_save, large_code,
+# logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters,
+# normalization, assembly_remapping, shared_perfcounters, remoting, security,
+# sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed,
+# sgen_marksweep_fixed_par, sgen_copying.],
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.8.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 4/4] host-qemu: enable libusb by default

[Robert Schwebel]

From: Alexander Aring <a.aring@pengutronix.de>

Alexander Aring added --enable-libusb in DistroKit, in order to be able
to test 802.15.4 USB devices from within a qemu simulator.

Signed-off-by: Alexander Aring <a.aring@pengutronix.de>
[ported to ptxdist mainline]
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/host-qemu.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/host-qemu.make b/rules/host-qemu.make
index 556df20..eae6a52 100644
--- a/rules/host-qemu.make
+++ b/rules/host-qemu.make
@@ -104,7 +104,7 @@ HOST_QEMU_CONF_OPT	:= \
 	--disable-libiscsi \
 	--disable-libnfs \
 	--disable-smartcard \
-	--disable-libusb \
+	--enable-libusb \
 	--disable-usb-redir \
 	--disable-lzo \
 	--disable-snappy \
-- 
2.8.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 4/4] host-qemu: enable libusb by default

[Robert Schwebel]

On Sat, Aug 20, 2016 at 07:47:08PM +0200, Robert Schwebel wrote:
> From: Alexander Aring <a.aring@pengutronix.de>
> 
> Alexander Aring added --enable-libusb in DistroKit, in order to be able
> to test 802.15.4 USB devices from within a qemu simulator.
> 
> Signed-off-by: Alexander Aring <a.aring@pengutronix.de>
> [ported to ptxdist mainline]
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  rules/host-qemu.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/host-qemu.make b/rules/host-qemu.make
> index 556df20..eae6a52 100644
> --- a/rules/host-qemu.make
> +++ b/rules/host-qemu.make
> @@ -104,7 +104,7 @@ HOST_QEMU_CONF_OPT	:= \
>  	--disable-libiscsi \
>  	--disable-libnfs \
>  	--disable-smartcard \
> -	--disable-libusb \
> +	--enable-libusb \
>  	--disable-usb-redir \
>  	--disable-lzo \
>  	--disable-snappy \
> -- 
> 2.8.1

This needs HOST_LIBUSB, will fix.

rsc
-- 
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-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/4] dnsmasq: fix overwritten PKG_CONFIG

[Robert Schwebel]

On Sat, Aug 20, 2016 at 07:47:05PM +0200, Robert Schwebel wrote:
> The dnsmasq package has a handwritten Makefile, which overwrites the
> PKG_CONFIG set by ptxdist.
> 
> Set the variable to the right value.
> 
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  rules/dnsmasq.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
> index a9e3e49..494b34f 100644
> --- a/rules/dnsmasq.make
> +++ b/rules/dnsmasq.make
> @@ -59,7 +59,7 @@ ifdef DNSMASQ_DNSSEC
>  DNSMASQ_COPT += -DHAVE_DNSSEC
>  endif
>  
> -DNSMASQ_MAKEVARS := PREFIX=/usr AWK=awk COPTS='$(DNSMASQ_COPT)'
> +DNSMASQ_MAKEVARS := PREFIX=/usr AWK=awk COPTS='$(DNSMASQ_COPT)' PKG_CONFIG='$(PTXDIST_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config'

should break long lines, will send an updated patch
  
>  $(STATEDIR)/dnsmasq.prepare:
>  	@$(call targetinfo)
> -- 
> 2.8.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-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de