[ptxdist] [Patch 1/2] fbtest: version bump 20041102-1 -> 2014-08-11-g29ab066
From: Markus Niebel <markus.nie...@tq-group.com> Changes: - use new upstream source (some fixes and extensions) - port needed patches Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- ...re-generated-penguin.c-to-get-rid-of-this.patch | 655 .../fbtest-20041102-1/0002-Don-t-use-Werror.patch | 25 - .../0003-Workaround-for-a-gcc-compiler-bug.patch | 43 -- .../0004-remove-asm-page.h-use-sysconf.patch | 83 --- .../0005-add-install-target.patch | 20 - patches/fbtest-20041102-1/series | 8 - ...re-generated-penguin.c-to-get-rid-of-this.patch | 656 + .../0002-add-install-target.patch | 21 + patches/fbtest-2014-08-11-g29ab066/series | 2 + rules/fbtest.make | 6 +- 10 files changed, 682 insertions(+), 837 deletions(-) delete mode 100644 patches/fbtest-20041102-1/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch delete mode 100644 patches/fbtest-20041102-1/0002-Don-t-use-Werror.patch delete mode 100644 patches/fbtest-20041102-1/0003-Workaround-for-a-gcc-compiler-bug.patch delete mode 100644 patches/fbtest-20041102-1/0004-remove-asm-page.h-use-sysconf.patch delete mode 100644 patches/fbtest-20041102-1/0005-add-install-target.patch delete mode 100644 patches/fbtest-20041102-1/series create mode 100644 patches/fbtest-2014-08-11-g29ab066/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch create mode 100644 patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch create mode 100644 patches/fbtest-2014-08-11-g29ab066/series diff --git a/patches/fbtest-20041102-1/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch b/patches/fbtest-20041102-1/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch deleted file mode 100644 index f1322be..000 --- a/patches/fbtest-20041102-1/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch +++ /dev/null @@ -1,655 +0,0 @@ -From: Sascha Hauer <s...@pengutronix.de> -Date: Sun, 30 Oct 2011 22:18:39 +0100 -Subject: [PATCH] provide a pre-generated penguin.c to get rid of this - dependency - -fbtest compiles pnmtohex for the host. pnmtohex generates -penguin.c from penguin.ppm. pnmtohex needs libnetpbm which -is very painful to compile. - -[mkl: added std patch header] -[mkl: don't delete penguin.c on clean] - -Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de> - Makefile |2 +- - images/Makefile |3 - - images/penguin.c | 605 ++ - 3 files changed, 606 insertions(+), 4 deletions(-) - create mode 100644 images/penguin.c - -diff --git a/Makefile b/Makefile -index b628bd8..f78c67a 100644 a/Makefile -+++ b/Makefile -@@ -6,7 +6,7 @@ TARGET = $(CROSS_COMPILE)fbtest - OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \ - tests/tests.o - --SUBDIRS = drawops pnmtohex fonts images visops tests -+SUBDIRS = drawops fonts images visops tests - - include $(TOPDIR)/Rules.make - -diff --git a/images/Makefile b/images/Makefile -index 0883c46..209bdd9 100644 a/images/Makefile -+++ b/images/Makefile -@@ -19,6 +19,3 @@ include $(TOPDIR)/Rules.make - %.c: %.pnm - ../pnmtohex/pnmtohex $< $* > $@ - --clean:: -- $(RM) $(SRCS) -- -diff --git a/images/penguin.c b/images/penguin.c -new file mode 100644 -index 000..e454b99 /dev/null -+++ b/images/penguin.c -@@ -0,0 +1,605 @@ -+/* -+ * Image penguin -+ */ -+ -+#include "image.h" -+ -+static const unsigned char penguin_data[]; -+static const unsigned char penguin_clut[]; -+ -+const struct image penguin = { -+width:80, -+height: 80, -+type: IMAGE_CLUT256, -+data: penguin_data, -+clut_len: 187, -+clut: penguin_clut -+}; -+ -+static const unsigned char penguin_data[6400] = { -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, -+0x06, 0x06, 0x05, 0x08, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+0x00,
[ptxdist] [Patch 2/2] fbtest: /usr merge
From: Markus Niebel <markus.nie...@tq-group.com> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- .../fbtest-2014-08-11-g29ab066/0002-add-install-target.patch | 12 ++-- rules/fbtest.make| 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch b/patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch index 92880a8..085b841 100644 --- a/patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch +++ b/patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch @@ -9,13 +9,13 @@ Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> Makefile | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/Makefile b/Makefile -index 1557199d1fb5..9f22f9129604 100644 a/Makefile -+++ b/Makefile -@@ -12,3 +12,5 @@ include $(TOPDIR)/Rules.make +Index: fbtest-2014-08-11-g29ab066/Makefile +=== +--- fbtest-2014-08-11-g29ab066.orig/Makefile 2017-09-13 08:48:04.074055674 +0200 fbtest-2014-08-11-g29ab066/Makefile2017-09-13 09:11:08.497471837 +0200 +@@ -12,3 +12,5 @@ images: pnmtohex +install: -+ install -c $(TARGET) $(DESTDIR)/sbin/fbtest ++ install -c $(TARGET) $(DESTDIR)/usr/sbin/fbtest diff --git a/rules/fbtest.make b/rules/fbtest.make index 873932d..4defcab 100644 --- a/rules/fbtest.make +++ b/rules/fbtest.make @@ -47,7 +47,7 @@ $(STATEDIR)/fbtest.targetinstall: @$(call install_fixup, fbtest,AUTHOR,"Robert Schwebel <r.schwe...@pengutronix.de>") @$(call install_fixup, fbtest,DESCRIPTION,missing) - @$(call install_copy, fbtest, 0, 0, 0755, -, /sbin/fbtest) + @$(call install_copy, fbtest, 0, 0, 0755, -, /usr/sbin/fbtest) @$(call install_finish, fbtest) -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [Patch 0/2] update fbtest to new upstream
From: Markus Niebel <markus.nie...@tq-group.com> even if rather old, this tool is usefull. Use new upstream from kernel.org that allows removal off some local patches and implement the /usr merge Markus Niebel (2): fbtest: version bump 20041102-1 -> 2014-08-11-g29ab066 fbtest: /usr merge ...re-generated-penguin.c-to-get-rid-of-this.patch | 655 .../fbtest-20041102-1/0002-Don-t-use-Werror.patch | 25 - .../0003-Workaround-for-a-gcc-compiler-bug.patch | 43 -- .../0004-remove-asm-page.h-use-sysconf.patch | 83 --- .../0005-add-install-target.patch | 20 - patches/fbtest-20041102-1/series | 8 - ...re-generated-penguin.c-to-get-rid-of-this.patch | 656 + .../0002-add-install-target.patch | 21 + patches/fbtest-2014-08-11-g29ab066/series | 2 + rules/fbtest.make | 8 +- 10 files changed, 683 insertions(+), 838 deletions(-) delete mode 100644 patches/fbtest-20041102-1/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch delete mode 100644 patches/fbtest-20041102-1/0002-Don-t-use-Werror.patch delete mode 100644 patches/fbtest-20041102-1/0003-Workaround-for-a-gcc-compiler-bug.patch delete mode 100644 patches/fbtest-20041102-1/0004-remove-asm-page.h-use-sysconf.patch delete mode 100644 patches/fbtest-20041102-1/0005-add-install-target.patch delete mode 100644 patches/fbtest-20041102-1/series create mode 100644 patches/fbtest-2014-08-11-g29ab066/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch create mode 100644 patches/fbtest-2014-08-11-g29ab066/0002-add-install-target.patch create mode 100644 patches/fbtest-2014-08-11-g29ab066/series -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [Patch 0/3] package URL fixes
From: Markus Niebel <markus.nie...@tq-group.com> Markus Niebel (3): wpa_supplicant: fix url netperf: fix url lm_sensors: fix url rules/lm_sensors.make | 8 rules/netperf.make| 7 --- rules/wpa_supplicant.make | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [Patch 3/3] lm_sensors: fix url
From: Markus Niebel <markus.nie...@tq-group.com> The URL seems to be dysfunctional for a longer time. We should use the github repo of Guenther Roeck instead which seems to have some upstream development also. Since packaging of releases also changed, the MD5 sum changes, too. Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- rules/lm_sensors.make | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/lm_sensors.make b/rules/lm_sensors.make index cb146d4..d25cb27 100644 --- a/rules/lm_sensors.make +++ b/rules/lm_sensors.make @@ -18,12 +18,12 @@ PACKAGES-$(PTXCONF_LM_SENSORS) += lm_sensors # Paths and names # LM_SENSORS_VERSION := 3.4.0 -LM_SENSORS_MD5 := c03675ae9d43d60322110c679416901a +LM_SENSORS_TAG := V3-4-0 +LM_SENSORS_MD5 := 1e9f117cbfa11be1955adc96df71eadb LM_SENSORS := lm_sensors-$(LM_SENSORS_VERSION) -LM_SENSORS_SUFFIX := tar.bz2 +LM_SENSORS_SUFFIX := tar.gz LM_SENSORS_URL := \ - http://dl.lm-sensors.org/lm-sensors/releases/$(LM_SENSORS).$(LM_SENSORS_SUFFIX) \ - http://ftp.osuosl.org/pub/blfs/conglomeration/lmsensors/$(LM_SENSORS).$(LM_SENSORS_SUFFIX) + https://github.com/groeck/lm-sensors/archive/$(LM_SENSORS_TAG).$(LM_SENSORS_SUFFIX) LM_SENSORS_SOURCE := $(SRCDIR)/$(LM_SENSORS).$(LM_SENSORS_SUFFIX) LM_SENSORS_DIR := $(BUILDDIR)/$(LM_SENSORS) LM_SENSORS_LICENSE := GPL-2.0+, LGPL-2.1+ -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [Patch 1/3] wpa_supplicant: fix url
From: Markus Niebel <markus.nie...@tq-group.com> Project moved to new site. Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- rules/wpa_supplicant.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make index 1646d8b..d9b57c6 100644 --- a/rules/wpa_supplicant.make +++ b/rules/wpa_supplicant.make @@ -21,7 +21,7 @@ WPA_SUPPLICANT_VERSION:= 2.6 WPA_SUPPLICANT_MD5 := 091569eb4440b7d7f2b4276dbfc03c3c WPA_SUPPLICANT := $(WPA_SUPPLICANT_NAME)-$(WPA_SUPPLICANT_VERSION) WPA_SUPPLICANT_SUFFIX := tar.gz -WPA_SUPPLICANT_URL := http://hostap.epitest.fi/releases/$(WPA_SUPPLICANT).$(WPA_SUPPLICANT_SUFFIX) +WPA_SUPPLICANT_URL := https://w1.fi/releases/$(WPA_SUPPLICANT).$(WPA_SUPPLICANT_SUFFIX) WPA_SUPPLICANT_SOURCE := $(SRCDIR)/$(WPA_SUPPLICANT).$(WPA_SUPPLICANT_SUFFIX) WPA_SUPPLICANT_DIR := $(BUILDDIR)/$(WPA_SUPPLICANT) WPA_SUPPLICANT_SUBDIR := $(WPA_SUPPLICANT_NAME) -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [Patch 2/3] netperf: fix url
From: Markus Niebel <markus.nie...@tq-group.com> Project is now on github. Releases packed different. Therefore suffix and MD5 also changed Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- rules/netperf.make | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/netperf.make b/rules/netperf.make index a317fe5..1ed5289 100644 --- a/rules/netperf.make +++ b/rules/netperf.make @@ -17,10 +17,11 @@ PACKAGES-$(PTXCONF_NETPERF) += netperf # Paths and names # NETPERF_VERSION:= 2.7.0 -NETPERF_MD5:= ad1c5342d61f297c417a93133aeba65a +NETPERF_MD5:= e0d45b5bca1eee2aef0155de82366202 NETPERF:= netperf-$(NETPERF_VERSION) -NETPERF_SUFFIX := tar.bz2 -NETPERF_URL:= ftp://ftp.netperf.org/netperf/$(NETPERF).$(NETPERF_SUFFIX) +NETPERF_SUFFIX := tar.gz +NETPERF_URL:= \ + https://github.com/HewlettPackard/netperf/archive/$(NETPERF).$(NETPERF_SUFFIX) NETPERF_SOURCE := $(SRCDIR)/$(NETPERF).$(NETPERF_SUFFIX) NETPERF_DIR:= $(BUILDDIR)/$(NETPERF) NETPERF_LICENSE:= HP -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] kernel: need openssl since v4.3
From: Markus Niebel <markus.nie...@tq-group.com> regarding to https://www.kernel.org/doc/Documentation/Changes kernel needs openssl to compile since v4.3 This is true only for use cases like module signing and trusted keyring for things like IMA. Add hostside openssl as an optional dependency Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- Changes since v1 make dependency optional as suggested by M. Olbrich platforms/kernel.in | 10 ++ 1 file changed, 10 insertions(+) diff --git a/platforms/kernel.in b/platforms/kernel.in index 8b16739..4893353 100644 --- a/platforms/kernel.in +++ b/platforms/kernel.in @@ -9,6 +9,7 @@ menuconfig KERNEL select HOST_LZOPif KERNEL_LZOP select HOST_LIBKMOD if KERNEL_MODULES select HOST_SYSTEM_BC + select HOST_OPENSSL if KERNEL_OPENSSL prompt "Linux kernel " if KERNEL @@ -236,6 +237,15 @@ config KERNEL_LZOP Select this if you're unsure, as it won't hurt. It just increases the build time. +config KERNEL_OPENSSL + prompt "build openssl hosttool" + bool + help + Select this if you're going to build your kernel with support for + module signing, IMA etc. where openssl is need as hosttool + + Select this if you're unsure, as it won't hurt. It just + increases the build time. menu "patching & configuration " -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] kernel: need openssl since v4.3
Hi Am Freitag, den 31.03.2017, 16:49 +0200 schrieb Michael Olbrich: > On Fri, Mar 31, 2017 at 04:30:48PM +0200, Markus Niebel wrote: > > From: Markus Niebel <markus.nie...@tq-group.com> > > > > regarding to https://www.kernel.org/doc/Documentation/Changes > > kernel needs openssl to compile since v4.3 > > I think the documentation is a bit misleading. Since v4.3 it needs openssl > development packages _if_ module signing is enabled. Or have you seen > anything else that needs openssl? > If not, then this should be an option like KERNEL_LZOP. > log just from our buildserver (linux 4.6): HOSTCC scripts/extract-cert scripts/sign-file.c:25:30: fatal error: openssl/opensslv.h: No such file or directory #include ^ compilation terminated. scripts/extract-cert.c:21:25: fatal error: openssl/bio.h: No such file or directory #include ^ compilation terminated. make[2]: *** [scripts/sign-file] Error 1 The compilation is triggered by hostprogs-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += extract-cert So I think this is (potentially) wider use case. I'm not the expert for this kind of stuff. Can send v2 with same approach as KERNEL_LZOP Markus > Michael > > > Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> > > --- > > platforms/kernel.in | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/platforms/kernel.in b/platforms/kernel.in > > index 8b16739..69b326f 100644 > > --- a/platforms/kernel.in > > +++ b/platforms/kernel.in > > @@ -9,6 +9,7 @@ menuconfig KERNEL > > select HOST_LZOPif KERNEL_LZOP > > select HOST_LIBKMOD if KERNEL_MODULES > > select HOST_SYSTEM_BC > > + select HOST_OPENSSL > > prompt "Linux kernel " > > > > if KERNEL > > -- > > 1.9.1 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] udev: fix compilation for mtd-probe
From: Markus Niebel <markus.nie...@tq-group.com> mtd-probe does not compile. Fix this by adding stdint to supply correct typedefs Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- .../udev-182/0002-mtd-probe-fix-compilation.patch | 25 ++ patches/udev-182/series| 4 +--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 patches/udev-182/0002-mtd-probe-fix-compilation.patch diff --git a/patches/udev-182/0002-mtd-probe-fix-compilation.patch b/patches/udev-182/0002-mtd-probe-fix-compilation.patch new file mode 100644 index 000..60a257f --- /dev/null +++ b/patches/udev-182/0002-mtd-probe-fix-compilation.patch @@ -0,0 +1,25 @@ +From 5c78b1319ec1cf8cac48920ba60eff6f273acff9 Mon Sep 17 00:00:00 2001 +From: Markus Niebel <markus.nie...@tq-group.com> +Date: Fri, 31 Mar 2017 11:46:14 +0200 +Subject: [PATCH 2/2] mtd-probe: fix compilation + +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> +--- + src/mtd_probe/mtd_probe.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mtd_probe/mtd_probe.h b/src/mtd_probe/mtd_probe.h +index 2a37ede578b3..961176a475a2 100644 +--- a/src/mtd_probe/mtd_probe.h b/src/mtd_probe/mtd_probe.h +@@ -17,6 +17,7 @@ + * Boston, MA 02110-1301 USA + */ + ++#include + #include + + /* Full oob structure as written on the flash */ +-- +1.9.1 + diff --git a/patches/udev-182/series b/patches/udev-182/series index 1c17f15..f5bfa57 100644 --- a/patches/udev-182/series +++ b/patches/udev-182/series @@ -1,4 +1,2 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 0001-configure.ac-fix-FTBFS-with-new-glibc.patch -# be5cd22057d8bd81ce6afd40df0f051d - git-ptx-patches magic +0002-mtd-probe-fix-compilation.patch -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] kernel: need openssl since v4.3
From: Markus Niebel <markus.nie...@tq-group.com> regarding to https://www.kernel.org/doc/Documentation/Changes kernel needs openssl to compile since v4.3 Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- platforms/kernel.in | 1 + 1 file changed, 1 insertion(+) diff --git a/platforms/kernel.in b/platforms/kernel.in index 8b16739..69b326f 100644 --- a/platforms/kernel.in +++ b/platforms/kernel.in @@ -9,6 +9,7 @@ menuconfig KERNEL select HOST_LZOPif KERNEL_LZOP select HOST_LIBKMOD if KERNEL_MODULES select HOST_SYSTEM_BC + select HOST_OPENSSL prompt "Linux kernel " if KERNEL -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4] kmscube: add new package
From: Markus Niebel <markus.nie...@tq-group.com> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- .../0001-force-autogen-to-look-for-stdc.patch | 29 ++ patches/kmscube-2017-03-13-g803bac5/autogen.sh | 1 + patches/kmscube-2017-03-13-g803bac5/series | 2 + rules/kmscube.in | 9 rules/kmscube.make | 61 ++ 5 files changed, 102 insertions(+) create mode 100644 patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch create mode 12 patches/kmscube-2017-03-13-g803bac5/autogen.sh create mode 100644 patches/kmscube-2017-03-13-g803bac5/series create mode 100644 rules/kmscube.in create mode 100644 rules/kmscube.make diff --git a/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch b/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch new file mode 100644 index 000..3aa1cb8 --- /dev/null changes since v3: - add help output as suggested - silence targetinstall (really) changes since v2: - handle as single patch, part of original series was applied - cleanup as suggested - use version notation as suggested - fix dependency as suggested - silence targetinstall - use new upstream version (needs on patch less) +++ b/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch @@ -0,0 +1,29 @@ +From 3690585109ca98669a9faeadd0c5ecbe1e24dbe0 Mon Sep 17 00:00:00 2001 +From: Markus Niebel <markus.nie...@tq-group.com> +Date: Thu, 2 Mar 2017 17:17:20 +0100 +Subject: [PATCH 1/2] force autogen to look for stdc + +needed since sources using constructs needing stdc99 + +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 4441d2d..2b456d4 100644 +--- a/configure.ac b/configure.ac +@@ -36,6 +36,9 @@ AM_MAINTAINER_MODE + # Enable quiet compiles on automake 1.11. + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + ++AC_PROG_CC ++AC_PROG_CC_STDC ++ + # Initialize libtool + AC_PROG_LIBTOOL + +-- +1.9.1 + diff --git a/patches/kmscube-2017-03-13-g803bac5/autogen.sh b/patches/kmscube-2017-03-13-g803bac5/autogen.sh new file mode 12 index 000..9f8a4cb --- /dev/null +++ b/patches/kmscube-2017-03-13-g803bac5/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/kmscube-2017-03-13-g803bac5/series b/patches/kmscube-2017-03-13-g803bac5/series new file mode 100644 index 000..a88c1eb --- /dev/null +++ b/patches/kmscube-2017-03-13-g803bac5/series @@ -0,0 +1,2 @@ +0001-force-autogen-to-look-for-stdc.patch +# 0002-fix-headers.patch diff --git a/rules/kmscube.in b/rules/kmscube.in new file mode 100644 index 000..a5b52a5 --- /dev/null +++ b/rules/kmscube.in @@ -0,0 +1,9 @@ +## SECTION=multimedia_libs + +config KMSCUBE + bool + prompt "kmscube" + select MESALIB + select LIBDRM + help + kmscube is an application to test kms/drm drivers. diff --git a/rules/kmscube.make b/rules/kmscube.make new file mode 100644 index 000..5e559e2 --- /dev/null +++ b/rules/kmscube.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Markus Niebel <markus.nie...@tq-group.com> +# +# 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_KMSCUBE) += kmscube + +# +# Paths and names +# +# No tags: use a fake descriptive commit-ish to include the date +KMSCUBE_VERSION:= 2017-03-13-g803bac5 +KMSCUBE:= kmscube-$(KMSCUBE_VERSION) +KMSCUBE_MD5:= 781a59ab2d1d245e99a49df7c3dc1876 +KMSCUBE_URL:= git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION) +KMSCUBE_SUFFIX := tar.gz +KMSCUBE_SOURCE := $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX) +KMSCUBE_DIR:= $(BUILDDIR)/$(KMSCUBE) + +KMSCUBE_LICENSE:= BSD + +# +# Prepare +# + +KMSCUBE_CPPFLAGS += \ + -I$(KERNEL_HEADERS_INCLUDE_DIR) + +# +# autoconf +# +KMSCUBE_CONF_TOOL := autoconf + +# +# Target-Install +# + +$(STATEDIR)/kmscube.targetinstall: + @$(call targetinfo) + + @$(call install_init, kmscube) + @$(call install_fixup, kmscube, PRIORITY, optional) + @$(call install_fixup, kmscube, SECTION, base) + @$(call install_fixup, kmscube, AUTHOR, "Markus Niebel <markus.nie...@tq-group.com>") + @$(call install_fixup, kmscube, DESCRIPTION
Re: [ptxdist] [PATCH v4] libdrm: version bump 2.7.74 -> 2.7.75
Am Freitag, den 17.03.2017, 10:29 +0100 schrieb Michael Olbrich: > On Thu, Mar 16, 2017 at 03:47:58PM +0100, Markus Niebel wrote: > > From: Markus Niebel <markus.nie...@tq-group.com> > > > > - drop not longer nneded libudev dependency > > - make udev support optional (udev is not needed to build but > > if compiled with udev support udev is expected to handle device > > nodes) > > > > Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> > > --- > > changes since v3: > > > > - cleanup leftovers from git merge conflicts (again) > > > > changes since v2: > > - handle as single patch, part of original series was applied > > - fix udev dependency > > I meant an unconditional dependency. I looked at this some more. The > '--enable-udev' options is not named correctly. What the corresponding code > does is if a drm device is missing, then either wait for it (--enable-udev) > or create it (--disable-udev). > > So for any system that hat either udev or devtmpfs '--enable-udev' should > be used. > So unless you have a use-case where this is not the case, I will just fixup > the patch and drop the udev dependency entirely and set --enable-udev > unconditionally. Thank you for explaining it. I read the relevant code, was misguided by --enable-udev and did not thought of devtmpfs. Markus > > Michael > > > - fix commit message for new version > > > > changes since v1: > > > > - cleanup leftovers from git merge conflicts > > > > > > rules/libdrm.in | 10 -- > > rules/libdrm.make | 6 +++--- > > 2 files changed, 11 insertions(+), 5 deletions(-) > > > > diff --git a/rules/libdrm.in b/rules/libdrm.in > > index 5e77665..385af35 100644 > > --- a/rules/libdrm.in > > +++ b/rules/libdrm.in > > @@ -4,8 +4,7 @@ menuconfig LIBDRM > > tristate > > prompt "libdrm" > > select LIBC_RT > > - select UDEV > > - select UDEV_LIBUDEV > > + select UDEV if LIBDRM_USE_UDEV && RUNTIME > > select LIBPTHREAD_STUBS > > select LIBPCIACCESS if LIBDRM_INTEL > > help > > @@ -14,6 +13,13 @@ menuconfig LIBDRM > > > > if LIBDRM > > > > +config LIBDRM_USE_UDEV > > + bool > > + prompt "Enable support for udev" > > + help > > + Enable support for using udev instead of mknod. If enabled, udev is > > + expected to manage device nodes for probed modules > > + > > config LIBDRM_LIBKMS > > bool > > prompt "build libkms" > > diff --git a/rules/libdrm.make b/rules/libdrm.make > > index ec02cc7..7a2f2be 100644 > > --- a/rules/libdrm.make > > +++ b/rules/libdrm.make > > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm > > # > > # Paths and names > > # > > -LIBDRM_VERSION := 2.4.74 > > -LIBDRM_MD5 := b661a54514109caad3de3b520680b98e > > +LIBDRM_VERSION := 2.4.75 > > +LIBDRM_MD5 := 743c16109d91a2539dfc9cc56130d695 > > LIBDRM := libdrm-$(LIBDRM_VERSION) > > LIBDRM_SUFFIX := tar.gz > > LIBDRM_URL := http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) > > @@ -61,7 +61,7 @@ LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y) > > LIBDRM_CONF_TOOL := autoconf > > LIBDRM_CONF_OPT := \ > > $(CROSS_AUTOCONF_USR) \ > > - --enable-udev \ > > + --$(call ptx/endis, PTXCONF_LIBDRM_USE_UDEV)-udev \ > > --$(call ptx/endis, PTXCONF_LIBDRM_LIBKMS)-libkms \ > > $(addprefix --enable-,$(LIBDRM_BACKENDSC-y)) \ > > $(addprefix --disable-,$(LIBDRM_BACKENDSC-)) \ > > -- > > 1.9.1 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] glmark2: add new package
please drop and use v4 Am Donnerstag, den 16.03.2017, 16:45 +0100 schrieb Markus Niebel: > From: Markus Niebel <markus.nie...@tq-group.com> > > Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> > --- > changes since v2 > > - handle as single patch, part of original series was applied > - fix HOST_SYSTEM_PYTHON dependency as suggested > - fix versioning as suggested > - simplify flavor selection in make rule as suggested > - fix var usage in make rule as suggested > - cleanup build stages as suggested > - rewrite targetinstall as suggested > - add useful help entry in Kconfig > > ...NativeStateDRM-add-imx-drm-driver-support.patch | 29 + > patches/glmark2-2017-02-10-g7215c0f/series | 1 + > rules/glmark2.in | 45 > rules/glmark2.make | 121 > + > 4 files changed, 196 insertions(+) > create mode 100644 > patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch > create mode 100644 patches/glmark2-2017-02-10-g7215c0f/series > create mode 100644 rules/glmark2.in > create mode 100644 rules/glmark2.make > > diff --git > a/patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch > > b/patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch > new file mode 100644 > index 000..275db2b > --- /dev/null > +++ > b/patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch > @@ -0,0 +1,29 @@ > +From e002a3f6d912591cfc33404174ce7140120b7d6c Mon Sep 17 00:00:00 2001 > +From: Markus Niebel <markus.nie...@tq-group.com> > +Date: Tue, 7 Mar 2017 13:53:33 +0100 > +Subject: [PATCH] NativeStateDRM: add imx-drm driver support > + > +originated from buildroot commit a10b15ebeb5fd82fdb0530d485095f5800103a49 > + > +glmark2: add imx-drm driver support > +Upstream status: pending > +https://github.com/glmark2/glmark2/pull/29 > + > +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> > +Signed-off-by: Gary Bisson <gary.bis...@boundarydevices.com> > +--- > + src/native-state-drm.cpp | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp > +index 4df75ec..454a24d 100644 > +--- a/src/native-state-drm.cpp > b/src/native-state-drm.cpp > +@@ -201,6 +201,7 @@ NativeStateDRM::init() > + // driver (udev?). > + static const char* drm_modules[] = { > + "i915", > ++"imx-drm", > + "nouveau", > + "radeon", > + "vmgfx", > diff --git a/patches/glmark2-2017-02-10-g7215c0f/series > b/patches/glmark2-2017-02-10-g7215c0f/series > new file mode 100644 > index 000..873d5a7 > --- /dev/null > +++ b/patches/glmark2-2017-02-10-g7215c0f/series > @@ -0,0 +1 @@ > +0001-NativeStateDRM-add-imx-drm-driver-support.patch > diff --git a/rules/glmark2.in b/rules/glmark2.in > new file mode 100644 > index 000..093e256 > --- /dev/null > +++ b/rules/glmark2.in > @@ -0,0 +1,45 @@ > +## SECTION=multimedia_libs > + > +menuconfig GLMARK2 > + tristate > + prompt "glmark2" > + select MESALIB > + select HOST_SYSTEM_PYTHON > + select LIBPNG > + select LIBJPEG > + help > + glmark2 is an OpenGL 2.0 and ES 2.0 benchmark. > + > +if GLMARK2 > + > +config GLMARK2_FLAVOR_X11_GL > + bool > + prompt "x11-gl" > + depends on MESALIB_GLX && MESALIB_OPENGL > + > +config GLMARK2_FLAVOR_X11_GLES2 > + bool > + prompt "x11-gles2" > + depends on MESALIB_GLX && MESALIB_GLES2 > + > +config GLMARK2_FLAVOR_DRM_GL > + bool > + prompt "drm-gl" > + depends on MESALIB_EGL_DRM && MESALIB_OPENGL > + > +config GLMARK2_FLAVOR_DRM_GLES2 > + bool > + prompt "drm-gles2" > + depends on MESALIB_EGL_DRM && MESALIB_GLES2 > + > +config GLMARK2_FLAVOR_WAYLAND_GL > + bool > + prompt "wayland-gl" > + depends on MESALIB_EGL_WAYLAND && MESALIB_OPENGL > + > +config GLMARK2_FLAVOR_WAYLAND_GLES2 > + bool > + prompt "wayland-gles2" > + depends on MESALIB_EGL_WAYLAND && MESALIB_GLES2 > + > +endif > diff --git a/rules/glmark2.make b/rules/glmark2.make > new file mode 100644 > index 000..c9d9930 > --- /dev/null > +++ b/rules/glmark2.make > @@ -0,0 +1,121 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2017 by Markus Niebel <markus.nie...@tqs.de&g
[ptxdist] [PATCH v4] glmark2: add new package
From: Markus Niebel <markus.nie...@tq-group.com> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- changes since v3 - remove superflous line in targetinstall changes since v2 - handle as single patch, part of original series was applied - fix HOST_SYSTEM_PYTHON dependency as suggested - fix versioning as suggested - simplify flavor selection in make rule as suggested - fix var usage in make rule as suggested - cleanup build stages as suggested - rewrite targetinstall as suggested - add useful help entry in Kconfig ...NativeStateDRM-add-imx-drm-driver-support.patch | 29 + patches/glmark2-2017-02-10-g7215c0f/series | 1 + rules/glmark2.in | 45 rules/glmark2.make | 119 + 4 files changed, 194 insertions(+) create mode 100644 patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch create mode 100644 patches/glmark2-2017-02-10-g7215c0f/series create mode 100644 rules/glmark2.in create mode 100644 rules/glmark2.make diff --git a/patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch b/patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch new file mode 100644 index 000..275db2b --- /dev/null +++ b/patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch @@ -0,0 +1,29 @@ +From e002a3f6d912591cfc33404174ce7140120b7d6c Mon Sep 17 00:00:00 2001 +From: Markus Niebel <markus.nie...@tq-group.com> +Date: Tue, 7 Mar 2017 13:53:33 +0100 +Subject: [PATCH] NativeStateDRM: add imx-drm driver support + +originated from buildroot commit a10b15ebeb5fd82fdb0530d485095f5800103a49 + +glmark2: add imx-drm driver support +Upstream status: pending +https://github.com/glmark2/glmark2/pull/29 + +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> +Signed-off-by: Gary Bisson <gary.bis...@boundarydevices.com> +--- + src/native-state-drm.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp +index 4df75ec..454a24d 100644 +--- a/src/native-state-drm.cpp b/src/native-state-drm.cpp +@@ -201,6 +201,7 @@ NativeStateDRM::init() + // driver (udev?). + static const char* drm_modules[] = { + "i915", ++"imx-drm", + "nouveau", + "radeon", + "vmgfx", diff --git a/patches/glmark2-2017-02-10-g7215c0f/series b/patches/glmark2-2017-02-10-g7215c0f/series new file mode 100644 index 000..873d5a7 --- /dev/null +++ b/patches/glmark2-2017-02-10-g7215c0f/series @@ -0,0 +1 @@ +0001-NativeStateDRM-add-imx-drm-driver-support.patch diff --git a/rules/glmark2.in b/rules/glmark2.in new file mode 100644 index 000..093e256 --- /dev/null +++ b/rules/glmark2.in @@ -0,0 +1,45 @@ +## SECTION=multimedia_libs + +menuconfig GLMARK2 + tristate + prompt "glmark2" + select MESALIB + select HOST_SYSTEM_PYTHON + select LIBPNG + select LIBJPEG + help + glmark2 is an OpenGL 2.0 and ES 2.0 benchmark. + +if GLMARK2 + +config GLMARK2_FLAVOR_X11_GL + bool + prompt "x11-gl" + depends on MESALIB_GLX && MESALIB_OPENGL + +config GLMARK2_FLAVOR_X11_GLES2 + bool + prompt "x11-gles2" + depends on MESALIB_GLX && MESALIB_GLES2 + +config GLMARK2_FLAVOR_DRM_GL + bool + prompt "drm-gl" + depends on MESALIB_EGL_DRM && MESALIB_OPENGL + +config GLMARK2_FLAVOR_DRM_GLES2 + bool + prompt "drm-gles2" + depends on MESALIB_EGL_DRM && MESALIB_GLES2 + +config GLMARK2_FLAVOR_WAYLAND_GL + bool + prompt "wayland-gl" + depends on MESALIB_EGL_WAYLAND && MESALIB_OPENGL + +config GLMARK2_FLAVOR_WAYLAND_GLES2 + bool + prompt "wayland-gles2" + depends on MESALIB_EGL_WAYLAND && MESALIB_GLES2 + +endif diff --git a/rules/glmark2.make b/rules/glmark2.make new file mode 100644 index 000..46dd453 --- /dev/null +++ b/rules/glmark2.make @@ -0,0 +1,119 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Markus Niebel <markus.nie...@tqs.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_GLMARK2) += glmark2 + +# +# Paths and names +# +# No tags: use a fake descriptive commit-ish to include the date +GLMARK2_VERSION:= 2017-02-10-g7215c0f +GLMARK2_MD5:= 215d7687a561fe356bc460765ab85ae1 +GLMARK2:= glmark2-$(GLMARK2_VERSION) +GLMARK2_SUFFIX := tar.xz +GLMARK2_URL:= https://github.com/glmark2/glmark2.git;tag=$(GLMARK2_VERSION) +GLMARK2_SOURCE := $(SRCDIR)/$(GLMARK2).
[ptxdist] [PATCH v3] glmark2: add new package
From: Markus Niebel <markus.nie...@tq-group.com> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- changes since v2 - handle as single patch, part of original series was applied - fix HOST_SYSTEM_PYTHON dependency as suggested - fix versioning as suggested - simplify flavor selection in make rule as suggested - fix var usage in make rule as suggested - cleanup build stages as suggested - rewrite targetinstall as suggested - add useful help entry in Kconfig ...NativeStateDRM-add-imx-drm-driver-support.patch | 29 + patches/glmark2-2017-02-10-g7215c0f/series | 1 + rules/glmark2.in | 45 rules/glmark2.make | 121 + 4 files changed, 196 insertions(+) create mode 100644 patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch create mode 100644 patches/glmark2-2017-02-10-g7215c0f/series create mode 100644 rules/glmark2.in create mode 100644 rules/glmark2.make diff --git a/patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch b/patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch new file mode 100644 index 000..275db2b --- /dev/null +++ b/patches/glmark2-2017-02-10-g7215c0f/0001-NativeStateDRM-add-imx-drm-driver-support.patch @@ -0,0 +1,29 @@ +From e002a3f6d912591cfc33404174ce7140120b7d6c Mon Sep 17 00:00:00 2001 +From: Markus Niebel <markus.nie...@tq-group.com> +Date: Tue, 7 Mar 2017 13:53:33 +0100 +Subject: [PATCH] NativeStateDRM: add imx-drm driver support + +originated from buildroot commit a10b15ebeb5fd82fdb0530d485095f5800103a49 + +glmark2: add imx-drm driver support +Upstream status: pending +https://github.com/glmark2/glmark2/pull/29 + +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> +Signed-off-by: Gary Bisson <gary.bis...@boundarydevices.com> +--- + src/native-state-drm.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp +index 4df75ec..454a24d 100644 +--- a/src/native-state-drm.cpp b/src/native-state-drm.cpp +@@ -201,6 +201,7 @@ NativeStateDRM::init() + // driver (udev?). + static const char* drm_modules[] = { + "i915", ++"imx-drm", + "nouveau", + "radeon", + "vmgfx", diff --git a/patches/glmark2-2017-02-10-g7215c0f/series b/patches/glmark2-2017-02-10-g7215c0f/series new file mode 100644 index 000..873d5a7 --- /dev/null +++ b/patches/glmark2-2017-02-10-g7215c0f/series @@ -0,0 +1 @@ +0001-NativeStateDRM-add-imx-drm-driver-support.patch diff --git a/rules/glmark2.in b/rules/glmark2.in new file mode 100644 index 000..093e256 --- /dev/null +++ b/rules/glmark2.in @@ -0,0 +1,45 @@ +## SECTION=multimedia_libs + +menuconfig GLMARK2 + tristate + prompt "glmark2" + select MESALIB + select HOST_SYSTEM_PYTHON + select LIBPNG + select LIBJPEG + help + glmark2 is an OpenGL 2.0 and ES 2.0 benchmark. + +if GLMARK2 + +config GLMARK2_FLAVOR_X11_GL + bool + prompt "x11-gl" + depends on MESALIB_GLX && MESALIB_OPENGL + +config GLMARK2_FLAVOR_X11_GLES2 + bool + prompt "x11-gles2" + depends on MESALIB_GLX && MESALIB_GLES2 + +config GLMARK2_FLAVOR_DRM_GL + bool + prompt "drm-gl" + depends on MESALIB_EGL_DRM && MESALIB_OPENGL + +config GLMARK2_FLAVOR_DRM_GLES2 + bool + prompt "drm-gles2" + depends on MESALIB_EGL_DRM && MESALIB_GLES2 + +config GLMARK2_FLAVOR_WAYLAND_GL + bool + prompt "wayland-gl" + depends on MESALIB_EGL_WAYLAND && MESALIB_OPENGL + +config GLMARK2_FLAVOR_WAYLAND_GLES2 + bool + prompt "wayland-gles2" + depends on MESALIB_EGL_WAYLAND && MESALIB_GLES2 + +endif diff --git a/rules/glmark2.make b/rules/glmark2.make new file mode 100644 index 000..c9d9930 --- /dev/null +++ b/rules/glmark2.make @@ -0,0 +1,121 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Markus Niebel <markus.nie...@tqs.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_GLMARK2) += glmark2 + +# +# Paths and names +# +# No tags: use a fake descriptive commit-ish to include the date +GLMARK2_VERSION:= 2017-02-10-g7215c0f +GLMARK2_MD5:= 215d7687a561fe356bc460765ab85ae1 +GLMARK2:= glmark2-$(GLMARK2_VERSION) +GLMARK2_SUFFIX := tar.xz +GLMARK2_URL:= https://github.com/glmark2/glmark2.git;tag=$(GLMARK2_VERSION) +GLMARK2_SOURCE := $(SRCDIR)/$(GLMARK2).$(GLMARK2_SUFFIX) +GLMARK2_DIR:= $(BUILDDIR)/$(
[ptxdist] [PATCH v4] libdrm: version bump 2.7.74 -> 2.7.75
From: Markus Niebel <markus.nie...@tq-group.com> - drop not longer nneded libudev dependency - make udev support optional (udev is not needed to build but if compiled with udev support udev is expected to handle device nodes) Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- changes since v3: - cleanup leftovers from git merge conflicts (again) changes since v2: - handle as single patch, part of original series was applied - fix udev dependency - fix commit message for new version changes since v1: - cleanup leftovers from git merge conflicts rules/libdrm.in | 10 -- rules/libdrm.make | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/rules/libdrm.in b/rules/libdrm.in index 5e77665..385af35 100644 --- a/rules/libdrm.in +++ b/rules/libdrm.in @@ -4,8 +4,7 @@ menuconfig LIBDRM tristate prompt "libdrm" select LIBC_RT - select UDEV - select UDEV_LIBUDEV + select UDEV if LIBDRM_USE_UDEV && RUNTIME select LIBPTHREAD_STUBS select LIBPCIACCESS if LIBDRM_INTEL help @@ -14,6 +13,13 @@ menuconfig LIBDRM if LIBDRM +config LIBDRM_USE_UDEV + bool + prompt "Enable support for udev" + help + Enable support for using udev instead of mknod. If enabled, udev is + expected to manage device nodes for probed modules + config LIBDRM_LIBKMS bool prompt "build libkms" diff --git a/rules/libdrm.make b/rules/libdrm.make index ec02cc7..7a2f2be 100644 --- a/rules/libdrm.make +++ b/rules/libdrm.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm # # Paths and names # -LIBDRM_VERSION := 2.4.74 -LIBDRM_MD5 := b661a54514109caad3de3b520680b98e +LIBDRM_VERSION := 2.4.75 +LIBDRM_MD5 := 743c16109d91a2539dfc9cc56130d695 LIBDRM := libdrm-$(LIBDRM_VERSION) LIBDRM_SUFFIX := tar.gz LIBDRM_URL := http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) @@ -61,7 +61,7 @@ LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y) LIBDRM_CONF_TOOL := autoconf LIBDRM_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --enable-udev \ + --$(call ptx/endis, PTXCONF_LIBDRM_USE_UDEV)-udev \ --$(call ptx/endis, PTXCONF_LIBDRM_LIBKMS)-libkms \ $(addprefix --enable-,$(LIBDRM_BACKENDSC-y)) \ $(addprefix --disable-,$(LIBDRM_BACKENDSC-)) \ -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] kmscube: add new package
Hello, please ignore, let me fix noisy targetinstall. BTW: is ## SECTION=multimedia_libs the correct place? Am Donnerstag, den 16.03.2017, 15:33 +0100 schrieb Markus Niebel: > From: Markus Niebel <markus.nie...@tq-group.com> > > Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> > --- > changes since v2: > > - handle as single patch, part of original series was applied > - cleanup as suggested > - use version notation as suggested > - fix dependency as suggested > - silence targetinstall > - use new upstream version (needs on patch less) > > .../0001-force-autogen-to-look-for-stdc.patch | 29 ++ > patches/kmscube-2017-03-13-g803bac5/autogen.sh | 1 + > patches/kmscube-2017-03-13-g803bac5/series | 2 + > rules/kmscube.in | 9 > rules/kmscube.make | 61 > ++ > 5 files changed, 102 insertions(+) > create mode 100644 > patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch > create mode 12 patches/kmscube-2017-03-13-g803bac5/autogen.sh > create mode 100644 patches/kmscube-2017-03-13-g803bac5/series > create mode 100644 rules/kmscube.in > create mode 100644 rules/kmscube.make > > diff --git > a/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch > > b/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch > new file mode 100644 > index 000..3aa1cb8 > --- /dev/null > +++ > b/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch > @@ -0,0 +1,29 @@ > +From 3690585109ca98669a9faeadd0c5ecbe1e24dbe0 Mon Sep 17 00:00:00 2001 > +From: Markus Niebel <markus.nie...@tq-group.com> > +Date: Thu, 2 Mar 2017 17:17:20 +0100 > +Subject: [PATCH 1/2] force autogen to look for stdc > + > +needed since sources using constructs needing stdc99 > + > +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> > +--- > + configure.ac | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/configure.ac b/configure.ac > +index 4441d2d..2b456d4 100644 > +--- a/configure.ac > b/configure.ac > +@@ -36,6 +36,9 @@ AM_MAINTAINER_MODE > + # Enable quiet compiles on automake 1.11. > + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) > + > ++AC_PROG_CC > ++AC_PROG_CC_STDC > ++ > + # Initialize libtool > + AC_PROG_LIBTOOL > + > +-- > +1.9.1 > +changes since v2: > diff --git a/patches/kmscube-2017-03-13-g803bac5/autogen.sh > b/patches/kmscube-2017-03-13-g803bac5/autogen.sh > new file mode 12 > index 000..9f8a4cb > --- /dev/null > +++ b/patches/kmscube-2017-03-13-g803bac5/autogen.sh > @@ -0,0 +1 @@ > +../autogen.sh > \ No newline at end of file > diff --git a/patches/kmscube-2017-03-13-g803bac5/series > b/patches/kmscube-2017-03-13-g803bac5/series > new file mode 100644 > index 000..a88c1eb > --- /dev/null > +++ b/patches/kmscube-2017-03-13-g803bac5/series > @@ -0,0 +1,2 @@ > +0001-force-autogen-to-look-for-stdc.patch > +# 0002-fix-headers.patch > diff --git a/rules/kmscube.in b/rules/kmscube.in > new file mode 100644 > index 000..9e4a297 > --- /dev/null > +++ b/rules/kmscube.in > @@ -0,0 +1,9 @@ > +## SECTION=multimedia_libs > + > +config KMSCUBE > + bool > + prompt "kmscube" > + select MESALIB > + select LIBDRM > + help > + FIXME > diff --git a/rules/kmscube.make b/rules/kmscube.make > new file mode 100644 > index 000..55095cd > --- /dev/null > +++ b/rules/kmscube.make > @@ -0,0 +1,61 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2017 by Markus Niebel <markus.nie...@tq-group.com> > +# > +# 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_KMSCUBE) += kmscube > + > +# > +# Paths and names > +# > +# No tags: use a fake descriptive commit-ish to include the date > +KMSCUBE_VERSION := 2017-03-13-g803bac5 > +KMSCUBE := kmscube-$(KMSCUBE_VERSION) > +KMSCUBE_MD5 := 781a59ab2d1d245e99a49df7c3dc1876 > +KMSCUBE_URL := > git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION) > +KMSCUBE_SUFFIX := tar.gz > +KMSCUBE_SOURCE := $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX) > +KMSCUBE_DIR := $(BUILDDIR)/$(KMSCUBE) > + > +KMSCUBE_LICENSE := BSD > + > +# > > +# Prepare > +# > -
Re: [ptxdist] [PATCH v3] libdrm: version bump 2.7.74 -> 2.7.75
Am Donnerstag, den 16.03.2017, 15:19 +0100 schrieb Juergen Borleis: > On Thursday 16 March 2017 15:06:48 Markus Niebel wrote: > > From: Markus Niebel <markus.nie...@tq-group.com> > > > > - drop not longer needed libudev dependency > > - make udev support optional (udev is not needed to build but > > if compiled with udev support udev is expected to handle device > > nodes) > > > > Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> > > --- > > changes since v2: > > - handle as single patch, part of original series was applied > > - fix udev dependency > > - fix commit message for new version > > > > changes since v1: > > > > - cleanup leftovers from git merge conflicts > > > > > > rules/libdrm.in | 10 -- > > rules/libdrm.make | 8 ++-- > > 2 files changed, 14 insertions(+), 4 deletions(-) > > > > diff --git a/rules/libdrm.in b/rules/libdrm.in > > index 5e77665..385af35 100644 > > --- a/rules/libdrm.in > > +++ b/rules/libdrm.in > > @@ -4,8 +4,7 @@ menuconfig LIBDRM > > tristate > > prompt "libdrm" > > select LIBC_RT > > - select UDEV > > - select UDEV_LIBUDEV > > + select UDEV if LIBDRM_USE_UDEV && RUNTIME > > select LIBPTHREAD_STUBS > > select LIBPCIACCESS if LIBDRM_INTEL > > help > > @@ -14,6 +13,13 @@ menuconfig LIBDRM > > > > if LIBDRM > > > > +config LIBDRM_USE_UDEV > > + bool > > + prompt "Enable support for udev" > > + help > > + Enable support for using udev instead of mknod. If enabled, udev is > > + expected to manage device nodes for probed modules > > + > > config LIBDRM_LIBKMS > > bool > > prompt "build libkms" > > diff --git a/rules/libdrm.make b/rules/libdrm.make > > index ec02cc7..82a35b3 100644 > > --- a/rules/libdrm.make > > +++ b/rules/libdrm.make > > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm > > # > > # Paths and names > > # > > -LIBDRM_VERSION := 2.4.74 > > -LIBDRM_MD5 := b661a54514109caad3de3b520680b98e > > +LIBDRM_VERSION := 2.4.75 > > +LIBDRM_MD5 := 743c16109d91a2539dfc9cc56130d695 > > LIBDRM := libdrm-$(LIBDRM_VERSION) > > LIBDRM_SUFFIX := tar.gz > > LIBDRM_URL := > > http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) @@ -61,8 > > +61,12 @@ LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y) > > LIBDRM_CONF_TOOL := autoconf > > LIBDRM_CONF_OPT := \ > > $(CROSS_AUTOCONF_USR) \ > > +<<<<<<< HEAD > > --enable-udev \ > > +=== > > +>>>>>>> 2436ea2... libdrm: version bump 2.7.75 -> 2.7.75 > > ^ Looks strange... :) > Yes, of course. Simply stupid ... > jb > ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3] kmscube: add new package
From: Markus Niebel <markus.nie...@tq-group.com> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- changes since v2: - handle as single patch, part of original series was applied - cleanup as suggested - use version notation as suggested - fix dependency as suggested - silence targetinstall - use new upstream version (needs on patch less) .../0001-force-autogen-to-look-for-stdc.patch | 29 ++ patches/kmscube-2017-03-13-g803bac5/autogen.sh | 1 + patches/kmscube-2017-03-13-g803bac5/series | 2 + rules/kmscube.in | 9 rules/kmscube.make | 61 ++ 5 files changed, 102 insertions(+) create mode 100644 patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch create mode 12 patches/kmscube-2017-03-13-g803bac5/autogen.sh create mode 100644 patches/kmscube-2017-03-13-g803bac5/series create mode 100644 rules/kmscube.in create mode 100644 rules/kmscube.make diff --git a/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch b/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch new file mode 100644 index 000..3aa1cb8 --- /dev/null +++ b/patches/kmscube-2017-03-13-g803bac5/0001-force-autogen-to-look-for-stdc.patch @@ -0,0 +1,29 @@ +From 3690585109ca98669a9faeadd0c5ecbe1e24dbe0 Mon Sep 17 00:00:00 2001 +From: Markus Niebel <markus.nie...@tq-group.com> +Date: Thu, 2 Mar 2017 17:17:20 +0100 +Subject: [PATCH 1/2] force autogen to look for stdc + +needed since sources using constructs needing stdc99 + +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 4441d2d..2b456d4 100644 +--- a/configure.ac b/configure.ac +@@ -36,6 +36,9 @@ AM_MAINTAINER_MODE + # Enable quiet compiles on automake 1.11. + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + ++AC_PROG_CC ++AC_PROG_CC_STDC ++ + # Initialize libtool + AC_PROG_LIBTOOL + +-- +1.9.1 + diff --git a/patches/kmscube-2017-03-13-g803bac5/autogen.sh b/patches/kmscube-2017-03-13-g803bac5/autogen.sh new file mode 12 index 000..9f8a4cb --- /dev/null +++ b/patches/kmscube-2017-03-13-g803bac5/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/kmscube-2017-03-13-g803bac5/series b/patches/kmscube-2017-03-13-g803bac5/series new file mode 100644 index 000..a88c1eb --- /dev/null +++ b/patches/kmscube-2017-03-13-g803bac5/series @@ -0,0 +1,2 @@ +0001-force-autogen-to-look-for-stdc.patch +# 0002-fix-headers.patch diff --git a/rules/kmscube.in b/rules/kmscube.in new file mode 100644 index 000..9e4a297 --- /dev/null +++ b/rules/kmscube.in @@ -0,0 +1,9 @@ +## SECTION=multimedia_libs + +config KMSCUBE + bool + prompt "kmscube" + select MESALIB + select LIBDRM + help + FIXME diff --git a/rules/kmscube.make b/rules/kmscube.make new file mode 100644 index 000..55095cd --- /dev/null +++ b/rules/kmscube.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Markus Niebel <markus.nie...@tq-group.com> +# +# 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_KMSCUBE) += kmscube + +# +# Paths and names +# +# No tags: use a fake descriptive commit-ish to include the date +KMSCUBE_VERSION:= 2017-03-13-g803bac5 +KMSCUBE:= kmscube-$(KMSCUBE_VERSION) +KMSCUBE_MD5:= 781a59ab2d1d245e99a49df7c3dc1876 +KMSCUBE_URL:= git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION) +KMSCUBE_SUFFIX := tar.gz +KMSCUBE_SOURCE := $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX) +KMSCUBE_DIR:= $(BUILDDIR)/$(KMSCUBE) + +KMSCUBE_LICENSE:= BSD + +# +# Prepare +# + +KMSCUBE_CPPFLAGS += \ + -I$(KERNEL_HEADERS_INCLUDE_DIR) + +# +# autoconf +# +KMSCUBE_CONF_TOOL := autoconf + +# +# Target-Install +# + +$(STATEDIR)/kmscube.targetinstall: + @$(call targetinfo) + + @$(call install_init, kmscube) + @$(call install_fixup, kmscube, PRIORITY, optional) + @$(call install_fixup, kmscube, SECTION, base) + @$(call install_fixup, kmscube, AUTHOR, "Markus Niebel <markus.nie...@tq-group.com>") + @$(call install_fixup, kmscube, DESCRIPTION, missing) + + $(call install_copy, kmscube, 0, 0, 0755, -, /usr/bin/kmscube) + + @$(call install_finish, kmscube)
[ptxdist] [PATCH v3] libdrm: version bump 2.7.74 -> 2.7.75
From: Markus Niebel <markus.nie...@tq-group.com> - drop not longer needed libudev dependency - make udev support optional (udev is not needed to build but if compiled with udev support udev is expected to handle device nodes) Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- changes since v2: - handle as single patch, part of original series was applied - fix udev dependency - fix commit message for new version changes since v1: - cleanup leftovers from git merge conflicts rules/libdrm.in | 10 -- rules/libdrm.make | 8 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/rules/libdrm.in b/rules/libdrm.in index 5e77665..385af35 100644 --- a/rules/libdrm.in +++ b/rules/libdrm.in @@ -4,8 +4,7 @@ menuconfig LIBDRM tristate prompt "libdrm" select LIBC_RT - select UDEV - select UDEV_LIBUDEV + select UDEV if LIBDRM_USE_UDEV && RUNTIME select LIBPTHREAD_STUBS select LIBPCIACCESS if LIBDRM_INTEL help @@ -14,6 +13,13 @@ menuconfig LIBDRM if LIBDRM +config LIBDRM_USE_UDEV + bool + prompt "Enable support for udev" + help + Enable support for using udev instead of mknod. If enabled, udev is + expected to manage device nodes for probed modules + config LIBDRM_LIBKMS bool prompt "build libkms" diff --git a/rules/libdrm.make b/rules/libdrm.make index ec02cc7..82a35b3 100644 --- a/rules/libdrm.make +++ b/rules/libdrm.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm # # Paths and names # -LIBDRM_VERSION := 2.4.74 -LIBDRM_MD5 := b661a54514109caad3de3b520680b98e +LIBDRM_VERSION := 2.4.75 +LIBDRM_MD5 := 743c16109d91a2539dfc9cc56130d695 LIBDRM := libdrm-$(LIBDRM_VERSION) LIBDRM_SUFFIX := tar.gz LIBDRM_URL := http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) @@ -61,8 +61,12 @@ LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y) LIBDRM_CONF_TOOL := autoconf LIBDRM_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ +<<<<<<< HEAD --enable-udev \ +=== +>>>>>>> 2436ea2... libdrm: version bump 2.7.75 -> 2.7.75 --$(call ptx/endis, PTXCONF_LIBDRM_LIBKMS)-libkms \ + --$(call ptx/endis, PTXCONF_LIBDRM_USE_UDEV)-udev \ $(addprefix --enable-,$(LIBDRM_BACKENDSC-y)) \ $(addprefix --disable-,$(LIBDRM_BACKENDSC-)) \ --$(call ptx/endis, PTXCONF_LIBDRM_TESTS)-install-test-programs \ -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC PATCH 1/2] nettle: add explicit support for libhogweed
Am Donnerstag, den 09.03.2017, 16:19 +0100 schrieb Michael Olbrich: > On Thu, Mar 09, 2017 at 10:37:06AM +0100, Markus Niebel wrote: > > From: Markus Niebel <markus.nie...@tq-group.com> > > > > the libhogweed part requires libgmp. Let's make it configurable. > > > > This seems wrong. My understanding is, that the --enable-mini-gmp options > exists to avoid the libgmp dependency by providing a minimalistic version > of libgmp. > If we want to use the 'real' libgmp (Are there any compelling reasons to do > so?) then the --enable-mini-gmp must be _disabled_ if libhogweed is > installed not the other way around. > > Also, the '--with-nettle-mini' of gnutls must be changed to 'without'. And > all other nettle users must be reviewed to check if they need libhogweed. > I did't noticed that in gnutls. But I came up with this because I noticed a build break during a clean rebuild on our buildserver using ptxdist 2017.01: 8<-- configure: summary of build options: Version: nettle 3.3 Host type: arm-v7a-linux-gnueabihf ABI: standard Assembly files:arm Install prefix:/usr Library directory: /usr/lib Compiler: arm-v7a-linux-gnueabihf-gcc Static libraries: no Shared libraries: yes Public key crypto: yes Using mini-gmp:yes Documentation: no finished target nettle.prepare ... -- target: gnutls.prepare -- checking build system type... x86_64-host-linux-gnu checking host system type... arm-v7a-linux-gnueabihf checking for a BSD-compatible install... /usr/local/lib/ptxdist-2017.01.0/bin/install -c checking whether build environment is sane... yes checking for arm-v7a-linux-gnueabihf-strip... arm-v7a-linux-gnueabihf-strip checking for a thread-safe mkdir -p... /usr/local/lib/ptxdist-2017.01.0/bin/mkdir -p ... checking for gawk... gawk checking whether it is safe to define __EXTENSIONS__... yes checking whether _XOPEN_SOURCE should be defined... no checking for _LARGEFILE_SOURCE value needed for large files... no checking for special C compiler options needed for large files... no checking for _FILE_OFFSET_BITS value needed for large files... 64 checking dependency style of arm-v7a-linux-gnueabihf-gcc... gcc3 checking for arm-v7a-linux-gnueabihf-ar... arm-v7a-linux-gnueabihf-ar checking the archiver (arm-v7a-linux-gnueabihf-ar) interface... ar checking whether we are using the GNU C++ compiler... yes checking whether arm-v7a-linux-gnueabihf-g++ accepts -g... yes checking dependency style of arm-v7a-linux-gnueabihf-g++... gcc3 checking for bison... bison -y checking for a sed that does not truncate output... /usr/local/lib/ptxdist-2017.01.0/bin/sed checking for autogen... /bin/true configure: WARNING: *** *** autogen not found. Will not link against libopts. *** checking for inline... inline checking for ANSI C header files... (cached) yes checking for NETTLE... yes checking for HOGWEED... yes checking for __gmpz_cmp in -lgmp... no configure: error: *** *** gmp was not found. 8< This says nettle incl. hogweed were found but a gmp feature was missing for some reason ... So something seems wrong. > Michael > Markus > > Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> > > > > Conflicts: > > rules/nettle.in > > --- > > rules/nettle.in | 14 +- > > rules/nettle.make | 11 ++- > > 2 files changed, 23 insertions(+), 2 deletions(-) > > > > diff --git a/rules/nettle.in b/rules/nettle.in > > index fcacb96..f931994 100644 > > --- a/rules/nettle.in > > +++ b/rules/nettle.in > > @@ -1,8 +1,20 @@ > > ## SECTION=networking > > > > -config NETTLE > > +menuconfig NETTLE > > tristate > > prompt "nettle" > > + select LIBGMP if NETTLE_LIBHOGWEED > > help > > Nettle is a cryptographic library. > > > > +if NETTLE > > + > > +config NETTLE_LIBHOGWEED > > + bool > > + prompt "Build libhogweed" > > + help > > + The libhogweed library contains those functions of Nettle that > > + uses bignum operations, and depends on the GMP library > > + > > +endif > > + > > diff --git a/rules/nettle.make b/rules/nettle.make > > index 59df66e..23d6cb8 100644 > > --- a/rules/nettle.make > > +++ b/rules/nettle.make > > @@ -48,8 +48,15 @@ NETTLE_CONF_OPT := \ > > --disable-documentation \ > > --disable-fat \ > > --$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-arm-neon \ > > - --disable-x86-aesni \ > > + --disable-x86-aesni > > + > &g
Re: [ptxdist] [PATCH RFC] ptxdist: Toplevel.make: make ptxdist print work again
Hello, Am Donnerstag, den 09.03.2017, 12:53 +0100 schrieb Michael Olbrich: > On Thu, Mar 09, 2017 at 11:16:33AM +0100, Markus Niebel wrote: > > From: Markus Niebel <markus.nie...@tq-group.com> > > > > The changed print rule broke most of the print functionality resulting > > in no output / error return. Splitting the combinded rule into two targets > > seems to fix this > > This seems to be make version dependent. 4.1 works but 3.81 does not. > With this change both seem to work fine. > > What's your make version? > It's 3.81. I had some thoughts about version deps but did not test - therefore the RFC. > Michael > Markus > > Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> > > --- > > rules/other/Toplevel.make | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make > > index d8c9fc3..4287fb2 100644 > > --- a/rules/other/Toplevel.make > > +++ b/rules/other/Toplevel.make > > @@ -107,10 +107,12 @@ include $(PTX_DGEN_DEPS_POST) > > # just the "print" target > > # > > > > > > -print-% /print-%: FORCE > > +/print-%: FORCE > > $(if $(filter k,$(MAKEFLAGS)),,$($(if $(filter undefined,$(origin > > $(*))),$(error $(*) undefined > > @echo "$(if $(filter 1,$(PTXDIST_VERBOSE)),$(*)=)$($(*))" > > > > +print-%: /print-% > > + > > .PHONY: $(PHONY) > > > > # vim600:set foldmethod=marker: > > -- > > 1.9.1 > > > > > ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 3/5] libdrm: version bump 2.7.74 -> 2.7.75
From: Markus Niebel <markus.nie...@tq-group.com> drop not longer needed udev dep Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- changes since v1: - cleanup leftovers from git merge conflicts rules/libdrm.in | 2 -- rules/libdrm.make | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/rules/libdrm.in b/rules/libdrm.in index 5e77665..b6aa08f 100644 --- a/rules/libdrm.in +++ b/rules/libdrm.in @@ -4,8 +4,6 @@ menuconfig LIBDRM tristate prompt "libdrm" select LIBC_RT - select UDEV - select UDEV_LIBUDEV select LIBPTHREAD_STUBS select LIBPCIACCESS if LIBDRM_INTEL help diff --git a/rules/libdrm.make b/rules/libdrm.make index ec02cc7..33c54d6 100644 --- a/rules/libdrm.make +++ b/rules/libdrm.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm # # Paths and names # -LIBDRM_VERSION := 2.4.74 -LIBDRM_MD5 := b661a54514109caad3de3b520680b98e +LIBDRM_VERSION := 2.4.75 +LIBDRM_MD5 := 743c16109d91a2539dfc9cc56130d695 LIBDRM := libdrm-$(LIBDRM_VERSION) LIBDRM_SUFFIX := tar.gz LIBDRM_URL := http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) @@ -61,7 +61,6 @@ LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y) LIBDRM_CONF_TOOL := autoconf LIBDRM_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --enable-udev \ --$(call ptx/endis, PTXCONF_LIBDRM_LIBKMS)-libkms \ $(addprefix --enable-,$(LIBDRM_BACKENDSC-y)) \ $(addprefix --disable-,$(LIBDRM_BACKENDSC-)) \ -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 5/5] glmark2: add new package
From: Markus Niebel <markus.nie...@tq-group.com> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- ...NativeStateDRM-add-imx-drm-driver-support.patch | 29 .../series | 1 + rules/glmark2.in | 45 ++ rules/glmark2.make | 156 + 4 files changed, 231 insertions(+) create mode 100644 patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch create mode 100644 patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series create mode 100644 rules/glmark2.in create mode 100644 rules/glmark2.make diff --git a/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch new file mode 100644 index 000..275db2b --- /dev/null +++ b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch @@ -0,0 +1,29 @@ +From e002a3f6d912591cfc33404174ce7140120b7d6c Mon Sep 17 00:00:00 2001 +From: Markus Niebel <markus.nie...@tq-group.com> +Date: Tue, 7 Mar 2017 13:53:33 +0100 +Subject: [PATCH] NativeStateDRM: add imx-drm driver support + +originated from buildroot commit a10b15ebeb5fd82fdb0530d485095f5800103a49 + +glmark2: add imx-drm driver support +Upstream status: pending +https://github.com/glmark2/glmark2/pull/29 + +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> +Signed-off-by: Gary Bisson <gary.bis...@boundarydevices.com> +--- + src/native-state-drm.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp +index 4df75ec..454a24d 100644 +--- a/src/native-state-drm.cpp b/src/native-state-drm.cpp +@@ -201,6 +201,7 @@ NativeStateDRM::init() + // driver (udev?). + static const char* drm_modules[] = { + "i915", ++"imx-drm", + "nouveau", + "radeon", + "vmgfx", diff --git a/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series new file mode 100644 index 000..873d5a7 --- /dev/null +++ b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series @@ -0,0 +1 @@ +0001-NativeStateDRM-add-imx-drm-driver-support.patch diff --git a/rules/glmark2.in b/rules/glmark2.in new file mode 100644 index 000..d549196 --- /dev/null +++ b/rules/glmark2.in @@ -0,0 +1,45 @@ +## SECTION=multimedia_libs + +menuconfig GLMARK2 + tristate + prompt "glmark2" + select MESALIB + select HOST_PYTHON + select LIBPNG + select LIBJPEG + help + FIXME + +if GLMARK2 + +config GLMARK2_FLAVOR_X11_GL + bool + prompt "x11-gl" + depends on MESALIB_GLX && MESALIB_OPENGL + +config GLMARK2_FLAVOR_X11_GLES2 + bool + prompt "x11-gles2" + depends on MESALIB_GLX && MESALIB_GLES2 + +config GLMARK2_FLAVOR_DRM_GL + bool + prompt "drm-gl" + depends on MESALIB_EGL_DRM && MESALIB_OPENGL + +config GLMARK2_FLAVOR_DRM_GLES2 + bool + prompt "drm-gles2" + depends on MESALIB_EGL_DRM && MESALIB_GLES2 + +config GLMARK2_FLAVOR_WAYLAND_GL + bool + prompt "wayland-gl" + depends on MESALIB_EGL_WAYLAND && MESALIB_OPENGL + +config GLMARK2_FLAVOR_WAYLAND_GLES2 + bool + prompt "wayland-gles2" + depends on MESALIB_EGL_WAYLAND && MESALIB_GLES2 + +endif diff --git a/rules/glmark2.make b/rules/glmark2.make new file mode 100644 index 000..d286708 --- /dev/null +++ b/rules/glmark2.make @@ -0,0 +1,156 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Markus Niebel <markus.nie...@tqs.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_GLMARK2) += glmark2 + +# +# Paths and names +# +GLMARK2_VERSION:= 7215c0f337dae0b232535549c37fca441747a891 +GLMARK2_MD5:= 7547b54da2ff7335c9316e084519adc9 +GLMARK2:= glmark2-$(GLMARK2_VERSION) +GLMARK2_SUFFIX := tar.xz +GLMARK2_URL:= https://github.com/glmark2/glmark2.git;tag=$(GLMARK2_VERSION) +GLMARK2_SOURCE := $(SRCDIR)/$(GLMARK2).$(GLMARK2_SUFFIX) +GLMARK2_DIR:= $(BUILDDIR)/$(GLMARK2) +GLMARK2_LICENSE:= GPL-3.0, SGIv1 +GLMARK2_LICENSE_FILES := \ + file://COPYING;md5=899fbe7e42d494c7c8c159c7001693d5 \ + file://COPYING.SGI;md5=899fbe7e42d494c7c8c159c7001693d5 + + +# +#
[ptxdist] [PATCH v2 4/5] kmscube: add new package
From: Markus Niebel <markus.nie...@tq-group.com> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- .../0001-force-autogen-to-look-for-stdc.patch | 29 +++ .../0002-fix-headers.patch | 39 + .../autogen.sh | 18 + .../series | 2 + rules/kmscube.in | 9 +++ rules/kmscube.make | 92 ++ 6 files changed, 189 insertions(+) create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch create mode 100755 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series create mode 100644 rules/kmscube.in create mode 100644 rules/kmscube.make diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch new file mode 100644 index 000..3aa1cb8 --- /dev/null +++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch @@ -0,0 +1,29 @@ +From 3690585109ca98669a9faeadd0c5ecbe1e24dbe0 Mon Sep 17 00:00:00 2001 +From: Markus Niebel <markus.nie...@tq-group.com> +Date: Thu, 2 Mar 2017 17:17:20 +0100 +Subject: [PATCH 1/2] force autogen to look for stdc + +needed since sources using constructs needing stdc99 + +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 4441d2d..2b456d4 100644 +--- a/configure.ac b/configure.ac +@@ -36,6 +36,9 @@ AM_MAINTAINER_MODE + # Enable quiet compiles on automake 1.11. + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + ++AC_PROG_CC ++AC_PROG_CC_STDC ++ + # Initialize libtool + AC_PROG_LIBTOOL + +-- +1.9.1 + diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch new file mode 100644 index 000..cee67d9 --- /dev/null +++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch @@ -0,0 +1,39 @@ +From 20877b1bc6c7bee69e2a13e7f8c69bc02f2e7405 Mon Sep 17 00:00:00 2001 +From: Markus Niebel <markus.nie...@tq-group.com> +Date: Thu, 2 Mar 2017 17:18:53 +0100 +Subject: [PATCH 2/2] fix headers + +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> +--- + drm-atomic.c | 1 + + drm-legacy.c | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/drm-atomic.c b/drm-atomic.c +index b4755e1..1c71840 100644 +--- a/drm-atomic.c b/drm-atomic.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + #include "common.h" +diff --git a/drm-legacy.c b/drm-legacy.c +index 29d5f3c..1029904 100644 +--- a/drm-legacy.c b/drm-legacy.c +@@ -24,6 +24,8 @@ + #include + #include + #include ++#include ++#include + + #include "common.h" + #include "drm.h" +-- +1.9.1 + diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh new file mode 100755 index 000..df78c38 --- /dev/null +++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -e + +aclocal $ACLOCAL_FLAGS + +libtoolize \ + --force \ + --copy + +autoreconf \ + --force \ + --install \ + --warnings=cross \ + --warnings=syntax \ + --warnings=obsolete \ + --warnings=unsupported + diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series new file mode 100644 index 000..b2ac20a --- /dev/null +++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series @@ -0,0 +1,2 @@ +0001-force-autogen-to-look-for-stdc.patch +0002-fix-headers.patch diff --git a/rules/kmscube.in b/rules/kmscube.in new file mode 100644 index 000..6f9034e --- /dev/null +++ b/rules/kmscube.in @@ -0,0 +1,9 @@ +## SECTION=multimedia_libs + +config KMSCUBE + bool + prompt "kmscube" + depends on MESALIB + depends on LIBDRM + help + FIXME diff --git a/rules/kmscube.make b/rules/kmscube.make new file mode 100644 index 000..91446cc --- /dev/null +++ b/rules/kmscube.make @@ -0,0 +1,92 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Markus Niebel <markus.nie...@tq-group.com> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project
[ptxdist] [PATCH v2 1/5] host-system-python: add check for mako
From: Markus Niebel <markus.nie...@tq-group.com> needed for mesa 17 and newer Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- rules/host-system-python.in | 3 +++ rules/host-system-python.make | 6 ++ 2 files changed, 9 insertions(+) diff --git a/rules/host-system-python.in b/rules/host-system-python.in index 300b078..61fdbc6 100644 --- a/rules/host-system-python.in +++ b/rules/host-system-python.in @@ -14,4 +14,7 @@ config HOST_SYSTEM_PYTHON_ARGPARSE config HOST_SYSTEM_PYTHON_BZ2 bool +config HOST_SYSTEM_PYTHON_MAKO + bool + endif diff --git a/rules/host-system-python.make b/rules/host-system-python.make index 31b29b9..a521176 100644 --- a/rules/host-system-python.make +++ b/rules/host-system-python.make @@ -41,6 +41,12 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON_BZ2 ptxd_bailout "Python bz2 module not found! \ Please install python-bz2"; endif +ifdef PTXCONF_HOST_SYSTEM_PYTHON_MAKO + @echo "Checking for Python Mako ..." + @python -c 'import mako' 2>/dev/null || \ + ptxd_bailout "Python mako module not found! \ + Please install python-mako (debian)"; +endif @echo @$(call touch) -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 0/5] update drm / mesa support and add testtools
From: Markus Niebel <markus.nie...@tq-group.com> Markus Niebel (5): host-system-python: add check for mako mesalib: version bump 13.0.2 -> 17.0.1 libdrm: version bump 2.7.74 -> 2.7.75 kmscube: add new package glmark2: add new package ...NativeStateDRM-add-imx-drm-driver-support.patch | 29 .../series | 1 + .../0001-force-autogen-to-look-for-stdc.patch | 29 .../0002-fix-headers.patch | 39 ++ .../autogen.sh | 18 +++ .../series | 2 + rules/glmark2.in | 45 ++ rules/glmark2.make | 156 + rules/host-mesalib.in | 1 + rules/host-mesalib.make| 2 - rules/host-system-python.in| 3 + rules/host-system-python.make | 6 + rules/kmscube.in | 9 ++ rules/kmscube.make | 92 rules/libdrm.in| 2 - rules/libdrm.make | 7 +- rules/mesalib.in | 20 +++ rules/mesalib.make | 25 +++- 18 files changed, 473 insertions(+), 13 deletions(-) create mode 100644 patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch create mode 100644 patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch create mode 100755 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series create mode 100644 rules/glmark2.in create mode 100644 rules/glmark2.make create mode 100644 rules/kmscube.in create mode 100644 rules/kmscube.make -- changes since v1: - cleanup leftovers from git merge conflicts 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/5] mesalib: version bump 13.0.2 -> 17.0.1
Am Donnerstag, den 09.03.2017, 11:39 +0100 schrieb Marc Kleine-Budde: > * PGP Signed by an unknown key > > On 03/09/2017 11:05 AM, Markus Niebel wrote: > > From: Markus Niebel <markus.nie...@tq-group.com> > > > > - add support for etnaviv > > - update config opts > > - add fallback download URL (newest mesalib seems to live there) > > > > Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> > > --- > > rules/host-mesalib.in | 1 + > > rules/host-mesalib.make | 2 -- > > rules/mesalib.in| 20 > > rules/mesalib.make | 25 ++--- > > 4 files changed, 39 insertions(+), 9 deletions(-) > > > > diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in > > index 1bf56ae..29a6a22 100644 > > --- a/rules/host-mesalib.in > > +++ b/rules/host-mesalib.in > > @@ -6,4 +6,5 @@ config HOST_MESALIB > > select HOST_MAKEDEPEND > > select HOST_SYSTEM_PYTHON > > select HOST_SYSTEM_PYTHON_XML2 > > + select HOST_SYSTEM_PYTHON_MAKO > > select HOST_LIBPTHREAD_STUBS > > diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make > > index 1619d20..48702ac 100644 > > --- a/rules/host-mesalib.make > > +++ b/rules/host-mesalib.make > > @@ -53,7 +53,6 @@ HOST_MESALIB_CONF_OPT := \ > > --disable-opencl \ > > --disable-opencl-icd \ > > --disable-gallium-tests \ > > - --disable-shader-cache \ > > --enable-shared-glapi \ > > --disable-glx-read-only-text \ > > --disable-driglx-direct \ > > @@ -61,7 +60,6 @@ HOST_MESALIB_CONF_OPT := \ > > --disable-llvm-shared-libs \ > > --disable-gallium-llvm \ > > --disable-libglvnd \ > > - --with-sha1= \ > > --with-gallium-drivers= \ > > --with-dri-drivers= \ > > --without-vulkan-drivers > > diff --git a/rules/mesalib.in b/rules/mesalib.in > > index 430c94e..a4daf2d 100644 > > --- a/rules/mesalib.in > > +++ b/rules/mesalib.in > > @@ -7,6 +7,10 @@ menuconfig MESALIB > > select HOST_MAKEDEPEND > > select HOST_SYSTEM_PYTHON > > select HOST_SYSTEM_PYTHON_XML2 > > +<<<<<<< HEAD > > +=== > > + select HOST_SYSTEM_PYTHON_MAKO > > +>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0 > > This looks like some merge conflics left over. > Indeed - I sorted out a bunch of patches. Sorry, will resend the patches. > Marc > > ___ > ptxdist mailing list > ptxdist@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [RFC PATCH 2/2] gnutls: needs libhogweed from nettle
From: Markus Niebel <markus.nie...@tq-group.com> explicitly select NETTLE_LIBHOGWEED to satisfy additional hidden dep from libgmp Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> Conflicts: rules/gnutls.in --- rules/gnutls.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/gnutls.in b/rules/gnutls.in index 73e610f..f901489 100644 --- a/rules/gnutls.in +++ b/rules/gnutls.in @@ -6,6 +6,7 @@ menuconfig GNUTLS select LIBGCRYPT select LIBTASN1 select NETTLE + select NETTLE_LIBHOGWEED select OPENSSL if GNUTLS_OPENSSL prompt "gnutls" help -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 5/5] glmark2: add new package
From: Markus Niebel <markus.nie...@tq-group.com> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- ...NativeStateDRM-add-imx-drm-driver-support.patch | 29 .../series | 1 + rules/glmark2.in | 45 ++ rules/glmark2.make | 156 + 4 files changed, 231 insertions(+) create mode 100644 patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch create mode 100644 patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series create mode 100644 rules/glmark2.in create mode 100644 rules/glmark2.make diff --git a/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch new file mode 100644 index 000..275db2b --- /dev/null +++ b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch @@ -0,0 +1,29 @@ +From e002a3f6d912591cfc33404174ce7140120b7d6c Mon Sep 17 00:00:00 2001 +From: Markus Niebel <markus.nie...@tq-group.com> +Date: Tue, 7 Mar 2017 13:53:33 +0100 +Subject: [PATCH] NativeStateDRM: add imx-drm driver support + +originated from buildroot commit a10b15ebeb5fd82fdb0530d485095f5800103a49 + +glmark2: add imx-drm driver support +Upstream status: pending +https://github.com/glmark2/glmark2/pull/29 + +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> +Signed-off-by: Gary Bisson <gary.bis...@boundarydevices.com> +--- + src/native-state-drm.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp +index 4df75ec..454a24d 100644 +--- a/src/native-state-drm.cpp b/src/native-state-drm.cpp +@@ -201,6 +201,7 @@ NativeStateDRM::init() + // driver (udev?). + static const char* drm_modules[] = { + "i915", ++"imx-drm", + "nouveau", + "radeon", + "vmgfx", diff --git a/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series new file mode 100644 index 000..873d5a7 --- /dev/null +++ b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series @@ -0,0 +1 @@ +0001-NativeStateDRM-add-imx-drm-driver-support.patch diff --git a/rules/glmark2.in b/rules/glmark2.in new file mode 100644 index 000..d549196 --- /dev/null +++ b/rules/glmark2.in @@ -0,0 +1,45 @@ +## SECTION=multimedia_libs + +menuconfig GLMARK2 + tristate + prompt "glmark2" + select MESALIB + select HOST_PYTHON + select LIBPNG + select LIBJPEG + help + FIXME + +if GLMARK2 + +config GLMARK2_FLAVOR_X11_GL + bool + prompt "x11-gl" + depends on MESALIB_GLX && MESALIB_OPENGL + +config GLMARK2_FLAVOR_X11_GLES2 + bool + prompt "x11-gles2" + depends on MESALIB_GLX && MESALIB_GLES2 + +config GLMARK2_FLAVOR_DRM_GL + bool + prompt "drm-gl" + depends on MESALIB_EGL_DRM && MESALIB_OPENGL + +config GLMARK2_FLAVOR_DRM_GLES2 + bool + prompt "drm-gles2" + depends on MESALIB_EGL_DRM && MESALIB_GLES2 + +config GLMARK2_FLAVOR_WAYLAND_GL + bool + prompt "wayland-gl" + depends on MESALIB_EGL_WAYLAND && MESALIB_OPENGL + +config GLMARK2_FLAVOR_WAYLAND_GLES2 + bool + prompt "wayland-gles2" + depends on MESALIB_EGL_WAYLAND && MESALIB_GLES2 + +endif diff --git a/rules/glmark2.make b/rules/glmark2.make new file mode 100644 index 000..d286708 --- /dev/null +++ b/rules/glmark2.make @@ -0,0 +1,156 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Markus Niebel <markus.nie...@tqs.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_GLMARK2) += glmark2 + +# +# Paths and names +# +GLMARK2_VERSION:= 7215c0f337dae0b232535549c37fca441747a891 +GLMARK2_MD5:= 7547b54da2ff7335c9316e084519adc9 +GLMARK2:= glmark2-$(GLMARK2_VERSION) +GLMARK2_SUFFIX := tar.xz +GLMARK2_URL:= https://github.com/glmark2/glmark2.git;tag=$(GLMARK2_VERSION) +GLMARK2_SOURCE := $(SRCDIR)/$(GLMARK2).$(GLMARK2_SUFFIX) +GLMARK2_DIR:= $(BUILDDIR)/$(GLMARK2) +GLMARK2_LICENSE:= GPL-3.0, SGIv1 +GLMARK2_LICENSE_FILES := \ + file://COPYING;md5=899fbe7e42d494c7c8c159c7001693d5 \ + file://COPYING.SGI;md5=899fbe7e42d494c7c8c159c7001693d5 + + +# +#
[ptxdist] [PATCH 2/5] mesalib: version bump 13.0.2 -> 17.0.1
From: Markus Niebel <markus.nie...@tq-group.com> - add support for etnaviv - update config opts - add fallback download URL (newest mesalib seems to live there) Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- rules/host-mesalib.in | 1 + rules/host-mesalib.make | 2 -- rules/mesalib.in| 20 rules/mesalib.make | 25 ++--- 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in index 1bf56ae..29a6a22 100644 --- a/rules/host-mesalib.in +++ b/rules/host-mesalib.in @@ -6,4 +6,5 @@ config HOST_MESALIB select HOST_MAKEDEPEND select HOST_SYSTEM_PYTHON select HOST_SYSTEM_PYTHON_XML2 + select HOST_SYSTEM_PYTHON_MAKO select HOST_LIBPTHREAD_STUBS diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make index 1619d20..48702ac 100644 --- a/rules/host-mesalib.make +++ b/rules/host-mesalib.make @@ -53,7 +53,6 @@ HOST_MESALIB_CONF_OPT := \ --disable-opencl \ --disable-opencl-icd \ --disable-gallium-tests \ - --disable-shader-cache \ --enable-shared-glapi \ --disable-glx-read-only-text \ --disable-driglx-direct \ @@ -61,7 +60,6 @@ HOST_MESALIB_CONF_OPT := \ --disable-llvm-shared-libs \ --disable-gallium-llvm \ --disable-libglvnd \ - --with-sha1= \ --with-gallium-drivers= \ --with-dri-drivers= \ --without-vulkan-drivers diff --git a/rules/mesalib.in b/rules/mesalib.in index 430c94e..a4daf2d 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -7,6 +7,10 @@ menuconfig MESALIB select HOST_MAKEDEPEND select HOST_SYSTEM_PYTHON select HOST_SYSTEM_PYTHON_XML2 +<<<<<<< HEAD +=== + select HOST_SYSTEM_PYTHON_MAKO +>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0 select GCCLIBS select GCCLIBS_CXX select LIBDRM @@ -19,6 +23,10 @@ menuconfig MESALIB select LIBDRM_RADEONif MESALIB_DRI_RADEONSI select LIBDRM_NOUVEAU if MESALIB_DRI_NOUVEAU || MESALIB_DRI_NOUVEAU_VIEUX select LIBDRM_FREEDRENO if MESALIB_DRI_FREEDRENO +<<<<<<< HEAD +=== + select LIBDRM_ETNAVIV if MESALIB_DRI_ETNAVIV +>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0 select XORG_PROTO_DRI2 if MESALIB_GLX select XORG_LIB_X11 if MESALIB_GLX select XORG_LIB_XEXTif MESALIB_GLX @@ -91,6 +99,18 @@ config MESALIB_DRI_FREEDRENO bool prompt "Freedreno" +<<<<<<< HEAD +=== +config MESALIB_DRI_ETNAVIV + bool + prompt "Etnaviv" + +config MESALIB_DRI_IMX + bool + depends on MESALIB_DRI_ETNAVIV + prompt "imx" + +>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0 config MESALIB_DRI_VC4 bool prompt "vc4" diff --git a/rules/mesalib.make b/rules/mesalib.make index 2c7389b..5299a0c 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -19,11 +19,13 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 13.0.2 -MESALIB_MD5:= 9442c2dee914cde3d1f090371ab04113 +MESALIB_VERSION:= 17.0.1 +MESALIB_MD5:= 6a7e768241846c8c69bbadbf904dcc58 MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz -MESALIB_URL:= ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB_VERSION)/$(MESALIB).$(MESALIB_SUFFIX) +MESALIB_URL:= \ + ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB_VERSION)/$(MESALIB).$(MESALIB_SUFFIX) \ + ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB).$(MESALIB_SUFFIX) MESALIB_SOURCE := $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX) MESALIB_DIR:= $(BUILDDIR)/Mesa-$(MESALIB_VERSION) MESALIB_LICENSE:= MIT @@ -55,6 +57,10 @@ endif MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU) += nouveau MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_FREEDRENO)+= freedreno + +MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ETNAVIV)+= etnaviv +MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_IMX)+= imx + ifdef PTXCONF_ARCH_ARM MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_VC4) += vc4 endif @@ -62,8 +68,15 @@ endif MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST) += swrast MESALIB_DRI_LIBS-y += \ - $(subst nouveau,nouveau_vieux,$(MESALIB_DRI_DRIVERS-y)) \ - $(subst freedreno,kgsl,$(MESALIB_GALLIUM_DRIVERS-y)) + $(MESALIB_DRI_DRIVERS-y) \ + $(MESALIB_GALLIUM_DRIVERS-y) + +MESALIB_DRI_LIBS-y := \ + $(subst nouveau,nouveau_vieux,$(MESALIB_DRI_LIBS-y)) +MESALIB_DRI_LIBS-y := \ + $(subst imx,imx-drm,$(MESALIB_DRI_LIBS-y)) +MESALIB_DRI_LIBS-y := \ + $(subst freedreno,kgsl,$(MESALIB_DRI_LIBS-y)) MESALIB_LIBS-y
[ptxdist] [PATCH 3/5] libdrm: version bump 2.7.74 -> 2.7.75
From: Markus Niebel <markus.nie...@tq-group.com> drop not longer needed udev dep Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- rules/libdrm.in | 2 -- rules/libdrm.make | 7 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rules/libdrm.in b/rules/libdrm.in index 5e77665..b6aa08f 100644 --- a/rules/libdrm.in +++ b/rules/libdrm.in @@ -4,8 +4,6 @@ menuconfig LIBDRM tristate prompt "libdrm" select LIBC_RT - select UDEV - select UDEV_LIBUDEV select LIBPTHREAD_STUBS select LIBPCIACCESS if LIBDRM_INTEL help diff --git a/rules/libdrm.make b/rules/libdrm.make index ec02cc7..f97e011 100644 --- a/rules/libdrm.make +++ b/rules/libdrm.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm # # Paths and names # -LIBDRM_VERSION := 2.4.74 -LIBDRM_MD5 := b661a54514109caad3de3b520680b98e +LIBDRM_VERSION := 2.4.75 +LIBDRM_MD5 := 743c16109d91a2539dfc9cc56130d695 LIBDRM := libdrm-$(LIBDRM_VERSION) LIBDRM_SUFFIX := tar.gz LIBDRM_URL := http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) @@ -61,7 +61,10 @@ LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y) LIBDRM_CONF_TOOL := autoconf LIBDRM_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ +<<<<<<< HEAD --enable-udev \ +=== +>>>>>>> 2436ea2... libdrm: version bump 2.7.75 -> 2.7.75 --$(call ptx/endis, PTXCONF_LIBDRM_LIBKMS)-libkms \ $(addprefix --enable-,$(LIBDRM_BACKENDSC-y)) \ $(addprefix --disable-,$(LIBDRM_BACKENDSC-)) \ -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH RFC] ptxdist: Toplevel.make: make ptxdist print work again
From: Markus Niebel <markus.nie...@tq-group.com> The changed print rule broke most of the print functionality resulting in no output / error return. Splitting the combinded rule into two targets seems to fix this Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- rules/other/Toplevel.make | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index d8c9fc3..4287fb2 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -107,10 +107,12 @@ include $(PTX_DGEN_DEPS_POST) # just the "print" target # -print-% /print-%: FORCE +/print-%: FORCE $(if $(filter k,$(MAKEFLAGS)),,$($(if $(filter undefined,$(origin $(*))),$(error $(*) undefined @echo "$(if $(filter 1,$(PTXDIST_VERBOSE)),$(*)=)$($(*))" +print-%: /print-% + .PHONY: $(PHONY) # vim600:set foldmethod=marker: -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] wayland: add missing dependency to expat
From: Markus Niebel <markus.nie...@tq-group.com> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- rules/wayland.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/wayland.in b/rules/wayland.in index a8a8932..b798069 100644 --- a/rules/wayland.in +++ b/rules/wayland.in @@ -6,6 +6,7 @@ config WAYLAND select LIBC_M select LIBC_RT select LIBFFI + select EXPAT prompt "wayland" help Wayland compositor infrastructure client and server libraries. -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 4/5] kmscube: add new package
From: Markus Niebel <markus.nie...@tq-group.com> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- .../0001-force-autogen-to-look-for-stdc.patch | 29 +++ .../0002-fix-headers.patch | 39 + .../autogen.sh | 18 + .../series | 2 + rules/kmscube.in | 9 +++ rules/kmscube.make | 92 ++ 6 files changed, 189 insertions(+) create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch create mode 100755 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series create mode 100644 rules/kmscube.in create mode 100644 rules/kmscube.make diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch new file mode 100644 index 000..3aa1cb8 --- /dev/null +++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch @@ -0,0 +1,29 @@ +From 3690585109ca98669a9faeadd0c5ecbe1e24dbe0 Mon Sep 17 00:00:00 2001 +From: Markus Niebel <markus.nie...@tq-group.com> +Date: Thu, 2 Mar 2017 17:17:20 +0100 +Subject: [PATCH 1/2] force autogen to look for stdc + +needed since sources using constructs needing stdc99 + +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 4441d2d..2b456d4 100644 +--- a/configure.ac b/configure.ac +@@ -36,6 +36,9 @@ AM_MAINTAINER_MODE + # Enable quiet compiles on automake 1.11. + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + ++AC_PROG_CC ++AC_PROG_CC_STDC ++ + # Initialize libtool + AC_PROG_LIBTOOL + +-- +1.9.1 + diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch new file mode 100644 index 000..cee67d9 --- /dev/null +++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch @@ -0,0 +1,39 @@ +From 20877b1bc6c7bee69e2a13e7f8c69bc02f2e7405 Mon Sep 17 00:00:00 2001 +From: Markus Niebel <markus.nie...@tq-group.com> +Date: Thu, 2 Mar 2017 17:18:53 +0100 +Subject: [PATCH 2/2] fix headers + +Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> +--- + drm-atomic.c | 1 + + drm-legacy.c | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/drm-atomic.c b/drm-atomic.c +index b4755e1..1c71840 100644 +--- a/drm-atomic.c b/drm-atomic.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + #include "common.h" +diff --git a/drm-legacy.c b/drm-legacy.c +index 29d5f3c..1029904 100644 +--- a/drm-legacy.c b/drm-legacy.c +@@ -24,6 +24,8 @@ + #include + #include + #include ++#include ++#include + + #include "common.h" + #include "drm.h" +-- +1.9.1 + diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh new file mode 100755 index 000..df78c38 --- /dev/null +++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -e + +aclocal $ACLOCAL_FLAGS + +libtoolize \ + --force \ + --copy + +autoreconf \ + --force \ + --install \ + --warnings=cross \ + --warnings=syntax \ + --warnings=obsolete \ + --warnings=unsupported + diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series new file mode 100644 index 000..b2ac20a --- /dev/null +++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series @@ -0,0 +1,2 @@ +0001-force-autogen-to-look-for-stdc.patch +0002-fix-headers.patch diff --git a/rules/kmscube.in b/rules/kmscube.in new file mode 100644 index 000..6f9034e --- /dev/null +++ b/rules/kmscube.in @@ -0,0 +1,9 @@ +## SECTION=multimedia_libs + +config KMSCUBE + bool + prompt "kmscube" + depends on MESALIB + depends on LIBDRM + help + FIXME diff --git a/rules/kmscube.make b/rules/kmscube.make new file mode 100644 index 000..91446cc --- /dev/null +++ b/rules/kmscube.make @@ -0,0 +1,92 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Markus Niebel <markus.nie...@tq-group.com> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project
[ptxdist] [RFC PATCH 0/2] fix indirect gnutls dependency
From: Markus Niebel <markus.nie...@tq-group.com> gnutls expects libhogweed from nettle and indirect libgmp. Try to fix this with adding a config for libhogweed and selecting libgmp from nettle for libhogweed support. I'm not really sure if this is the way to go. On the other hand the mini-gmp support in nettle could be dropped an nettle could select libgmp unconditionally Markus Niebel (2): nettle: add explicit support for libhogweed gnutls: needs libhogweed from nettle rules/gnutls.in | 1 + rules/nettle.in | 14 +- rules/nettle.make | 11 ++- 3 files changed, 24 insertions(+), 2 deletions(-) -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [RFC PATCH 1/2] nettle: add explicit support for libhogweed
From: Markus Niebel <markus.nie...@tq-group.com> the libhogweed part requires libgmp. Let's make it configurable. Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> Conflicts: rules/nettle.in --- rules/nettle.in | 14 +- rules/nettle.make | 11 ++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/rules/nettle.in b/rules/nettle.in index fcacb96..f931994 100644 --- a/rules/nettle.in +++ b/rules/nettle.in @@ -1,8 +1,20 @@ ## SECTION=networking -config NETTLE +menuconfig NETTLE tristate prompt "nettle" + select LIBGMP if NETTLE_LIBHOGWEED help Nettle is a cryptographic library. +if NETTLE + +config NETTLE_LIBHOGWEED + bool + prompt "Build libhogweed" + help + The libhogweed library contains those functions of Nettle that + uses bignum operations, and depends on the GMP library + +endif + diff --git a/rules/nettle.make b/rules/nettle.make index 59df66e..23d6cb8 100644 --- a/rules/nettle.make +++ b/rules/nettle.make @@ -48,8 +48,15 @@ NETTLE_CONF_OPT := \ --disable-documentation \ --disable-fat \ --$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-arm-neon \ - --disable-x86-aesni \ + --disable-x86-aesni + +ifdef PTXCONF_NETTLE_LIBHOGWEED +NETTLE_CONF_OPT+= \ --enable-mini-gmp +else +NETTLE_CONF_OPT+= \ + --disable-mini-gmp +endif # # Target-Install @@ -65,7 +72,9 @@ $(STATEDIR)/nettle.targetinstall: @$(call install_fixup, nettle,DESCRIPTION,missing) @$(call install_lib, nettle, 0, 0, 0644, libnettle) +ifdef PTXCONF_NETTLE_LIBHOGWEED @$(call install_lib, nettle, 0, 0, 0644, libhogweed) +endif @$(call install_copy, nettle, 0, 0, 0755, -, /usr/bin/nettle-hash) @$(call install_copy, nettle, 0, 0, 0755, -, /usr/bin/sexp-conv) @$(call install_copy, nettle, 0, 0, 0755, -, /usr/bin/nettle-lfib-stream) -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/2] kernel: depend kernel on having bc installed
From: Markus Niebel <markus.nie...@tq-group.com> This is needed to build kernels newer than 3.10. Select new host-bc rule for kernel target to make sure bc is there before compiling kernel Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- platforms/kernel.in | 1 + 1 file changed, 1 insertion(+) diff --git a/platforms/kernel.in b/platforms/kernel.in index fd1c492..8b16739 100644 --- a/platforms/kernel.in +++ b/platforms/kernel.in @@ -8,6 +8,7 @@ menuconfig KERNEL select HOST_XZ if KERNEL_XZ select HOST_LZOPif KERNEL_LZOP select HOST_LIBKMOD if KERNEL_MODULES + select HOST_SYSTEM_BC prompt "Linux kernel " if KERNEL -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 0/2] fix kernel build dep from bc
From: Markus Niebel <markus.nie...@tq-group.com> kernel versions newer than 3.10 have bc as build dependency add a new host-system-bc package and let kernel select this package Markus Niebel (2): host-system-bc: add new host-system package kernel: depend kernel on having bc installed platforms/kernel.in | 1 + rules/host-bc.in| 6 ++ rules/host-bc.make | 17 + 3 files changed, 24 insertions(+) create mode 100644 rules/host-bc.in create mode 100644 rules/host-bc.make -- Changes for v2: - use host-system logic as suggested by Michael Olbrich - depend kernel on HOST_SYSTEM_BC 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 1/2] host-system-bc: add new host-system package
From: Markus Niebel <markus.nie...@tq-group.com> Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- rules/host-system-bc.in | 6 ++ rules/host-system-bc.make | 28 2 files changed, 34 insertions(+) create mode 100644 rules/host-system-bc.in create mode 100644 rules/host-system-bc.make diff --git a/rules/host-system-bc.in b/rules/host-system-bc.in new file mode 100644 index 000..4234792 --- /dev/null +++ b/rules/host-system-bc.in @@ -0,0 +1,6 @@ +## SECTION=hosttools_noprompt +## SECTION=hosttools_platform + +config HOST_SYSTEM_BC + tristate + diff --git a/rules/host-system-bc.make b/rules/host-system-bc.make new file mode 100644 index 000..5396f1a --- /dev/null +++ b/rules/host-system-bc.make @@ -0,0 +1,28 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Markus Niebel +# +# 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_HOST_SYSTEM_BC) += host-system-bc +HOST_SYSTEM_BC_LICENSE := ignore + +# +# Prepare +# + +$(STATEDIR)/host-system-bc.prepare: + @$(call targetinfo) + @echo "Checking for bc ..." + @bc --version >/dev/null 2>&1 || \ + ptxd_bailout "'bc' not found! Please install."; + @$(call touch) + +# vim: syntax=make -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] host-bc: add rule for host-bc target
From: Markus Niebel <markus.nie...@tq-group.com> bc is needed to build kernel versions above 3.10. The tool is installed on most development systems but we want to be user firendly. Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- rules/host-bc.in | 6 ++ rules/host-bc.make | 17 + 2 files changed, 23 insertions(+) create mode 100644 rules/host-bc.in create mode 100644 rules/host-bc.make diff --git a/rules/host-bc.in b/rules/host-bc.in new file mode 100644 index 000..901f8a5 --- /dev/null +++ b/rules/host-bc.in @@ -0,0 +1,6 @@ +## SECTION=hosttools_noprompt +## SECTION=hosttools_platform + +config HOST_BC + tristate + default ALLYES diff --git a/rules/host-bc.make b/rules/host-bc.make new file mode 100644 index 000..060c8e0 --- /dev/null +++ b/rules/host-bc.make @@ -0,0 +1,17 @@ +# -*-makefile-*- +# +# Copyright (C) 2013 by Marc Kleine-Budde <m...@pengutronix.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 +# +HOST_PACKAGES-$(PTXCONF_HOST_BC) += host-bc + + +# vim: syntax=make -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] kernel: depend kernel on having bc installed
From: Markus Niebel <markus.nie...@tq-group.com> This is needed to build kernels newer than 3.10. Select new host-bc rule for kernel target to make sure bc is there before compiling kernel Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- platforms/kernel.in | 1 + 1 file changed, 1 insertion(+) diff --git a/platforms/kernel.in b/platforms/kernel.in index fd1c492..3ee2812 100644 --- a/platforms/kernel.in +++ b/platforms/kernel.in @@ -8,6 +8,7 @@ menuconfig KERNEL select HOST_XZ if KERNEL_XZ select HOST_LZOPif KERNEL_LZOP select HOST_LIBKMOD if KERNEL_MODULES + select HOST_BC prompt "Linux kernel " if KERNEL -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 0/2] fix kernel build dep from bc
From: Markus Niebel <markus.nie...@tq-group.com> kernel versions newer than 3.10 have bc as build dependency add a new host-bc package and let kernel select this package Markus Niebel (2): host-bc: add rule for host-bc target kernel: depend kernel on having bc installed platforms/kernel.in | 1 + rules/host-bc.in| 6 ++ rules/host-bc.make | 17 + 3 files changed, 24 insertions(+) create mode 100644 rules/host-bc.in create mode 100644 rules/host-bc.make -- 1.9.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Kernel dependency from bc
Hello, I tried it with generation a host-system-bc, but this was never triggered when selectin it from platform/kernel.in. Have I made a mistake or should I better implement a real host-bc package, so that bc gets installed in the host sysroot? Thanks Markus Am Donnerstag, den 26.01.2017, 11:38 +0100 schrieb Michael Olbrich: > Hi, > > On Fri, Jan 20, 2017 at 01:07:05PM +0100, Markus Niebel wrote: > > since kernel 3.10 (afaik) bc is needed to build the kernel. Should we > > add something like a host-system-bc package which notifies the user that > > he needs to install bc on his box? > > I think that would be best. Can you make a patch for this? > > Michael > ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] use waf in ptxdist
Hi Alejandro, this library comes from Freescale / NXP. as i remember, they have an EULA which has to be accepted. You have to look inside the FSL yocto BSP (or maybe buildroot has this packaged also?) for the URL of the correct version. You can define your own ptxdist package for the lib and have libimxvpuapi select this package. I think the spirit of ptxdist is to avoid such packages - or is there a need to have them in ptxdist? Markus Am Dienstag, den 31.01.2017, 13:33 +0100 schrieb Alejandro Vázquez: > Hi Markus!! > I have other question. > When I try configure this lib, I need imx-vpu 3.10.17 or newer. > How do I install it through ptxdist so that it detects it and does not > give me error? > > > > Thanks! > > > > > > 2017-01-30 16:05 GMT+01:00 Markus Niebel <nieb...@tqsc.de>: > Hello, > > should be working this way (just copied from an older > project): > > 8<--- > > LIBIMXVPUAPI_CONF_TOOL := NO > > LIBIMXVPUAPI_CONF_OPT := \ > --prefix="/usr" > --kernel-headers="$(KERNEL_HEADERS_INCLUDE_DIR)" > > LIBIMXVPUAPI_CONF_OPT += \ > > LIBIMXVPUAPI_ENV:= \ > $(CROSS_ENV) > > # > > > # prepare > # > > > $(STATEDIR)/libimxvpuapi.prepare: > @$(call targetinfo) > cd $(LIBIMXVPUAPI_DIR) && \ > $(LIBIMXVPUAPI_PATH) $(LIBIMXVPUAPI_ENV) \ > python2 ./waf configure > $(LIBIMXVPUAPI_CONF_OPT) > @$(call touch) > > # > > > # Compile > # > > > $(STATEDIR)/libimxvpuapi.compile: > @$(call targetinfo) > cd $(LIBIMXVPUAPI_DIR) && \ > $(LIBIMXVPUAPI_PATH) $(LIBIMXVPUAPI_ENV) \ > python2 ./waf build -j 1 > @$(call touch) > > # > > > # Install > # > > > $(STATEDIR)/libimxvpuapi.install: > @$(call targetinfo) > rm -rf "$(LIBIMXVPUAPI_PKGDIR)" > mkdir -p "$(LIBIMXVPUAPI_PKGDIR)" > cd "$(LIBIMXVPUAPI_DIR)" && \ > $(LIBIMXVPUAPI_PATH) $(LIBIMXVPUAPI_ENV) \ > python2 ./waf --destdir=$(LIBIMXVPUAPI_PKGDIR) > install > @$(call touch) > > 8<--- > > > Am Montag, den 30.01.2017, 13:13 +0100 schrieb Alejandro > Vázquez: > > Hi all. > > I have found a project (libimxvpuapi) that is configured and > built > > using waf. > > Is there any way I can build this project with ptxdist? > > > > > > > > Thanks! > > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] use waf in ptxdist
Hello, should be working this way (just copied from an older project): 8<--- LIBIMXVPUAPI_CONF_TOOL := NO LIBIMXVPUAPI_CONF_OPT := \ --prefix="/usr" --kernel-headers="$(KERNEL_HEADERS_INCLUDE_DIR)" LIBIMXVPUAPI_CONF_OPT += \ LIBIMXVPUAPI_ENV:= \ $(CROSS_ENV) # # prepare # $(STATEDIR)/libimxvpuapi.prepare: @$(call targetinfo) cd $(LIBIMXVPUAPI_DIR) && \ $(LIBIMXVPUAPI_PATH) $(LIBIMXVPUAPI_ENV) \ python2 ./waf configure $(LIBIMXVPUAPI_CONF_OPT) @$(call touch) # # Compile # $(STATEDIR)/libimxvpuapi.compile: @$(call targetinfo) cd $(LIBIMXVPUAPI_DIR) && \ $(LIBIMXVPUAPI_PATH) $(LIBIMXVPUAPI_ENV) \ python2 ./waf build -j 1 @$(call touch) # # Install # $(STATEDIR)/libimxvpuapi.install: @$(call targetinfo) rm -rf "$(LIBIMXVPUAPI_PKGDIR)" mkdir -p "$(LIBIMXVPUAPI_PKGDIR)" cd "$(LIBIMXVPUAPI_DIR)" && \ $(LIBIMXVPUAPI_PATH) $(LIBIMXVPUAPI_ENV) \ python2 ./waf --destdir=$(LIBIMXVPUAPI_PKGDIR) install @$(call touch) 8<--- Am Montag, den 30.01.2017, 13:13 +0100 schrieb Alejandro Vázquez: > Hi all. > I have found a project (libimxvpuapi) that is configured and built > using waf. > Is there any way I can build this project with ptxdist? > > > > Thanks! > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Kernel dependency from bc
Hello, since kernel 3.10 (afaik) bc is needed to build the kernel. Should we add something like a host-system-bc package which notifies the user that he needs to install bc on his box? Thanks Markus ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] u-boot: hopefully fix download URL
From: Markus Niebel <markus.nie...@tq-group.com> Use the ftp server only via ftp protocol. Other URL and protocols gets redirected and cause download to fail. u-boot-tools uses already the correct URL. See also www.denx.de/wiki/U-Boot/SourceCode Signed-off-by: Markus Niebel <markus.nie...@tq-group.com> --- rules/u-boot.make | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rules/u-boot.make b/rules/u-boot.make index 79aa33e..6dd2e43 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -21,11 +21,7 @@ U_BOOT_VERSION := $(call remove_quotes,$(PTXCONF_U_BOOT_VERSION)) U_BOOT_MD5 := $(call remove_quotes,$(PTXCONF_U_BOOT_MD5)) U_BOOT := u-boot-$(U_BOOT_VERSION) U_BOOT_SUFFIX := tar.bz2 -U_BOOT_URL := \ - ftp://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX) \ - http://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX) \ - https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX) \ - https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX);no-check-certificate +U_BOOT_URL := ftp://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX) U_BOOT_SOURCE := $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX) U_BOOT_DIR := $(BUILDDIR)/$(U_BOOT) -- 2.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] glib-networking: select host-intltool
From: Markus Niebel markus.nie...@tq-group.com Building glib-networking depends on newer versions of intltool. Since we can build this as a host package, do not rely on the version installed on the system Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- rules/glib-networking.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/glib-networking.in b/rules/glib-networking.in index 46adc55..3302510 100644 --- a/rules/glib-networking.in +++ b/rules/glib-networking.in @@ -2,6 +2,7 @@ config GLIB_NETWORKING tristate + select HOST_INTLTOOL select GLIB select GNUTLS select CA_CERTIFICATES if RUNTIME -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] socat: fix build system for parallel builds
From: Markus Niebel markus.nie...@tq-group.com when doing parallel builds, linking of filan sometimes fails. This patch brings in the fix found in: http://lists.openembedded.org/pipermail/openembedded-core/2015-May/104718.html Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- .../socat-1.7.3.0/0001-fix-parallel-build.patch| 23 ++ patches/socat-1.7.3.0/series | 1 + 2 files changed, 24 insertions(+) create mode 100644 patches/socat-1.7.3.0/0001-fix-parallel-build.patch create mode 100644 patches/socat-1.7.3.0/series diff --git a/patches/socat-1.7.3.0/0001-fix-parallel-build.patch b/patches/socat-1.7.3.0/0001-fix-parallel-build.patch new file mode 100644 index 000..ed01541 --- /dev/null +++ b/patches/socat-1.7.3.0/0001-fix-parallel-build.patch @@ -0,0 +1,23 @@ +From: Markus Niebel markus.nie...@tq-group.de +Date: Tue, 25 Aug 2015 17:48:55 +0200 +Subject: [PATCH] Makefile.in: fix for parallel build + +Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue. + +original patch for OE-Core by: Robert Yang liezhi.yang at windriver.com + +Signed-off-by: Markus Niebel markus.nie...@tq-group.de +--- + + +--- a/Makefile.in b/Makefile.in +@@ -118,7 +118,7 @@ PROCAN_OBJS=procan_main.o procan.o proca + procan: $(PROCAN_OBJS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS) + +-filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o ++filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS) + + libxio.a: $(XIOOBJS) $(UTLOBJS) diff --git a/patches/socat-1.7.3.0/series b/patches/socat-1.7.3.0/series new file mode 100644 index 000..51ff874 --- /dev/null +++ b/patches/socat-1.7.3.0/series @@ -0,0 +1 @@ +0001-fix-parallel-build.patch -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Sysroots and pkg-config (Qt 5.4.2)
Hi, Am 11.06.2015 um 12:18 schrieb Dennis Miller: Hi, I am using PTXdist 2014.11.0 and a BSP provided by TQ for a Freescale i.MX6q CPU. This CPU has binary-only drivers for Open-GL/ES. I downloaded just the new qt5.in/.make as well as all patches and custom qmake-spec for Qt 5.4.2 and I am trying to get it to compile using the Freescale (VIVANTE) egl drivers. The drivers install some samples to /opt as well as libs to /usr/lib and matching headers to /usr/include. The default rule file was to just package everything together and install it on the target. This was enough to verify that the GPU is working. OK Which sysroot is the right one? sysroot-host seems like the right choice. I can add pkgconfig files to sysroot-host/lib/pkgconfig (e.g. egl.pc) and these seem to work as expected. Building Qt is a totally different beast ... I had to add a patch to the configure script to disable the gold linker CFG_USE_GOLD_LINKER=no. Turns out configure is using sysroot-cross ... sysroot-cross has a wierd pkg-config (arm-v7a-linux-gnueabihf-pkg-config in my case) which does not seem to work: Qt 5.3 is in our BSP which is implemented different than the current mainline Qt 5.4. Mixing things is not expected to work. $ ./p bash [ptx] $ which pkg-config /platform-dzm/sysroot-host/bin/pkg-config [ptx] $ ./platform-dzm/sysroot-cross/bin/pkg-config --debug --list-all Now I get a list of all packages from my Ubuntu 14.04 ... (and maybe some embedded ones as well). So I tried fixing this setup by calling the right pkg-config by updating the first few line like: #PKG_CONFIG=${PKG_CONFIG_ARRAY[1]} PKG_CONFIG=../../sysroot-host/bin/pkg-config But lets keep moving here - pkg-config rules for egl are in place (I took them from Yocto's meta-fsl-arm layer) and configure continues past the EGL checks. However now I'm stuck with an error about d-bus. dbus-1.8.8 is compiled and installed using the default rules. But the pkg-config rule file is not installed (again: which sysroot?) - why? The next obvious question would be: what else is missing? and why? Or were there some bugfixes between PTXdist 2014.11.0 and the latest that affect pkg-config or any library install? A lot of the things I did *feel* wrong. I would assume that PTXdist should do these for me - e.g. make sure pkg-config is updated with every library. Also, sysroot-target seems like the most obvious sysroot choice since the documentation for PTXdist specifically mentions sysroot-target : Contains everything target architecture dependend (libraries, header files and so on). but this one is not used at all. One last thing: Is the gold linker used in newer versions of PTXdist? How do I continue building the latest Qt library? You can do - ptxdist migrate to bring the BSP to the current PTXdist version - the you can remove the qt5 related rules from BSP - reconfigure to build with Qt 5.4 from mainline PTXdist - adopt Qt 5.4 mkspecs to find the correct EGL stuff - Feel free to contact TQ systems support Note: when migrating to a new ptxdist version, you need to build from scratch. Markus Dennis -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] u-boot-tools: improve build
From: Markus Niebel markus.nie...@tq-group.com The U-Boot tools are mostly host side tools. No need to compile them for target since this could break build due to wrong dependencies. Use feature of U-Boot build system to build a given directory. Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- rules/u-boot-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make index 2e1b0a1..9e5ef2b 100644 --- a/rules/u-boot-tools.make +++ b/rules/u-boot-tools.make @@ -33,10 +33,10 @@ U_BOOT_TOOLS_CONF_TOOL := NO # just pick sandbox as a dummy target config U_BOOT_TOOLS_MAKE_OPT := \ CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ - sandbox_config tools-only + sandbox_config ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV -U_BOOT_TOOLS_MAKE_OPT += env +U_BOOT_TOOLS_MAKE_OPT += tools/env/ endif # -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC 0/2] add a way to extract license text from packages
Hello, Am 11.02.2015 um 14:02 schrieb Michael Olbrich: Hi, On Wed, Feb 11, 2015 at 12:19:34PM +0100, Juergen Borleis wrote: On Wednesday 11 February 2015 11:50:16 Hubert Feurstein wrote: IMHO the proposal by Markus makes sense. I have had the same issues with collecting license texts in the past. So a solution integrated in PTXdist would be great. Because then it would be possible to collect the license texts depending on the config options of a package (sometimes plugins have a different license). Please checkout current PTXdist master and run ptxdist make license-report inside a PTXdist project. You need LATEX and dot to make it work. xelatex (from texlive-xetex in Debian) and dot2tex are needed as well. Thank you, test looks promising and generated data are very helpfull. Just a hint for documentation - recent versions of the LATEX packages are needed, because of style packages used. Markus -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC 0/2] add a way to extract license text from packages
Hello Juergen, Am 11.02.2015 um 12:19 schrieb Juergen Borleis: Hi, On Wednesday 11 February 2015 11:50:16 Hubert Feurstein wrote: IMHO the proposal by Markus makes sense. I have had the same issues with collecting license texts in the past. So a solution integrated in PTXdist would be great. Because then it would be possible to collect the license texts depending on the config options of a package (sometimes plugins have a different license). Please checkout current PTXdist master and run ptxdist make license-report inside a PTXdist project. You need LATEX and dot to make it work. Sounds great, will try it. Thanks Regards, Markus Regards, Juergen -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC 0/2] add a way to extract license text from packages
Hello, Am 29.01.2015 um 21:23 schrieb Guillermo Rodriguez Garcia: Hi, If I understand correctly the auditing procedure before this patch would be: 1. Collect all existing files in state/pkg.license 2. Each .license file contains the license name (e.g. GPL) -- use this to find the actual license text 3. Audit each license What would be the difference after this patch? My goal is to have a single place where the licenses of the target packages are collected (think of it like export_src for license information - license names and license text). Motivation: - Some packages have additional clauses to the license text (Qt for instances). So it would be a benefit to have the text from the package. - If you deliver binaries of a BSP (preinstalled or for download) some licenses force you to supply the license text with the binary - In some cases non developers need to look over the licenses - AFAIK other build tools (yocto, buildroot) has similar features Hope this helps Markus Thanks, Guillermo 2015-01-29 8:45 GMT+01:00 Markus Niebel list...@tqsc.de: Am 21.01.2015 um 09:12 schrieb Markus Niebel: From: Markus Niebel markus.nie...@tq-group.com just as an RFC: it would be good to have above said features to ease deployment and auditing. First patch implements this feature as an addon of the targetinstall stage. Second patch shows the feature for a package that uses it's own license TODO: maybe targetinstall is not the right place, just in case the license is altered during patching the package. Markus Niebel (2): ptxdist: add license text extraction icu: add LICENSE_TEXT rules/icu.make | 5 +++-- rules/post/ptxd_make_world_common.make | 1 + scripts/lib/ptxd_make_xpkg_common.sh | 3 +++ scripts/lib/ptxd_make_xpkg_finish.sh | 11 +++ 4 files changed, 18 insertions(+), 2 deletions(-) ping ... Any interest in this topic? Regards Markus -- ptxdist mailing list ptxdist@pengutronix.de -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ptxdist: Adding custom kernel headers
Hello, Am 26.01.2015 um 20:16 schrieb Guillermo Rodriguez Garcia: Hello all, I wrote a custom driver for my BSP, and I initially made it an out-of-tree driver (ptxdist newpackage src-linux-driver and so on) This driver needs to export a header file (defining some ioctl values) for use by other (custom) ptxdist packages. I am currently exporting this header file in the install stage of the out-of-tree driver: cp $(MY_DRIVER_DIR)/someheader.h $(PTXDIST_SYSROOT_TARGET)/usr/include So far so good. Now I would like to transform this out-of-tree driver into an in-tree driver and for that I am generating a set of patches against the kernel tree. My question is: How can I export the custom header in this case? I assume that modifying the generic kernel.make is not the way to go. Any hints? split the internal from the external part and place the header to export under kernel/include/uapi/correct subdir modify the Kbuild script in this subdir to add your header to the headers to export Generate patch series for your kernel and use this kernel version for the kernel header package in ptxdist Markus -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [RFC 0/2] add a way to extract license text from packages
From: Markus Niebel markus.nie...@tq-group.com just as an RFC: it would be good to have above said features to ease deployment and auditing. First patch implements this feature as an addon of the targetinstall stage. Second patch shows the feature for a package that uses it's own license TODO: maybe targetinstall is not the right place, just in case the license is altered during patching the package. Markus Niebel (2): ptxdist: add license text extraction icu: add LICENSE_TEXT rules/icu.make | 5 +++-- rules/post/ptxd_make_world_common.make | 1 + scripts/lib/ptxd_make_xpkg_common.sh | 3 +++ scripts/lib/ptxd_make_xpkg_finish.sh | 11 +++ 4 files changed, 18 insertions(+), 2 deletions(-) -- 2.2.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [RFC 1/2] ptxdist: add license text extraction
From: Markus Niebel markus.nie...@tq-group.com It would be good to have the possibility to extract license texts for target packages. This would add a benefit to ptxdist since it makes auditing a BSP easier. This patch adds - a new (optional) variable to package rule file to encode the license file(s) for this package - set a pkg var with the value new var from the package rule or use default list of filenames - copy the license text files in the targetinstall.post stage to a directory under $PTXDIST_PLATFORMDIR/pkg-pkg_version Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- rules/post/ptxd_make_world_common.make | 1 + scripts/lib/ptxd_make_xpkg_common.sh | 3 +++ scripts/lib/ptxd_make_xpkg_finish.sh | 11 +++ 3 files changed, 15 insertions(+) diff --git a/rules/post/ptxd_make_world_common.make b/rules/post/ptxd_make_world_common.make index 4820d8c..01d2c88 100644 --- a/rules/post/ptxd_make_world_common.make +++ b/rules/post/ptxd_make_world_common.make @@ -55,6 +55,7 @@ world/env/impl = \ pkg_pkg_dir=$(call ptx/escape,$($(1)_PKGDIR)) \ pkg_pkg_dev=$(call ptx/escape,$($(1)_DEVPKG)) \ pkg_license=$(call ptx/escape,$($(1)_LICENSE)) \ + pkg_license_text=$(call ptx/escape,$($(1)_LICENSE_TEXT)) \ pkg_build_deps=$(call ptx/escape,$(PTX_MAP_B_dep_$(1))) \ pkg_run_deps=$(call ptx/escape,$(PTX_MAP_R_dep_$(1))) \ \ diff --git a/scripts/lib/ptxd_make_xpkg_common.sh b/scripts/lib/ptxd_make_xpkg_common.sh index 279348f..90501eb 100644 --- a/scripts/lib/ptxd_make_xpkg_common.sh +++ b/scripts/lib/ptxd_make_xpkg_common.sh @@ -87,6 +87,9 @@ ptxd_make_xpkg_init() { pkg_license=${pkg_license:-unknown} pkg_xpkg_license=${pkg_xpkg_license:-${pkg_license}} pkg_xpkg_license_file=${ptx_state_dir}/${pkg_xpkg}.license +pkg_license_text=${pkg_license_text:-COPYING COPYING3 COPYING.LIB COPYING3.LIB} +pkg_xpkg_license_text=${pkg_xpkg_license_text:-${pkg_license_text}} + pkg_xpkg_license_dir=${PTXDIST_PLATFORMDIR}/licenses/${pkg_xpkg}-${pkg_xpkg_version} # packaging stuff pkg_xpkg_install_deps=${ptx_state_dir}/${pkg_xpkg}.deps diff --git a/scripts/lib/ptxd_make_xpkg_finish.sh b/scripts/lib/ptxd_make_xpkg_finish.sh index e56be89..ec28710 100644 --- a/scripts/lib/ptxd_make_xpkg_finish.sh +++ b/scripts/lib/ptxd_make_xpkg_finish.sh @@ -63,6 +63,17 @@ EOF # echo -n xpkg_finish: collecting license (${pkg_xpkg_license}) ... echo ${pkg_xpkg_license} ${pkg_xpkg_license_file} +# +# create a package specific dir to store the license information +# +mkdir -p ${pkg_xpkg_license_dir} +cp ${pkg_xpkg_license_file} ${pkg_xpkg_license_dir}/license +for f in ${pkg_xpkg_license_text} +do +if [ -f ${pkg_dir}/${f} ]; then +cp ${pkg_dir}/${f} ${pkg_xpkg_license_dir} +fi +done echo done. # -- 2.2.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [RFC 2/2] icu: add LICENSE_TEXT
From: Markus Niebel markus.nie...@tq-group.com this patch enables to extract the license text when at it, name the license for the package Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- rules/icu.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/icu.make b/rules/icu.make index 312a7b9..ca6d3be 100644 --- a/rules/icu.make +++ b/rules/icu.make @@ -24,8 +24,9 @@ ICU_URL := http://download.icu-project.org/files/icu4c/$(ICU_VERSION)/$(ICU).$( ICU_SOURCE := $(SRCDIR)/$(ICU).$(ICU_SUFFIX) ICU_DIR:= $(BUILDDIR)/$(ICU) ICU_SUBDIR := source -ICU_LICENSE:= unknown - +# license currently not in SPDX database, maybe short name will change +ICU_LICENSE:= ICU +ICU_LICENSE_TEXT := license.html # # Prepare # -- 2.2.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] systemd: add SYSTEMD_CPPFLAGS for local kernel headers
From: Markus Niebel markus.nie...@tq-group.com systemd uses cpp to generate tables for keymappings. Without setting CPPFLAGS the toolchain headers will be used for generation but local kernel headers for compilation. This can break compile. Since CPPFLAGS are implicitly used when calling compiler directly, we can drop the CFLAGS settings for local kernel headers. tested with kernel 3.9 changes: v2: drop SYSTEMD_CFLAGS, add this fact to the comments Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- rules/systemd.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/systemd.make b/rules/systemd.make index b0f7ce0..b2de3d7 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -41,7 +41,7 @@ SYSTEMD_CONF_ENV := \ SYSTEMD_CONF_ENV += cc_cv_CFLAGS__flto=no -SYSTEMD_CFLAGS := \ +SYSTEMD_CPPFLAGS := \ -I$(KERNEL_HEADERS_INCLUDE_DIR) # -- 2.1.1 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] systemd: add SYSTEMD_CPPFLAGS for kernel headers
Hello Michael Am 26.11.2014 um 10:49 schrieb Michael Olbrich: index b0f7ce0..8c425e4 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -44,6 +44,9 @@ SYSTEMD_CONF_ENV += cc_cv_CFLAGS__flto=no SYSTEMD_CFLAGS := \ -I$(KERNEL_HEADERS_INCLUDE_DIR) +SYSTEMD_CPPFLAGS:= \ +-I$(KERNEL_HEADERS_INCLUDE_DIR) + Hmmm, I think the correct solution is to set SYSTEMD_CPPFLAGS instead of SYSTEMD_CFLAGS, right? Could you test that please? I don't a BSP right now, where this fails, so I cannot test it. You are right. Will send v2. Markus -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] OSELAS.Toolchain() 2013.12.x - missing python support in gdb
Hello Michael, Am 15.09.2014 um 12:28 schrieb Michael Olbrich: Hi, On Thu, Sep 11, 2014 at 01:27:20PM +0200, Markus Niebel wrote: is there a reason that python support for gdb helper is disabled in the installable *.deb packages? Toolchains in *.debs from the 2012.12.x version seems to have support. Yes. I explicitly disabled this for the binary packages. The tgz has no dependencies and the I use to generate the debs doesn't add the correct dependencies either, so I got several bug reports that gdb failed to start because of missing dependencies. If you build the toolchain manually (without build_all_v2.mk), then you get python support if python-dev (or something like that) is installed. Good to know, thanks. Fixing that is on my TODO list for the next major toolchain release. Regards, Michael Ragards, Markus -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] OSELAS.Toolchain() 2013.12.x - missing python support in gdb
Hello, is there a reason that python support for gdb helper is disabled in the installable *.deb packages? Toolchains in *.debs from the 2012.12.x version seems to have support. Best Regards, Markus Niebel -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC] u-boot-tools: emmc support in fw_printenv/fw_setenv
Hello Bruno, Yes, use the same U-Boot package for both bootloader and tools. Then we have the block device (emmc, etc.) vs. mtd[1] (NAND, NOR) support issue. As I see there are the following solutions: 1) Select fw_printenv/fw_setenv storage support based on define in board configuration, ex. CONFIG_ENV_IS_IN_MMC in mx28evk. 2) fw_printenv/fw_setenv support both storage technologies: a) Add storage type parameter to /etc/fw_env.config b) Autodetect storage type with strcmp() based on device name As long as there is only one device for your platform, we should try to use the install_alternative method to install a project specific /etc/fw_env.config from BSP/projectroot. If there are multiple locations for the environment a project specific way to set a link to the config file to be used has to be implemented in the root FS [1] MTD: Memory Technology Device, http://www.linux-mtd.infradead.org/faq/general.html Venlig hilsen / Best regards Kamstrup A/S http://www.kamstrup.dk Bruno Thomsen Development engineer Technology Kamstrup A/S Industrivej 28 DK-8660 Skanderborg Tel: +45 89 93 10 00 Fax: +45 89 93 10 01 Dir: +45 89 93 13 94 E-mail:b...@kamstrup.dk Web: www.kamstrup.dk Best Regards Markus Niebel -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC] u-boot-tools: emmc support in fw_printenv/fw_setenv
Hello Bruno, Am 04.08.2014 10:29, wrote Bruno Thomsen: Provide read/write access to U-Boot environment stored in eMMC flash from Linux. Access to U-Boot environment can be very useful; dual kernel/rootfs images, production default values, change kernel bootargs, etc. Tested with U-Boot 2009.08 and 2013.04 on TQMa28. Wouldn't it be better to rework the support for u-boot tools in general? (I know, this will be tricky, since U-Boot environment tools compilation is really an adventure). Also I think, we should use the same version of U-Boot tools as we use for the U-Boot itself. What do you think? For reference here is an internal used version of the u-boot-tools Makefile (known to work with U-Boot versions from our BSP for TQMa53 / TQMa6x). Should work at least for U-Boot 2013.01 and 2013.04 You need to provide a target specific /etc/fw_env.config 8 # -*-makefile-*- # # Copyright (C) 2012 by Andreas Bießmann andr...@biessmann.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_U_BOOT_TOOLS) += u-boot-tools # # Paths and names # U_BOOT_TOOLS_VERSION:= $(U_BOOT_VERSION) U_BOOT_TOOLS_MD5:= $(U_BOOT_MD5) U_BOOT_TOOLS:= u-boot-$(U_BOOT_TOOLS_VERSION) U_BOOT_TOOLS_SUFFIX := tar.bz2 U_BOOT_TOOLS_URL:= http://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX) U_BOOT_TOOLS_SOURCE := $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX) U_BOOT_TOOLS_DIR:= $(BUILDDIR)/$(U_BOOT_TOOLS) U_BOOT_TOOLS_LICENSE:= GPLv2 $(STATEDIR)/u-boot-tools.extract: $(STATEDIR)/u-boot.extract @$(call targetinfo) @$(call touch) $(STATEDIR)/u-boot-tools.prepare: $(STATEDIR)/u-boot.prepare @$(call targetinfo) @$(call touch) # # Prepare # U_BOOT_TOOLS_PATH := $(U_BOOT_PATH) # U_BOOT_TOOLS_MAKE_OPT := $(U_BOOT_MAKE_OPT) tools U_BOOT_TOOLS_CONF_TOOL := NO U_BOOT_TOOLS_MAKE_OPT := \ HOSTCC=$(BOOTLOADER_CROSS_COMPILE)gcc \ HOSTSTRIP=$(BOOTLOADER_CROSS_COMPILE)strip \ CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ tools # HOSTCC=$(CROSS_CC) \ # HOSTSTRIP=$(CROSS_STRIP) \ # tools ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV U_BOOT_TOOLS_MAKE_OPT += env endif # # Install # $(STATEDIR)/u-boot-tools.install: @$(call targetinfo) install -D $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv \ $(U_BOOT_TOOLS_PKGDIR)/usr/sbin/fw_printenv @$(call touch) # # Target-Install # $(STATEDIR)/u-boot-tools.targetinstall: @$(call targetinfo) @$(call install_init, u-boot-tools) @$(call install_fixup, u-boot-tools,PRIORITY,optional) @$(call install_fixup, u-boot-tools,SECTION,base) @$(call install_fixup, u-boot-tools,AUTHOR,\ Andreas Bießmann andr...@biessmann.de) @$(call install_fixup, u-boot-tools,DESCRIPTION,missing) ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV @$(call install_copy, u-boot-tools, 0, 0, 0755, -, /usr/sbin/fw_printenv) @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_setenv) @$(call install_alternative, u-boot-tools, 0, 0, 0644, /etc/fw_env.config) endif @$(call install_finish, u-boot-tools) @$(call touch) $(STATEDIR)/u-boot-tools.clean: @$(call targetinfo) -rm $(STATEDIR)/u-boot-tools.* # @$(call clean_pkg, U_BOOT_TOOLS) # vim: syntax=make 8 Regards Markus -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC] u-boot-tools: emmc support in fw_printenv/fw_setenv
Hello Bruno, Am 04.08.2014 10:29, wrote Bruno Thomsen: Provide read/write access to U-Boot environment stored in eMMC flash from Linux. Access to U-Boot environment can be very useful; dual kernel/rootfs images, production default values, change kernel bootargs, etc. Tested with U-Boot 2009.08 and 2013.04 on TQMa28. Wouldn't it be better to rework the support for u-boot tools in general? (I know, this will be tricky, since U-Boot environment tools compilation is really an adventure). Also I think, we should use the same version of U-Boot tools as we use for the U-Boot itself. What do you think? For reference here is an internal used version of the u-boot-tools Makefile (known to work with U-Boot versions from our BSP for TQMa53 / TQMa6x). Should work at least for U-Boot 2013.01 and 2013.04 You need to provide a target specific /etc/fw_env.config 8 # -*-makefile-*- # # Copyright (C) 2012 by Andreas Bießmann andr...@biessmann.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_U_BOOT_TOOLS) += u-boot-tools # # Paths and names # U_BOOT_TOOLS_VERSION:= $(U_BOOT_VERSION) U_BOOT_TOOLS_MD5:= $(U_BOOT_MD5) U_BOOT_TOOLS:= u-boot-$(U_BOOT_TOOLS_VERSION) U_BOOT_TOOLS_SUFFIX := tar.bz2 U_BOOT_TOOLS_URL:= http://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX) U_BOOT_TOOLS_SOURCE := $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX) U_BOOT_TOOLS_DIR:= $(BUILDDIR)/$(U_BOOT_TOOLS) U_BOOT_TOOLS_LICENSE:= GPLv2 $(STATEDIR)/u-boot-tools.extract: $(STATEDIR)/u-boot.extract @$(call targetinfo) @$(call touch) $(STATEDIR)/u-boot-tools.prepare: $(STATEDIR)/u-boot.prepare @$(call targetinfo) @$(call touch) # # Prepare # U_BOOT_TOOLS_PATH := $(U_BOOT_PATH) # U_BOOT_TOOLS_MAKE_OPT := $(U_BOOT_MAKE_OPT) tools U_BOOT_TOOLS_CONF_TOOL := NO U_BOOT_TOOLS_MAKE_OPT := \ HOSTCC=$(BOOTLOADER_CROSS_COMPILE)gcc \ HOSTSTRIP=$(BOOTLOADER_CROSS_COMPILE)strip \ CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ tools # HOSTCC=$(CROSS_CC) \ # HOSTSTRIP=$(CROSS_STRIP) \ # tools ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV U_BOOT_TOOLS_MAKE_OPT += env endif # # Install # $(STATEDIR)/u-boot-tools.install: @$(call targetinfo) install -D $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv \ $(U_BOOT_TOOLS_PKGDIR)/usr/sbin/fw_printenv @$(call touch) # # Target-Install # $(STATEDIR)/u-boot-tools.targetinstall: @$(call targetinfo) @$(call install_init, u-boot-tools) @$(call install_fixup, u-boot-tools,PRIORITY,optional) @$(call install_fixup, u-boot-tools,SECTION,base) @$(call install_fixup, u-boot-tools,AUTHOR,\ Andreas Bießmann andr...@biessmann.de) @$(call install_fixup, u-boot-tools,DESCRIPTION,missing) ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV @$(call install_copy, u-boot-tools, 0, 0, 0755, -, /usr/sbin/fw_printenv) @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_setenv) @$(call install_alternative, u-boot-tools, 0, 0, 0644, /etc/fw_env.config) endif @$(call install_finish, u-boot-tools) @$(call touch) $(STATEDIR)/u-boot-tools.clean: @$(call targetinfo) -rm $(STATEDIR)/u-boot-tools.* # @$(call clean_pkg, U_BOOT_TOOLS) # vim: syntax=make 8 Regards Markus -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC][PATCH] arm-memspeed: add patches for configurable cache sizes
Hello, Am 19.06.2014 19:24, wrote Markus Niebel: From: Markus Niebel markus.nie...@tq-group.com Cores like cortex a9 have L1 and L2 cache. Sizes of caches may vary between cores and SOCs. So it is good to have the sizes configurable and let the user decide. While at it, remove some compiler warnings. any comments or should I split the patches from the discussion? Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- I'm not 100% sure about the following things: 1) with HF toolchains (tested cortexa8 and v7a versions of OSELAS.Toolchain 2013.12.2) there is a segfault when enable to run the cached tests - even with the unpatched version. The same toolchains without HF the program runs without error. 2) The timing code looks strange. Wouldn't it be better to use clock_gettime with CLOCK_MONOTONIC on systems with tickless kernels? Is the some expert (toolchain and / or ARM assembler) hearing my qustion? patches/arm-memspeed-1.0/0001-fix-cache-size.patch | 58 ++ patches/arm-memspeed-1.0/0002-use-getopt.patch | 82 .../0003-remove-compiler-warnings.patch| 14 patches/arm-memspeed-1.0/series|4 + 4 files changed, 158 insertions(+) create mode 100644 patches/arm-memspeed-1.0/0001-fix-cache-size.patch create mode 100644 patches/arm-memspeed-1.0/0002-use-getopt.patch create mode 100644 patches/arm-memspeed-1.0/0003-remove-compiler-warnings.patch create mode 100644 patches/arm-memspeed-1.0/series diff --git a/patches/arm-memspeed-1.0/0001-fix-cache-size.patch b/patches/arm-memspeed-1.0/0001-fix-cache-size.patch new file mode 100644 index 000..4ac8a36 --- /dev/null +++ b/patches/arm-memspeed-1.0/0001-fix-cache-size.patch @@ -0,0 +1,58 @@ +Index: arm-memspeed-1.1/memspeed.c +=== +--- arm-memspeed-1.1.orig/memspeed.c 2011-10-14 19:57:47.0 +0200 arm-memspeed-1.1/memspeed.c 2014-05-12 13:51:23.0 +0200 +@@ -25,7 +25,12 @@ + * than half the actual data cache size but not smaller than 4096. + * (4096 is the largest preload size) + */ +-#define CACHED_BUF_SIZE 4*1024 ++#define CACHED_BUF_SIZE_MIN 4*1024 ++ ++static size_t large_buf_size = BUF_SIZE; ++static size_t cached_buf_size = CACHED_BUF_SIZE_MIN; ++ ++ + + typedef void (test_fn)(void *src, void *dst, long size); + +@@ -101,7 +106,7 @@ + long long t1, t2, tod_usecs, ck_usecs; + int i, loops, tries; + float x; +-int buf_size = in_cache ? CACHED_BUF_SIZE : BUF_SIZE; ++int buf_size = in_cache ? cached_buf_size : large_buf_size; + void *buf1 = test_buf; + void *buf2 = test_buf + buf_size; + +@@ -122,8 +127,8 @@ + + /* first a single pass to warm caches and page memory in */ + if (in_cache) { +-test_ldm_32_p8(buf1, NULL, CACHED_BUF_SIZE); +-test_ldm_32_p8(buf2, NULL, CACHED_BUF_SIZE); ++test_ldm_32_p8(buf1, NULL, cached_buf_size); ++test_ldm_32_p8(buf2, NULL, cached_buf_size); + } + fn(buf2, buf1, buf_size); + +@@ -146,8 +151,8 @@ + /* now the real test */ + usleep(1); + if (in_cache) { +-test_ldm_32_p8(buf1, NULL, CACHED_BUF_SIZE); +-test_ldm_32_p8(buf2, NULL, CACHED_BUF_SIZE); ++test_ldm_32_p8(buf1, NULL, cached_buf_size); ++test_ldm_32_p8(buf2, NULL, cached_buf_size); + } + fn(buf2, buf1, buf_size); + i = loops; +@@ -229,7 +234,7 @@ + } + } + +-test_buf_ = malloc(2*BUF_SIZE + CACHED_BUF_SIZE + 4096); ++test_buf_ = malloc(2*large_buf_size + cached_buf_size + 4096); + + /* page align */ + test_buf = (char *)((long)(test_buf_ + 4095) ~4095L); diff --git a/patches/arm-memspeed-1.0/0002-use-getopt.patch b/patches/arm-memspeed-1.0/0002-use-getopt.patch new file mode 100644 index 000..a587713 --- /dev/null +++ b/patches/arm-memspeed-1.0/0002-use-getopt.patch @@ -0,0 +1,82 @@ +Index: arm-memspeed-1.0/memspeed.c +=== +--- arm-memspeed-1.0.orig/memspeed.c 2014-06-18 20:19:15.0 +0200 arm-memspeed-1.0/memspeed.c 2014-06-18 20:20:03.0 +0200 +@@ -10,6 +10,7 @@ + #include unistd.h + #include string.h + #include sched.h ++#include errno.h + #include sys/time.h + #include sys/times.h + +@@ -218,23 +219,63 @@ + perror(Warning: unable to set scheduling priority, ); + } + ++static void usage(int argc, char *argv[]) ++{ ++fprintf(stderr, Usage: %s [-c] -l uncached size -s cached size\n ++ -c\tinclude cached memory results\n ++ -l
[ptxdist] [PATCH] memtester: improve build system
From: Markus Niebel markus.nie...@tq-group.com This package uses a unusual build system. Improve the prepare stage so that we can use the provided Makefiles and scripts instead of generating a simple Makefile without optimisation and othe useful compiler flags. This solution was suggested by Michael Olbrich m.olbr...@pengutronix.de Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- rules/memtester.make |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/memtester.make b/rules/memtester.make index e83a0b8..01c0071 100644 --- a/rules/memtester.make +++ b/rules/memtester.make @@ -35,7 +35,7 @@ MEMTESTER_COMPILE_ENV := $(CROSS_ENV) $(STATEDIR)/memtester.prepare: @$(call targetinfo) - @echo memtester: tests.o memtester.o $(MEMTESTER_DIR)/Makefile + @sed -i 's/^cc\/$(CROSS_CC)/' $(MEMTESTER_DIR)/conf-cc $(MEMTESTER_DIR)/conf-ld @$(call touch) # -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] zip: fix download url
From: Markus Niebel markus.nie...@tq-group.com Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- rules/zip.make |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/zip.make b/rules/zip.make index 827a865..09ba4a0 100644 --- a/rules/zip.make +++ b/rules/zip.make @@ -23,7 +23,7 @@ ZIP_MD5 := 7b74551e63f8ee6aab6fbc86676c0d37 ZIP_AVERSION := 30 ZIP_ARCHIVE:= zip$(ZIP_AVERSION).tar.gz ZIP:= zip$(ZIP_AVERSION) -ZIP_URL:= http://surfnet.dl.sourceforge.net/sourceforge/infozip/$(ZIP_ARCHIVE) +ZIP_URL:= $(call ptx/mirror, SF, infozip/$(ZIP_ARCHIVE)) ZIP_SOURCE := $(SRCDIR)/$(ZIP_ARCHIVE) ZIP_DIR:= $(BUILDDIR)/$(ZIP) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] u-boot: add config option for imx images
From: Markus Niebel markus.nie...@tq-group.com For i.MX SOC the U-Boot build system generates imx-images containing the DCD structure used by the ROM loader. This patch provides a config option and install rules for this type of images. Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- platforms/u-boot.in |7 +++ rules/u-boot.make |4 2 files changed, 11 insertions(+) diff --git a/platforms/u-boot.in b/platforms/u-boot.in index d318923..38684a0 100644 --- a/platforms/u-boot.in +++ b/platforms/u-boot.in @@ -68,5 +68,12 @@ config U_BOOT_INSTALL_U_BOOT_IMG endif +config U_BOOT_INSTALL_U_BOOT_IMX + prompt install u-boot.imx + bool + help + Installing the U-Boot image with imx header (u-boot.imx) into platform + image directory. Say yes if you are building for freescale i.MX SOC + endif diff --git a/rules/u-boot.make b/rules/u-boot.make index af2b02d..44b59fa 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -68,6 +68,9 @@ endif ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_IMG @install -D -m644 $(U_BOOT_DIR)/u-boot.img $(IMAGEDIR)/u-boot.img endif +ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_IMX + @install -D -m644 $(U_BOOT_DIR)/u-boot.imx $(IMAGEDIR)/u-boot.imx +endif @$(call touch) # @@ -78,5 +81,6 @@ $(STATEDIR)/u-boot.clean: @$(call targetinfo) @$(call clean_pkg, U_BOOT) @rm -f $(IMAGEDIR)/u-boot.bin $(IMAGEDIR)/u-boot.srec $(IMAGEDIR)/u-boot.elf + @rm -f $(IMAGEDIR)/u-boot.imx # vim: syntax=make -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] memtester: version bump 4.0.8 - 4.3.0
Hello, Am 23.06.2014 15:45, schrieb Michael Olbrich: On Fri, Jun 20, 2014 at 09:33:08AM +0200, Markus Niebel wrote: From: Markus Niebel markus.nie...@tq-group.com Thanks, applied. Unrelated to this patch, but I noticed that the code is compiled without optimization. Do you think it makes sense to add something like this to the prepare stage: @echo CFLAGS = -O2 -g$(MEMTESTER_DIR)/Makefile maybe changing in: @echo $(CROSS_CC) -O2 -DPOSIX -D_POSIX_C_SOURCE=200809L -D_FILE_OFFSET_BITS=64 -DTEST_NARROW_WRITES -c $(MEMTESTER_DIR)/conf-cc @echo $(CROSS_CC) -s $(MEMTESTER_DIR)/conf-ld and using package's own build system would be even better? Michael Markus -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] aumix: fix URL
From: Markus Niebel markus.nie...@tq-group.com Package is now located on sourceforge Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- rules/aumix.make |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/aumix.make b/rules/aumix.make index 56af074..18848c7 100644 --- a/rules/aumix.make +++ b/rules/aumix.make @@ -20,7 +20,7 @@ AUMIX_VERSION := 2.9.1 AUMIX_MD5 := 34f28ae1c94fc5298e8bb2688c4b3a20 AUMIX := aumix-$(AUMIX_VERSION) AUMIX_SUFFIX := tar.bz2 -AUMIX_URL := http://jpj.net/~trevor/aumix/releases/$(AUMIX).$(AUMIX_SUFFIX) +AUMIX_URL := http://downloads.sourceforge.net/aumix/$(AUMIX).$(AUMIX_SUFFIX) AUMIX_SOURCE := $(SRCDIR)/$(AUMIX).$(AUMIX_SUFFIX) AUMIX_DIR := $(BUILDDIR)/$(AUMIX) AUMIX_LICENSE := GPLv2 -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] aumix: select HOST_GETTEXT
From: Markus Niebel markus.nie...@tq-group.com The autotools logic requests autopoint during reconfiguration. Therefore we need to have gettext in place. Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- rules/aumix.in |1 + 1 file changed, 1 insertion(+) diff --git a/rules/aumix.in b/rules/aumix.in index edbb1c5..58c8c0a 100644 --- a/rules/aumix.in +++ b/rules/aumix.in @@ -4,6 +4,7 @@ config AUMIX tristate prompt aumix select NCURSES + select HOST_GETTEXT help Simple text-based mixer control program -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] memtester: version bump 4.0.8 - 4.3.0
From: Markus Niebel markus.nie...@tq-group.com Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- rules/memtester.make |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/memtester.make b/rules/memtester.make index 8fd3dd7..e83a0b8 100644 --- a/rules/memtester.make +++ b/rules/memtester.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_MEMTESTER) += memtester # # Paths and names # -MEMTESTER_VERSION := 4.0.8 -MEMTESTER_MD5 := a4971ed1ccaf5b2e2148fd66b0eb7363 +MEMTESTER_VERSION := 4.3.0 +MEMTESTER_MD5 := 598f41b7308e1f736164bca3ab84ddbe MEMTESTER := memtester-$(MEMTESTER_VERSION) MEMTESTER_SUFFIX := tar.gz MEMTESTER_URL := http://pyropus.ca/software/memtester/old-versions/$(MEMTESTER).$(MEMTESTER_SUFFIX) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] barebox: select host-lzop
From: Markus Niebel markus.nie...@tq-group.com creation of barebox.z requires lzop. As this may be not installed, let's handle this inside of our build logic. Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- platforms/barebox.in |1 + 1 file changed, 1 insertion(+) diff --git a/platforms/barebox.in b/platforms/barebox.in index 6e65f83..6f66d1f 100644 --- a/platforms/barebox.in +++ b/platforms/barebox.in @@ -10,6 +10,7 @@ config BAREBOX_ARCH_STRING menuconfig BAREBOX select BOOTLOADER select HOST_LIBUSB if BAREBOX_NEEDS_HOST_LIBUSB + select HOST_LZOP prompt barebox bool help -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] mbw: version bump 1.1 - 1.4
From: Markus Niebel markus.nie...@tq-group.com Also update url since development is now done under github. The new version fixes some bugs that lead to wrong results. Signed-off-by: Markus Niebel markus.nie...@tq-group.com --- rules/mbw.make |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/mbw.make b/rules/mbw.make index 6278fef..50226f7 100644 --- a/rules/mbw.make +++ b/rules/mbw.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_MBW) += mbw # # Paths and names # -MBW_VERSION:= 1.1-1 -MBW_MD5:= 4509f034b22aec5001e1402e53353f8e +MBW_VERSION:= 1.4 +MBW_MD5:= 83b5dfbcdc2d5e4f332ce56135f0a587 MBW:= mbw-$(MBW_VERSION) MBW_SUFFIX := tar.gz -MBW_URL:= http://www.sourcefiles.org/Miscellaneous/$(MBW).$(MBW_SUFFIX) +MBW_URL:= https://github.com/raas/mbw/releases/download/v1.4/$(MBW).$(MBW_SUFFIX) MBW_SOURCE := $(SRCDIR)/$(MBW).$(MBW_SUFFIX) MBW_DIR:= $(BUILDDIR)/$(MBW) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] mbw: update url
From: Markus Niebel markus.nie...@tqs.de Original URL is not longer reachable. Fix URL where the tarball could be found. Signed-off-by: Markus Niebel markus.nie...@tqs.de --- rules/mbw.make |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/mbw.make b/rules/mbw.make index 30f62a0..6278fef 100644 --- a/rules/mbw.make +++ b/rules/mbw.make @@ -21,7 +21,7 @@ MBW_VERSION := 1.1-1 MBW_MD5:= 4509f034b22aec5001e1402e53353f8e MBW:= mbw-$(MBW_VERSION) MBW_SUFFIX := tar.gz -MBW_URL:= http://ahorvath.web.cern.ch/ahorvath/mbw/$(MBW).$(MBW_SUFFIX) +MBW_URL:= http://www.sourcefiles.org/Miscellaneous/$(MBW).$(MBW_SUFFIX) MBW_SOURCE := $(SRCDIR)/$(MBW).$(MBW_SUFFIX) MBW_DIR:= $(BUILDDIR)/$(MBW) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] 2012.07.0 - ICE compiling DirectFB for cortex-a8
Hello, Am 27.08.2012 13:07, wrote Josef Holzmayr: Howdy! Am 27.08.2012 13:00, schrieb Markus Niebel: we see an ICE when compiling directFB: convert.c: In function 'dfb_convert_to_rgb24': convert.c:1693:1: internal compiler error: in neon_disambiguate_copy, at config/arm/arm.c:20337 Please submit a full bug report, with preprocessed source if appropriate. See http://gcc.gnu.org/bugs.html for instructions. make[5]: *** [convert.lo] Error 1 Toolchain: OSELAS.Toolchain-2011.11.1 i've run into the same when building for OMAP4 (cortex a9), and most interestingly the fix already seems to be included in the linaro-based toolchain for cortex-aX that you can find in the OSELAS Toolchain package 2011.02 Same here for new OSELAS.Toolchain-2011.11.2 and cortex-a8 Greetz _ Josef Holzmayr Dipl-Ing. (FH) Entwicklung Embedded Devices / Software Tel.: +49 8444 9204-48 Fax: +49 8444 9204-50 holzm...@rsi-elektrotechnik.de R-S-I Elektrotechnik GmbH Co. KG Woelkestrasse 11 D-85301 Schweitenkirchen www.rsi-elektrotechnik.de _ Amtsgericht Ingolstadt - GmbH: HRB 191328 - KG: HRA 170363 Geschäftsführer: Dr.-Ing. Michael Sorg, Dipl.-Ing. Franz Sorg USt-IdNr.: DE 128592548 -- ptxdist mailing list ptxdist@pengutronix.de