Re: [ptxdist] [PATCH v3] linuxptp: Update package and configs

2017-11-23 Thread Michael Grzeschik 
On Wed, Nov 22, 2017 at 01:13:59PM +0100, Michael Grzeschik wrote:
> Usualy we can not ensure only to use transparent clock switches.
> Therefor we setup the fix option -P to the commandline to enable
> the P2P mechanism in ptp4l.
> 
> The following options are highly depending on the usecase
> so we remove them for the defaults.
> 
> path_trace_enabled
> follow_up_info
> tx_timestamp_timeout
> 
> With all other options were simple defaults the whole
> config can be removed.
> 
> We also add some service files to start the ptp4l service on
> dev eth0. In case the ptp4l daemon is configured
> we add the option to install the phc2sys daemon to adjust the
> system time by the ptp master.
> 
> Signed-off-by: Michael Grzeschik 
> ---
> v1 -> v2: - removed install stage for gPTP.conf from rules file
>   - limited to run ptp4l only on eth0 for the default setup case
> 
> v2 -> v3: - removed second -r option in phc2sys rule
>   - changed systemd rule for ptp4l to static configuration
> 
>  projectroot/etc/gPTP.conf  | 28 
> --
>  projectroot/usr/lib/systemd/system/phc2sys.service | 10 
>  projectroot/usr/lib/systemd/system/ptp4l.service   | 12 ++
>  rules/linuxptp.in  | 12 ++
>  rules/linuxptp.make| 20 +---
>  5 files changed, 51 insertions(+), 31 deletions(-)
>  delete mode 100644 projectroot/etc/gPTP.conf
>  create mode 100644 projectroot/usr/lib/systemd/system/phc2sys.service
>  create mode 100644 projectroot/usr/lib/systemd/system/ptp4l.service
> 
> diff --git a/projectroot/etc/gPTP.conf b/projectroot/etc/gPTP.conf
> deleted file mode 100644
> index 5bbbaf288..0
> --- a/projectroot/etc/gPTP.conf
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -[global]
> -#
> -# Run time options
> -#
> -assume_two_step 1
> -logging_level   6
> -path_trace_enabled  1
> -follow_up_info  1
> -tx_timestamp_timeout40
> -use_syslog  1
> -verbose 0
> -summary_interval0
> -#
> -# Transport options
> -#
> -transportSpecific   0x1
> -ptp_dst_mac 01:80:C2:00:00:0E
> -p2p_dst_mac 01:80:C2:00:00:0E
> -uds_address /var/run/ptp4l
> -#
> -# Default interface options
> -#
> -network_transport   L2
> -delay_mechanism P2P
> -time_stamping   hardware
> -
> -[eth0]
> -
> diff --git a/projectroot/usr/lib/systemd/system/phc2sys.service 
> b/projectroot/usr/lib/systemd/system/phc2sys.service
> new file mode 100644
> index 0..992a95484
> --- /dev/null
> +++ b/projectroot/usr/lib/systemd/system/phc2sys.service
> @@ -0,0 +1,10 @@
> +[Unit]
> +Description=Precision Time Protocol system clock synchronization
> +Wants=ptp4l@.service
> +
> +[Service]
> +ExecStart=/usr/sbin/phc2sys -a -r
> +Restart=always
> +
> +[Install]
> +WantedBy=multi-user.target
> diff --git a/projectroot/usr/lib/systemd/system/ptp4l.service 
> b/projectroot/usr/lib/systemd/system/ptp4l.service
> new file mode 100644
> index 0..90d09e56d
> --- /dev/null
> +++ b/projectroot/usr/lib/systemd/system/ptp4l.service
> @@ -0,0 +1,12 @@
> +[Unit]
> +Description=Precision Time Protocol (PTP) service
> +BindsTo = sys-subsystem-net-devices-eth0.device
> +After = sys-subsystem-net-devices-eth0.device
> +
> +[Service]
> +Type=simple
> +ExecStart=/usr/sbin/ptp4l -P -i eth0
> +Restart=always
> +
> +[Install]
> +WantedBy=multi-user.target
> diff --git a/rules/linuxptp.in b/rules/linuxptp.in
> index 641d844c7..5418d2ad0 100644
> --- a/rules/linuxptp.in
> +++ b/rules/linuxptp.in
> @@ -7,3 +7,15 @@ config LINUXPTP
> The Linux PTP project implements the Precision Time protocol (PTP),
> standardized as IEEE1588.
>  
> +if LINUXPTP
> +
> +config LINUXPTP_SYSTEMD_SERVICE
> + bool "install ptp4l and phc2sys systemd service files"
> + default y
> +
> +config LINUXPTP_PHC2SYS_SYSTEMD_SERVICE
> + bool "Enable phc2sys systemd service file"
> + default y
> + depends on LINUXPTP_SYSTEMD_SERVICE
> +
> +endif
> diff --git a/rules/linuxptp.make b/rules/linuxptp.make
> index 59cbb5123..9d3163d56 100644
> --- a/rules/linuxptp.make
> +++ b/rules/linuxptp.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LINUXPTP) += linuxptp
>  #
>  # Paths and names
>  #
> -LINUXPTP_VERSION := 1.6
> -LINUXPTP_MD5 := 6aa15d83f5a35f1fd076ba9adc4e7285
> +LINUXPTP_VERSION := 1.8
> +LINUXPTP_MD5 := 5688cdfe57932273e1dbf35b3b97b9a0
>  LINUXPTP := linuxptp-$(LINUXPTP_VERSION)
>  LINUXPTP_SUFFIX  := tgz
>  LINUXPTP_URL := $(call ptx/mirror, SF, 
> linuxptp/$(LINUXPTP).$(LINUXPTP_SUFFIX))
> @@ -64,7 +64,21 @@ $(STATEDIR)/linuxptp.targetinstall:
>   @$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/phc2sys)
>   @$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/pmc)
>   @$(call install_copy, linuxptp, 0, 0, 0755,

Re: [ptxdist] [ptxdist-commit] [public/git/ptxdist] 15/26: Doc: improve the 'build the docs' documentation

2017-11-23 Thread Juergen Borleis 
On Thursday 23 November 2017 14:51:16 Roland Hieber wrote:
> [...]
>
> > +Using a Python virtual environment
> > +^^
> > +
> > +*Sphinx* is *Python* based and thus can be installed via a virtual
> > environment +when not globally present in the host system.
> > +
> > +.. code-block:: text
> > +
> > +   $ pip3 install --upgrade --user pip virtualenv
>
> Is there a "$ virtualenv env/" missing here? Or how is the virtualenv
> expected to come into existence?

The Python experts should answer this load and clear... ;)

Cheers,
Jürgen

-- 
Pengutronix e.K.                             | Juergen Borleis             |
Industrial Linux Solutions                   | http://www.pengutronix.de/  |

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [ptxdist-commit] [public/git/ptxdist] 15/26: Doc: improve the 'build the docs' documentation

2017-11-23 Thread Roland Hieber 

Hi,

On 23.11.2017 14:29, gitolite+pub...@pengutronix.de wrote:

This is an automated email from the git hooks/post-receive script.

pengutronix.michael.olbrich pushed a commit to branch master
in repository git/ptxdist.

commit efebcad7d3bd4d3d1e4cbdc280ce5bf29f298cdf
Author: Juergen Borleis 
AuthorDate: Tue Nov 14 16:33:43 2017 +0100

 Doc: improve the 'build the docs' documentation
 
 Signed-off-by: Juergen Borleis 

---
  doc/including_bsp_doc.inc | 101 +-
  1 file changed, 64 insertions(+), 37 deletions(-)

diff --git a/doc/including_bsp_doc.inc b/doc/including_bsp_doc.inc
index c24e40e27a24..f1f65ff48acc 100644
--- a/doc/including_bsp_doc.inc
+++ b/doc/including_bsp_doc.inc
@@ -1,42 +1,17 @@
-Integrate project specific Documentaion into the Manual

+The PTXdist User Manual
+---
  


[...]

  
+Using a Python virtual environment

+^^
+
+*Sphinx* is *Python* based and thus can be installed via a virtual environment
+when not globally present in the host system.
+
+.. code-block:: text
+
+   $ pip3 install --upgrade --user pip virtualenv


Is there a "$ virtualenv env/" missing here? Or how is the virtualenv 
expected to come into existence?


 - Roland


+   $ source env/bin/activate
+   $ pip3 install sphinx
+   $ pip3 install sphinx_rtd_theme
+
+.. note:: Whenever you want to create the PTXdist user manual, you must first
+   source the ``env/bin/activate`` file if not already done.
+
  Building the Documentation
  ~~
  
@@ -56,7 +47,7 @@ documentation from the sources.
  
  The command:
  
-::

+.. code-block:: text
  
  $ ptxdist docs-html
  
@@ -65,13 +56,49 @@ file for this kind of documentation is ``Documentation/html/index.html``.
  
  The command:
  
-::

+.. code-block:: text
  
  $ ptxdist docs-latex
  
  will build the Latex based documentation which results into the final

  *Portable Document Format* document. This result can be found in
-``Documentation/latex/``.
+``Documentation/latex/OSELAS.BSP-Pengutronix-Example-Quickstart.pdf``.
  
  Both commands can be executed in the BSP or the toplevel PTXdist directory

  to create the BSP specific or generic documentation respectively.
+
+Integrate project specific Documentation into the Manual
+
+
+PTXdist supports the ability to integrate project specific documentation
+into the final PTXdist manual. To do so, PTXdist handles file replacements and
+additions, while generating the documentation.
+
+File replacement is working in the same manner like for all other files in
+a PTXdist based project: a local file with the same name superseds a global 
file
+from PTXdist.
+
+With this mechanism we can replace existing PTXdist documentation or add new 
one.
+
+If we want to add a new global section to the manual we can copy the global
+PTXdist ``doc/index.rst`` file into our local ``doc/`` directory and adapt it
+accordingly.
+
+To change or add things less intrusive we can do it on the various ``*.inc``
+files in the PTXdist's ``doc/`` directory which define the content of the
+sections.
+
+For example to change the image createn section's content, we can copy the
+global PTXdist ``doc/user_images.inc`` into our local ``doc/`` directory and
+adapt it to the behaviour of our project.
+
+In the generic documentation source many text uses variables instead of fixed
+content. These variables are filled with values extracted from the current 
PTXdist
+project prior building the final documentation. Since PTXdist projects are 
bound
+to a defined PTXdist version and toolchain version, this kind of information is
+extracted from the current settings and substituted in the documentation. This
+behaviour ensures the documentaiton includes the project's exact definition to
+external dependencies.
+
+Refer the PTXdist file ``doc/conf.py`` for more information on variable
+substitution. This PTXdist global file can be superseded by a local copy as 
well.



--
Pengutronix e.K.  | Roland Hieber   |
Industrial Linux Solutions| http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917- |

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 2/6] cups-filters: pin down license MD5sum

2017-11-23 Thread Roland Hieber 
Signed-off-by: Roland Hieber 
---
changes in v1 -> v2:
 * sorry, the md5sum was missing a '7' in the front...

---
 rules/cups-filters.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/cups-filters.make b/rules/cups-filters.make
index ceac6a33d..7b3e848da 100644
--- a/rules/cups-filters.make
+++ b/rules/cups-filters.make
@@ -24,6 +24,7 @@ CUPS_FILTERS_URL  := 
http://openprinting.org/download/cups-filters/$(CUPS_FILTERS
 CUPS_FILTERS_SOURCE:= $(SRCDIR)/$(CUPS_FILTERS).$(CUPS_FILTERS_SUFFIX)
 CUPS_FILTERS_DIR   := $(BUILDDIR)/$(CUPS_FILTERS)
 CUPS_FILTERS_LICENSE   := GPL-2.0 AND GPL-2.0+ AND GPL-3.0 AND GPL-3.0+ AND 
LGPL-2 AND LGPL-2.1+ AND MIT AND BSD-4-clause
+CUPS_FILTERS_LICENSE_FILES := 
file://COPYING;md5=794bc12f02f100806cd5f19304d03f7b
 
 # 
 # Prepare
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2] fbv: Fix build error due to direct access to jmpbuf

2017-11-23 Thread Gavin Schenk 
Signed-off-by: Gavin Schenk 
---
 ...uild-error-due-to-direct-access-to-jmpbuf.patch | 34 ++
 patches/fbv-1.0b-ptx3/series   |  4 +++
 2 files changed, 38 insertions(+)
 create mode 100644 
patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch
 create mode 100644 patches/fbv-1.0b-ptx3/series

diff --git 
a/patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch
 
b/patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch
new file mode 100644
index 0..cfe00b3fc
--- /dev/null
+++ 
b/patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch
@@ -0,0 +1,34 @@
+From: Gavin Schenk 
+Date: Thu, 23 Nov 2017 12:13:48 +0100
+Subject: [PATCH] fbv: Fix build error due to direct access to jmpbuf
+
+The build fails with "dereferencing pointer to incomplete type" when
+accessing the jmpbuf ptr directly.
+
+Using the macro png_jmpbuf(...) fixes this compiler error.
+---
+ png.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/png.c b/png.c
+index 8a0c62073dfb..3f5afddbca5c 100644
+--- a/png.c
 b/png.c
+@@ -69,7 +69,7 @@ int fh_png_load(char *name,unsigned char *buffer, unsigned 
char ** alpha,int x,i
+ fclose(fh); return(FH_ERROR_FORMAT);
+ }
+ rp=0;
+-if (setjmp(png_ptr->jmpbuf))
++if (setjmp(png_jmpbuf(png_ptr)))
+ {
+   png_destroy_read_struct(_ptr, _ptr, (png_infopp)NULL);
+ if(rp) free(rp);
+@@ -161,7 +161,7 @@ int fh_png_getsize(char *name,int *x,int *y)
+ fclose(fh); return(FH_ERROR_FORMAT);
+ }
+ rp=0;
+-if (setjmp(png_ptr->jmpbuf))
++if (setjmp(png_jmpbuf(png_ptr)))
+ {
+   png_destroy_read_struct(_ptr, _ptr, (png_infopp)NULL);
+ if(rp) free(rp);
diff --git a/patches/fbv-1.0b-ptx3/series b/patches/fbv-1.0b-ptx3/series
new file mode 100644
index 0..1a7f9e2c6
--- /dev/null
+++ b/patches/fbv-1.0b-ptx3/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch
+# 696c9ccc35cdb0d48da69c868da299fd  - git-ptx-patches magic
-- 
2.15.0


Eckelmann AG
Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp 
Eckelmann
Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann
Vorsitzender des Aufsichtsrats: Hubertus G. Krossa
Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann
Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht 
Wiesbaden HRB 12636
http://www.eckelmann.de 


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] fbv: Fix build error due to direct access to jmpbuf

2017-11-23 Thread Gavin Schenk 
The build fails with "dereferencing pointer to incomplete type" when
accessing the jmpbuf ptr directly.

Using the macro png_jmpbuf(...) fixes this compiler error.

Signed-off-by: Gavin Schenk 
---
 png.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/png.c b/png.c
index 8a0c62073dfb..3f5afddbca5c 100644
--- a/png.c
+++ b/png.c
@@ -69,7 +69,7 @@ int fh_png_load(char *name,unsigned char *buffer, unsigned 
char ** alpha,int x,i
 fclose(fh); return(FH_ERROR_FORMAT);
 }
 rp=0;
-if (setjmp(png_ptr->jmpbuf))
+if (setjmp(png_jmpbuf(png_ptr)))
 {
png_destroy_read_struct(_ptr, _ptr, (png_infopp)NULL);
 if(rp) free(rp);
@@ -161,7 +161,7 @@ int fh_png_getsize(char *name,int *x,int *y)
 fclose(fh); return(FH_ERROR_FORMAT);
 }
 rp=0;
-if (setjmp(png_ptr->jmpbuf))
+if (setjmp(png_jmpbuf(png_ptr)))
 {
png_destroy_read_struct(_ptr, _ptr, (png_infopp)NULL);
 if(rp) free(rp);
-- 
2.15.0


Eckelmann AG
Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp 
Eckelmann
Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann
Vorsitzender des Aufsichtsrats: Hubertus G. Krossa
Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann
Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht 
Wiesbaden HRB 12636
http://www.eckelmann.de 


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 6/5] poppler-data: pin down license MD5sum

2017-11-23 Thread Roland Hieber 
Signed-off-by: Roland Hieber 
---
... oops, forgot to send this in the series... :)

---
 rules/poppler-data.make | 4 
 1 file changed, 4 insertions(+)

diff --git a/rules/poppler-data.make b/rules/poppler-data.make
index 93edb7cea..1272cb65f 100644
--- a/rules/poppler-data.make
+++ b/rules/poppler-data.make
@@ -24,6 +24,10 @@ POPPLER_DATA_URL := 
https://poppler.freedesktop.org/$(POPPLER_DATA).$(POPPLER_DA
 POPPLER_DATA_SOURCE:= $(SRCDIR)/$(POPPLER_DATA).$(POPPLER_DATA_SUFFIX)
 POPPLER_DATA_DIR   := $(BUILDDIR)/$(POPPLER_DATA)
 POPPLER_DATA_LICENSE   := GPL-2.0 AND MIT AND BSD-3-Clause
+POPPLER_DATA_LICENSE_FILES := \
+   file://COPYING;md5=4870b98343f0bbb25fa43b9d2ba59448 \
+   file://COPYING.adobe;md5=63c6a8a9df204c00461fa5f163d8a663 \
+   file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe
 
 # 
 # Prepare
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 1/2] lcms: version bump 1.19 -> 2.9

2017-11-23 Thread Roland Hieber 
lcms 1.19 was released 2009, and is no longer maintained, so it is
about time. Python support has been removed. MD5 for the license file
has changed, but it's still the MIT License. Also make the tools
installable.

Signed-off-by: Roland Hieber 
--
changes v1 -> v2:
 * correct a small typo in commit message (libcms -> lcms, thanks to rsc)
 * poppler patch is unchanged, not resending it.

---
 rules/lcms.in   | 13 +++--
 rules/lcms.make | 20 
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/rules/lcms.in b/rules/lcms.in
index b7bae423b..f03776c59 100644
--- a/rules/lcms.in
+++ b/rules/lcms.in
@@ -1,9 +1,18 @@
 ## SECTION=system_libraries
 
-config LCMS
+menuconfig LCMS
tristate
-   prompt "lcms"
+   prompt "lcms  "
select LIBC_M
help
  LittleCMS intends to be a small-footprint, speed
  optimized color management engine in open source form.
+
+if LCMS
+
+config LCMS_BIN
+   bool "install tools"
+   help
+ Install transicc, psicc, linkicc
+
+endif
diff --git a/rules/lcms.make b/rules/lcms.make
index 55bb10e6d..7ca10dd7a 100644
--- a/rules/lcms.make
+++ b/rules/lcms.make
@@ -16,15 +16,15 @@ PACKAGES-$(PTXCONF_LCMS) += lcms
 #
 # Paths and names
 #
-LCMS_VERSION   := 1.19
-LCMS_MD5   := 8af94611baf20d9646c7c2c285859818
-LCMS   := lcms-$(LCMS_VERSION)
+LCMS_VERSION   := 2.9
+LCMS_MD5   := 45865f3faf3cc1a9778f89e255495331
+LCMS   := lcms2-$(LCMS_VERSION)
 LCMS_SUFFIX:= tar.gz
 LCMS_URL   := $(call ptx/mirror, SF, lcms/$(LCMS).$(LCMS_SUFFIX))
 LCMS_SOURCE:= $(SRCDIR)/$(LCMS).$(LCMS_SUFFIX)
-LCMS_DIR   := $(BUILDDIR)/lcms-1.19
+LCMS_DIR   := $(BUILDDIR)/$(LCMS)
 LCMS_LICENSE   := MIT
-LCMS_LICENSE_FILES := file://COPYING;md5=156745cad721a8783cb847e82b79f586
+LCMS_LICENSE_FILES := file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516
 
 # 
 # Prepare
@@ -40,8 +40,7 @@ LCMS_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
--without-tiff \
--without-zlib \
-   --without-jpeg \
-   --without-python
+   --without-jpeg
 
 # 
 # Target-Install
@@ -56,8 +55,13 @@ $(STATEDIR)/lcms.targetinstall:
@$(call install_fixup, lcms,AUTHOR,"Michael Olbrich 
")
@$(call install_fixup, lcms,DESCRIPTION,missing)
 
-   @$(call install_lib, lcms, 0, 0, 0644, liblcms)
+   @$(call install_lib, lcms, 0, 0, 0644, liblcms2)
 
+ifdef PTXCONF_LCMS_BIN
+   @$(call install_copy, lcms, 0, 0, 0755, -, /usr/bin/transicc)
+   @$(call install_copy, lcms, 0, 0, 0755, -, /usr/bin/psicc)
+   @$(call install_copy, lcms, 0, 0, 0755, -, /usr/bin/linkicc)
+endif
@$(call install_finish, lcms)
 
@$(call touch)
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 4/5] libpaper: pin down license MD5sum

2017-11-23 Thread Roland Hieber 
Signed-off-by: Roland Hieber 
---
 rules/libpaper.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/libpaper.make b/rules/libpaper.make
index 0d68dc62a..6a8128b8e 100644
--- a/rules/libpaper.make
+++ b/rules/libpaper.make
@@ -27,6 +27,7 @@ LIBPAPER_URL  := 
http://snapshot.debian.org/archive/debian-debug/20161113T151229
 LIBPAPER_SOURCE:= $(SRCDIR)/$(LIBPAPER).$(LIBPAPER_SUFFIX)
 LIBPAPER_DIR   := $(BUILDDIR)/$(LIBPAPER)
 LIBPAPER_LICENSE   := GPL-2.0
+LIBPAPER_LICENSE_FILES := file://COPYING;md5=0278281246c1e59af1ef0ae1784a4948
 
 # 
 # Prepare
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/5] cups-filters: pin down license MD5sum

2017-11-23 Thread Roland Hieber 
Signed-off-by: Roland Hieber 
---
 rules/cups-filters.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/cups-filters.make b/rules/cups-filters.make
index ceac6a33d..2694ac75d 100644
--- a/rules/cups-filters.make
+++ b/rules/cups-filters.make
@@ -24,6 +24,7 @@ CUPS_FILTERS_URL  := 
http://openprinting.org/download/cups-filters/$(CUPS_FILTERS
 CUPS_FILTERS_SOURCE:= $(SRCDIR)/$(CUPS_FILTERS).$(CUPS_FILTERS_SUFFIX)
 CUPS_FILTERS_DIR   := $(BUILDDIR)/$(CUPS_FILTERS)
 CUPS_FILTERS_LICENSE   := GPL-2.0 AND GPL-2.0+ AND GPL-3.0 AND GPL-3.0+ AND 
LGPL-2 AND LGPL-2.1+ AND MIT AND BSD-4-clause
+CUPS_FILTERS_LICENSE_FILES := 
file://COPYING;md5=94bc12f02f100806cd5f19304d03f7b
 
 # 
 # Prepare
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/5] nginx: pin down license MD5sum

2017-11-23 Thread Roland Hieber 
Signed-off-by: Roland Hieber 
---
 rules/nginx.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/nginx.make b/rules/nginx.make
index c2f58da1a..bdadc6b64 100644
--- a/rules/nginx.make
+++ b/rules/nginx.make
@@ -25,6 +25,7 @@ NGINX_URL := 
https://nginx.org/download/$(NGINX).$(NGINX_SUFFIX)
 NGINX_SOURCE   := $(SRCDIR)/$(NGINX).$(NGINX_SUFFIX)
 NGINX_DIR  := $(BUILDDIR)/$(NGINX)
 NGINX_LICENSE  := BSD-2-Clause
+NGINX_LICENSE_FILES:= file://LICENSE;md5=903753de5f86a1ee0341fd2f9491b282
 
 # 
 # Prepare
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 5/5] qpdf: correct license and pin down license MD5sum

2017-11-23 Thread Roland Hieber 
A quick glance at QPDF's LICENSE.txt shows that it identifies itself at
the Apache 2.0 license, not the Artistic license.

Signed-off-by: Roland Hieber 
---
 rules/qpdf.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/qpdf.make b/rules/qpdf.make
index eecfe4b39..5995f22b2 100644
--- a/rules/qpdf.make
+++ b/rules/qpdf.make
@@ -23,7 +23,8 @@ QPDF_SUFFIX   := tar.gz
 QPDF_URL   := $(call ptx/mirror, SF, 
/qpdf/qpdf/$(QPDF_VERSION)/$(QPDF).$(QPDF_SUFFIX))
 QPDF_SOURCE:= $(SRCDIR)/$(QPDF).$(QPDF_SUFFIX)
 QPDF_DIR   := $(BUILDDIR)/$(QPDF)
-QPDF_LICENSE   := Artistic-2.0
+QPDF_LICENSE   := Apache-2.0
+QPDF_LICENSE_FILES := 
file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57
 
 # 
 # Prepare
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/5] cups: pin down license MD5sum

2017-11-23 Thread Roland Hieber 
Signed-off-by: Roland Hieber 
---
 rules/cups.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/cups.make b/rules/cups.make
index 7eb209e25..c9d8e4e35 100644
--- a/rules/cups.make
+++ b/rules/cups.make
@@ -24,6 +24,7 @@ CUPS_URL  := 
https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)/$(C
 CUPS_SOURCE:= $(SRCDIR)/$(CUPS)-source.$(CUPS_SUFFIX)
 CUPS_DIR   := $(BUILDDIR)/cups-$(CUPS_VERSION)
 CUPS_LICENSE   := LGPL-2.0 AND GPL-2.0
+CUPS_LICENSE_FILES := 
file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460
 
 # 
 # Prepare
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de