[ptxdist] [PATCH v2] openvpn: add license identifier
Signed-off-by: Hubert Feurstein --- rules/openvpn.make | 7 +++ 1 file changed, 7 insertions(+) diff --git a/rules/openvpn.make b/rules/openvpn.make index ad496d1a7..dc05384df 100644 --- a/rules/openvpn.make +++ b/rules/openvpn.make @@ -21,6 +21,13 @@ OPENVPN_SUFFIX := tar.xz OPENVPN_URL:= http://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX) OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX) OPENVPN_DIR:= $(BUILDDIR)/$(OPENVPN) +OPENVPN_LICENSE:= GPL-2.0-only WITH openvpn-openssl-exception AND BSD-2-Clause AND BSD-3-Clause +OPENVPN_LICENSE_FILES := \ + file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba \ + file://COPYRIGHT.GPL;md5=52cadf4008002e3c314a47a54fa7306c \ + file://src/openvpn/openvpn.c;startline=2;endline=21;md5=0f37ee042b428e513bda42b430344d42 \ + file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f \ + file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5f66cf078523624965e41518eed881e2 # # Prepare -- 2.23.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/3] cpufrequtils: add license identifier
Signed-off-by: Hubert Feurstein --- rules/cpufrequtils.make | 4 1 file changed, 4 insertions(+) diff --git a/rules/cpufrequtils.make b/rules/cpufrequtils.make index 1173c488c..d119cce53 100644 --- a/rules/cpufrequtils.make +++ b/rules/cpufrequtils.make @@ -21,6 +21,10 @@ CPUFREQUTILS_SUFFIX := tar.xz CPUFREQUTILS_URL := $(call ptx/mirror, KERNEL, utils/kernel/cpufreq/$(CPUFREQUTILS).$(CPUFREQUTILS_SUFFIX)) CPUFREQUTILS_SOURCE:= $(SRCDIR)/$(CPUFREQUTILS).$(CPUFREQUTILS_SUFFIX) CPUFREQUTILS_DIR := $(BUILDDIR)/$(CPUFREQUTILS) +CPUFREQUTILS_LICENSE := GPL-2.0-only +CPUFREQUTILS_LICENSE_FILES := \ + file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://utils/info.c;startline=1;endline=5;md5=a3504f2818a74b2fffdc8e61bf3ef0f8 # # Prepare -- 2.23.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] openvpn: add license identifier
Signed-off-by: Hubert Feurstein --- rules/openvpn.make | 4 1 file changed, 4 insertions(+) diff --git a/rules/openvpn.make b/rules/openvpn.make index ad496d1a7..4035f453f 100644 --- a/rules/openvpn.make +++ b/rules/openvpn.make @@ -21,6 +21,10 @@ OPENVPN_SUFFIX := tar.xz OPENVPN_URL:= http://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX) OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX) OPENVPN_DIR:= $(BUILDDIR)/$(OPENVPN) +OPENVPN_LICENSE:= GPL-2.0-only +OPENVPN_LICENSE_FILES := \ + file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba \ + file://src/openvpn/openvpn.c;startline=1;endline=22;md5=1bb6a64be5c851a32fa98b8f9d6e33f9 # # Prepare -- 2.23.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/3] wget: add license identifier
Signed-off-by: Hubert Feurstein --- rules/wget.make | 4 1 file changed, 4 insertions(+) diff --git a/rules/wget.make b/rules/wget.make index 1ec6d8c42..cf1a2340f 100644 --- a/rules/wget.make +++ b/rules/wget.make @@ -21,6 +21,10 @@ WGET_SUFFIX := tar.gz WGET_URL := $(call ptx/mirror, GNU, wget/$(WGET).$(WGET_SUFFIX)) WGET_SOURCE:= $(SRCDIR)/$(WGET).$(WGET_SUFFIX) WGET_DIR := $(BUILDDIR)/$(WGET) +WGET_LICENSE := GPL-3.0-or-later +WGET_LICENSE_FILES := \ + file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ + file://src/main.c;startline=1;endline=28;md5=7b27873e910933ba54fa16589c4b8eed # # Prepare -- 2.23.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] iperf: version bump 2.0.9 -> 2.0.13
Signed-off-by: Hubert Feurstein --- rules/iperf.make | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/rules/iperf.make b/rules/iperf.make index 2c27bc152..32e481b68 100644 --- a/rules/iperf.make +++ b/rules/iperf.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_IPERF) += iperf # # Paths and names # -IPERF_VERSION := 2.0.9 -IPERF_MD5 := 351b018b71176b8cb25f20eef6a9e37c +IPERF_VERSION := 2.0.13 +IPERF_MD5 := 31ea1c6d5cbf80b16ff3abe4288dad5e IPERF := iperf-$(IPERF_VERSION) IPERF_SUFFIX := tar.gz IPERF_URL := $(call ptx/mirror, SF, iperf2/$(IPERF).$(IPERF_SUFFIX)) @@ -40,7 +40,12 @@ IPERF_AUTOCONF := \ --enable-threads \ --disable-debuginfo \ --disable-web100 \ - --enable-kalman + --enable-kalman \ + --enable-seqno64b \ + --enable-isochronous \ + --disable-fastsampling \ + --disable-checkprograms \ + --enable-af-packet # # Target-Install -- 2.22.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] lldpd: version bump 0.9.8 -> 1.0.4
Signed-off-by: Hubert Feurstein --- v2: added LIBCAP dependency rules/lldpd.in | 1 + rules/lldpd.make | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/lldpd.in b/rules/lldpd.in index abe6f35c8..b73ef1f23 100644 --- a/rules/lldpd.in +++ b/rules/lldpd.in @@ -5,6 +5,7 @@ menuconfig LLDPD prompt "lldpd " select INITMETHOD select LIBBSD + select LIBCAP select LIBEVENT select READLINE select NET_SNMP if LLDPD_SNMP diff --git a/rules/lldpd.make b/rules/lldpd.make index e1478ad29..ec1c7c571 100644 --- a/rules/lldpd.make +++ b/rules/lldpd.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LLDPD) += lldpd # # Paths and names # -LLDPD_VERSION := 0.9.8 -LLDPD_MD5 := 8809600492f6b73149eb19158e819c1f +LLDPD_VERSION := 1.0.4 +LLDPD_MD5 := 33e8d58623f99184e4e709cbbfe45db3 LLDPD := lldpd-$(LLDPD_VERSION) LLDPD_SUFFIX := tar.gz LLDPD_URL := http://media.luffy.cx/files/lldpd//$(LLDPD).$(LLDPD_SUFFIX) @@ -51,6 +51,7 @@ LLDPD_CONF_OPT:= $(CROSS_AUTOCONF_USR) \ --$(call ptx/wwo, PTXCONF_LLDPD_SNMP)-snmp \ --$(call ptx/wwo, PTXCONF_LLDPD_XML)-xml \ --without-seccomp \ + --with-libbsd \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-privsep-user="$(PTXCONF_LLDPD_PRIVSEP_USER)" \ --with-privsep-group="$(PTXCONF_LLDPD_PRIVSEP_GROUP)" \ -- 2.22.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] lldpd: version bump 0.9.8 -> 1.0.4
Signed-off-by: Hubert Feurstein --- rules/lldpd.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/lldpd.make b/rules/lldpd.make index e1478ad29..ec1c7c571 100644 --- a/rules/lldpd.make +++ b/rules/lldpd.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LLDPD) += lldpd # # Paths and names # -LLDPD_VERSION := 0.9.8 -LLDPD_MD5 := 8809600492f6b73149eb19158e819c1f +LLDPD_VERSION := 1.0.4 +LLDPD_MD5 := 33e8d58623f99184e4e709cbbfe45db3 LLDPD := lldpd-$(LLDPD_VERSION) LLDPD_SUFFIX := tar.gz LLDPD_URL := http://media.luffy.cx/files/lldpd//$(LLDPD).$(LLDPD_SUFFIX) @@ -51,6 +51,7 @@ LLDPD_CONF_OPT:= $(CROSS_AUTOCONF_USR) \ --$(call ptx/wwo, PTXCONF_LLDPD_SNMP)-snmp \ --$(call ptx/wwo, PTXCONF_LLDPD_XML)-xml \ --without-seccomp \ + --with-libbsd \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-privsep-user="$(PTXCONF_LLDPD_PRIVSEP_USER)" \ --with-privsep-group="$(PTXCONF_LLDPD_PRIVSEP_GROUP)" \ -- 2.22.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/2] gnupg: add compression algorithms support
Signed-off-by: Hubert Feurstein --- rules/gnupg.in | 16 +++- rules/gnupg.make | 4 ++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/rules/gnupg.in b/rules/gnupg.in index 7118f25b1..e515be093 100644 --- a/rules/gnupg.in +++ b/rules/gnupg.in @@ -9,7 +9,9 @@ menuconfig GNUPG select LIBKSBA select NPTH select READLINE - select ZLIB + select ZLIB if GNUPG_GPG_ZIP + select BZIP2 if GNUPG_GPG_BZIP2 + select BZIP2_LIBBZ2 if GNUPG_GPG_BZIP2 # disabling GNUPG_GPG_EDDSA is broken select GNUPG_GPG_EDDSA help @@ -100,4 +102,16 @@ config GNUPG_GPG_RMD160 endmenu +menu "compression algorithms" + +config GNUPG_GPG_ZIP + bool + prompt "ZIP" + +config GNUPG_GPG_BZIP2 + bool + prompt "BZIP2" + +endmenu + endif diff --git a/rules/gnupg.make b/rules/gnupg.make index 48585f9cd..afbef7fcd 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -66,8 +66,8 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_GNUPG_GPG_SHA)-gpg-sha224 \ --$(call ptx/endis, PTXCONF_GNUPG_GPG_SHA)-gpg-sha384 \ --$(call ptx/endis, PTXCONF_GNUPG_GPG_SHA)-gpg-sha512 \ - --disable-zip \ - --disable-bzip2 \ + --$(call ptx/endis, PTXCONF_GNUPG_GPG_ZIP)-zip \ + --$(call ptx/endis, PTXCONF_GNUPG_GPG_BZIP2)-bzip2 \ --disable-exec \ --disable-photo-viewers \ --disable-card-support \ -- 2.17.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] gnupg: add compression algorithms support
Signed-off-by: Hubert Feurstein --- rules/gnupg.in | 12 rules/gnupg.make | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rules/gnupg.in b/rules/gnupg.in index 7118f25b1..e5daad317 100644 --- a/rules/gnupg.in +++ b/rules/gnupg.in @@ -100,4 +100,16 @@ config GNUPG_GPG_RMD160 endmenu +menu "compression algorithms" + +config GNUPG_GPG_ZIP + bool + prompt "ZIP" + +config GNUPG_GPG_BZIP2 + bool + prompt "BZIP2" + +endmenu + endif diff --git a/rules/gnupg.make b/rules/gnupg.make index 48585f9cd..afbef7fcd 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -66,8 +66,8 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_GNUPG_GPG_SHA)-gpg-sha224 \ --$(call ptx/endis, PTXCONF_GNUPG_GPG_SHA)-gpg-sha384 \ --$(call ptx/endis, PTXCONF_GNUPG_GPG_SHA)-gpg-sha512 \ - --disable-zip \ - --disable-bzip2 \ + --$(call ptx/endis, PTXCONF_GNUPG_GPG_ZIP)-zip \ + --$(call ptx/endis, PTXCONF_GNUPG_GPG_BZIP2)-bzip2 \ --disable-exec \ --disable-photo-viewers \ --disable-card-support \ -- 2.17.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] gnupg: add install option for gpg-agent
Signed-off-by: Hubert Feurstein --- rules/gnupg.in | 4 rules/gnupg.make | 3 +++ 2 files changed, 7 insertions(+) diff --git a/rules/gnupg.in b/rules/gnupg.in index b921f1655..7118f25b1 100644 --- a/rules/gnupg.in +++ b/rules/gnupg.in @@ -29,6 +29,10 @@ config GNUPG_GPGV bool prompt "Install gpgv2" +config GNUPG_GPG_AGENT + bool + prompt "Install gpg-agent" + menu "public key algorithms" config GNUPG_GPG_RSA diff --git a/rules/gnupg.make b/rules/gnupg.make index 2afddb3bf..48585f9cd 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -114,6 +114,9 @@ ifdef PTXCONF_GNUPG_GPGV @$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpgv) @$(call install_link, gnupg, gpgv, /usr/bin/gpgv2) endif +ifdef PTXCONF_GNUPG_GPG_AGENT + @$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpg-agent) +endif @$(call install_finish, gnupg) -- 2.17.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ptxdist upgrade from v2014.12.0 to latest -> error
Hello, thank you for your quick response. That fixed the problem. regards Hubert Am Mo., 3. Dez. 2018 um 17:55 Uhr schrieb Michael Olbrich < m.olbr...@pengutronix.de>: > Hello, > > On Mon, Dec 03, 2018 at 05:23:17PM +0100, Hubert Feurstein wrote: > > I've upgraded my BSP from PTXdist v2014.12.2 to the latest master > version. > > Building the BSP produces now the following error at the very end: > > > > [...] > > --- > > target: host-genext2fs.install.post > > --- > > > > finished target host-genext2fs.install.post > > finished target world.targetinstall > > > > ptxdist: error: sysupdate is not a package or not selected > > > > > .../build-tools/ptxdist/rules/post/ptxd_make_image_fix_permissions.make:21: > > recipe for target '...bsp/platform-mx6/state/ptx_image_fix_permissions' > > failed > > make: *** [...bsp/platform-mx6/state/ptx_image_fix_permissions] Error 1 > > -- > > > > The package 'sysupdate' is a package and it is selected. If I deselect > this > > package and run 'ptxdist go' again, then I get the same error with an > other > > package reported. Running 'ptxdist images' afterwards still works as > > expected. Any help is very appreciated. > > Do you need initial device nodes in the nfsroot? This is usually not needed > any more. If not, just disable PTXCONF_FIX_PERMISSIONS. There is a bug here > that breaks the sanity check that produces the error message you get. > > Michael > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | > > ___ > ptxdist mailing list > ptxdist@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] ptxdist upgrade from v2014.12.0 to latest -> error
Hi, I've upgraded my BSP from PTXdist v2014.12.2 to the latest master version. Building the BSP produces now the following error at the very end: [...] --- target: host-genext2fs.install.post --- finished target host-genext2fs.install.post finished target world.targetinstall ptxdist: error: sysupdate is not a package or not selected .../build-tools/ptxdist/rules/post/ptxd_make_image_fix_permissions.make:21: recipe for target '...bsp/platform-mx6/state/ptx_image_fix_permissions' failed make: *** [...bsp/platform-mx6/state/ptx_image_fix_permissions] Error 1 -- The package 'sysupdate' is a package and it is selected. If I deselect this package and run 'ptxdist go' again, then I get the same error with an other package reported. Running 'ptxdist images' afterwards still works as expected. Any help is very appreciated. regards, Hubert ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 10/10] libgcrypt: version bump 1.5.3 - 1.6.3
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/libgcrypt.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make index b700487..fe3e474 100644 --- a/rules/libgcrypt.make +++ b/rules/libgcrypt.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt # # Paths and names # -LIBGCRYPT_VERSION := 1.5.3 -LIBGCRYPT_MD5 := 993159b2924ae7b0e4eaff0743c2db35 +LIBGCRYPT_VERSION := 1.6.3 +LIBGCRYPT_MD5 := 4262c3aadf837500756c2051a5c4ae5e LIBGCRYPT := libgcrypt-$(LIBGCRYPT_VERSION) LIBGCRYPT_SUFFIX := tar.bz2 LIBGCRYPT_URL := http://artfiles.org/gnupg.org/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) ftp://ftp.gnupg.org/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 02/10] util-linux-ng: add fstrim option
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/util-linux-ng.in | 12 rules/util-linux-ng.make | 3 +++ 2 files changed, 15 insertions(+) diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index a5f51a6..50dfbf6 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -200,6 +200,18 @@ config UTIL_LINUX_NG_FSCK comment BusyBox' fsck is selected! depends on BUSYBOX_FSCK +config UTIL_LINUX_NG_FSTRIM + bool + prompt fstrim + depends on !BUSYBOX_FSTRIM || ALLYES + help + fstrim is used on a mounted filesystem to discard (or trim) + blocks which are not in use by the filesystem. This is useful + for solid-state drives (SSDs) and thinly-provisioned storage. + +comment BusyBox' fstrim is selected! + depends on BUSYBOX_FSTRIM + config UTIL_LINUX_NG_IPCS bool prompt ipcs diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index fc28c66..acd3b78 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -205,6 +205,9 @@ endif ifdef PTXCONF_UTIL_LINUX_NG_FSCK @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/fsck) endif +ifdef PTXCONF_UTIL_LINUX_NG_FSTRIM + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/fstrim) +endif ifdef PTXCONF_UTIL_LINUX_NG_IPCS @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/ipcs) endif -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 03/10] util-linux-ng: add dmesg option
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/util-linux-ng.in | 10 ++ rules/util-linux-ng.make | 3 +++ 2 files changed, 13 insertions(+) diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index 50dfbf6..55dcd38 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -77,6 +77,16 @@ config UTIL_LINUX_NG_PARTX help The partx utility. +config UTIL_LINUX_NG_DMESG + bool + depends on !BUSYBOX_DMESG || ALLYES + prompt dmesg + help + The dmesg utility. + +comment BusyBox' dmesg is selected! + depends on BUSYBOX_DMESG + config UTIL_LINUX_NG_MOUNTPOINT bool select UTIL_LINUX_NG_LIBMOUNT diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index acd3b78..bcef93e 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -171,6 +171,9 @@ endif ifdef PTXCONF_UTIL_LINUX_NG_LINE @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/line) endif +ifdef PTXCONF_UTIL_LINUX_NG_DMESG + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /bin/dmesg) +endif ifdef PTXCONF_UTIL_LINUX_NG_MOUNTPOINT @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /bin/mountpoint) endif -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 04/10] ethtool: version bump 3.0 - 3.18
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/ethtool.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/ethtool.make b/rules/ethtool.make index 0d74716..a9b936f 100644 --- a/rules/ethtool.make +++ b/rules/ethtool.make @@ -17,9 +17,9 @@ PACKAGES-$(PTXCONF_ETHTOOL) += ethtool # # Paths and names # -ETHTOOL_VERSION:= 3.0 -ETHTOOL_MD5:= cb129398cbbf39859901b55ecac101da -ETHTOOL_SUFFIX := tar.bz2 +ETHTOOL_VERSION:= 3.18 +ETHTOOL_MD5:= fbf1a167b88a5966a2c56a2483af68c6 +ETHTOOL_SUFFIX := tar.xz ETHTOOL:= ethtool-$(ETHTOOL_VERSION) ETHTOOL_URL:= $(call ptx/mirror, KERNEL, ../software/network/ethtool/$(ETHTOOL).$(ETHTOOL_SUFFIX)) ETHTOOL_SOURCE := $(SRCDIR)/$(ETHTOOL).$(ETHTOOL_SUFFIX) -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 09/10] libassuan: add license information
--- rules/libassuan.make | 4 1 file changed, 4 insertions(+) diff --git a/rules/libassuan.make b/rules/libassuan.make index 10d7ae3..97846c5 100644 --- a/rules/libassuan.make +++ b/rules/libassuan.make @@ -23,6 +23,10 @@ LIBASSUAN_SUFFIX := tar.bz2 LIBASSUAN_URL := ftp://ftp.gnupg.org/gcrypt/libassuan/$(LIBASSUAN).$(LIBASSUAN_SUFFIX) LIBASSUAN_SOURCE := $(SRCDIR)/$(LIBASSUAN).$(LIBASSUAN_SUFFIX) LIBASSUAN_DIR := $(BUILDDIR)/$(LIBASSUAN) +LIBASSUAN_LICENSE := GPLv3, LGPLv2.1 +LIBASSUAN_LICENSE_FILES:= \ + file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 # # Prepare -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 06/10] libksba: version bump 1.0.7 - 1.3.2
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/libksba.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libksba.make b/rules/libksba.make index 3a3efae..fb22d44 100644 --- a/rules/libksba.make +++ b/rules/libksba.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBKSBA) += libksba # # Paths and names # -LIBKSBA_VERSION:= 1.0.7 -LIBKSBA_MD5:= eebce521a90600369c33c5fa6b9bbbd8 +LIBKSBA_VERSION:= 1.3.2 +LIBKSBA_MD5:= c3c9a66e22d87fe3ae59865250b8a09c LIBKSBA:= libksba-$(LIBKSBA_VERSION) LIBKSBA_SUFFIX := tar.bz2 LIBKSBA_URL:= ftp://ftp.gnupg.org/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX) -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 07/10] libksba: add license information
--- rules/libksba.make | 5 + 1 file changed, 5 insertions(+) diff --git a/rules/libksba.make b/rules/libksba.make index fb22d44..2464d4b 100644 --- a/rules/libksba.make +++ b/rules/libksba.make @@ -23,6 +23,11 @@ LIBKSBA_SUFFIX := tar.bz2 LIBKSBA_URL:= ftp://ftp.gnupg.org/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX) LIBKSBA_SOURCE := $(SRCDIR)/$(LIBKSBA).$(LIBKSBA_SUFFIX) LIBKSBA_DIR:= $(BUILDDIR)/$(LIBKSBA) +LIBKSBA_LICENSE:= GPLv2, GPLv3, LGPLv3 +LIBKSBA_LICENSE_FILES := \ + file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ + file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 # # Prepare -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 08/10] libassuan: version bump 2.0.0 - 2.2.0
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/libassuan.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libassuan.make b/rules/libassuan.make index 8ac09b1..10d7ae3 100644 --- a/rules/libassuan.make +++ b/rules/libassuan.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBASSUAN) += libassuan # # Paths and names # -LIBASSUAN_VERSION := 2.0.0 -LIBASSUAN_MD5 := 59bc0ae7194c412d7a522029005684b2 +LIBASSUAN_VERSION := 2.2.0 +LIBASSUAN_MD5 := a104faed3e97b9c302c5d67cc22b1d60 LIBASSUAN := libassuan-$(LIBASSUAN_VERSION) LIBASSUAN_SUFFIX := tar.bz2 LIBASSUAN_URL := ftp://ftp.gnupg.org/gcrypt/libassuan/$(LIBASSUAN).$(LIBASSUAN_SUFFIX) -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 05/10] ethtool: add license information
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/ethtool.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/ethtool.make b/rules/ethtool.make index a9b936f..47bf8b2 100644 --- a/rules/ethtool.make +++ b/rules/ethtool.make @@ -25,6 +25,8 @@ ETHTOOL_URL := $(call ptx/mirror, KERNEL, ../software/network/ethtool/$(ETHTOOL) ETHTOOL_SOURCE := $(SRCDIR)/$(ETHTOOL).$(ETHTOOL_SUFFIX) ETHTOOL_DIR:= $(BUILDDIR)/$(ETHTOOL) ETHTOOL_LICENSE := GPLv2 +ETHTOOL_LICENSE_FILES := \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 # # Prepare -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 01/10] chrony: version bump 1.29 - 1.31
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/chrony.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/chrony.make b/rules/chrony.make index 4b8bef5..140f468 100644 --- a/rules/chrony.make +++ b/rules/chrony.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_CHRONY) += chrony # # Paths and names # -CHRONY_VERSION := 1.29 -CHRONY_MD5 := 6e1a8ee2ce6632bedc2f8b5cdccfa69f +CHRONY_VERSION := 1.31 +CHRONY_MD5 := 04ab702fc81150db06809562a9aaed92 CHRONY := chrony-$(CHRONY_VERSION) CHRONY_SUFFIX := tar.gz CHRONY_URL := http://download.tuxfamily.org/chrony/$(CHRONY).$(CHRONY_SUFFIX) -- 2.3.0 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC 0/2] add a way to extract license text from packages
Hello, 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). Hubert 2015-01-30 8:48 GMT+01:00 Markus Niebel list-09_ptxd...@tqsc.de: 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 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] qt4: install bearer plugins only when network is selected
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/qt4.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/qt4.make b/rules/qt4.make index 95712a7..c1174f2 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -553,7 +553,7 @@ ifdef PTXCONF_QT4_BUILD_SVG /usr/plugins/iconengines/libqsvgicon.$(QT4_PLUGIN_EXT)) endif -ifndef PTXCONF_QT4_BUILD_NETWORK +ifdef PTXCONF_QT4_BUILD_NETWORK @$(call install_copy, qt4, 0, 0, 0644, -, \ /usr/plugins/bearer/libqgenericbearer.$(QT4_PLUGIN_EXT)) @$(call install_copy, qt4, 0, 0, 0644, -, \ -- 1.8.1.3 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] qt4: install libqnmbearer only when networkmanager is selected
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/qt4.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/qt4.make b/rules/qt4.make index c1174f2..b5ae03a 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -556,9 +556,11 @@ endif ifdef PTXCONF_QT4_BUILD_NETWORK @$(call install_copy, qt4, 0, 0, 0644, -, \ /usr/plugins/bearer/libqgenericbearer.$(QT4_PLUGIN_EXT)) +ifdef PTXCONF_NETWORKMANAGER @$(call install_copy, qt4, 0, 0, 0644, -, \ /usr/plugins/bearer/libqnmbearer.$(QT4_PLUGIN_EXT)) endif +endif ifdef PTXCONF_QT4_BUILD_PHONON @$(call install_copy, qt4, 0, 0, 0644, -, \ /usr/plugins/phonon_backend/libphonon_gstreamer.$(QT4_PLUGIN_EXT)) -- 1.8.1.3 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] v4l-utils: make libjpeg dependency optional
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/v4l-utils.in | 8 +++- rules/v4l-utils.make | 4 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in index 893b1e0..288ff75 100644 --- a/rules/v4l-utils.in +++ b/rules/v4l-utils.in @@ -6,7 +6,7 @@ menuconfig V4L_UTILS select LIBC_RT if V4L_UTILS_LIBV4LCONVERT select LIBC_M if V4L_UTILS_LIBV4LCONVERT select LIBC_PTHREAD if V4L_UTILS_LIBV4L2 - select LIBJPEG if V4L_UTILS_LIBV4LCONVERT + select LIBJPEG if V4L_UTILS_LIBV4LCONVERT_JPEG help Linux V4L2 and DVB API utilities and v4l libraries (libv4l). @@ -26,6 +26,12 @@ config V4L_UTILS_LIBV4LCONVERT bool prompt install libv4lconvert +config V4L_UTILS_LIBV4LCONVERT_JPEG + bool + default y + depends on V4L_UTILS_LIBV4LCONVERT + prompt use libjpeg + config V4L_UTILS_V4L2COMPLIANCE bool select V4L_UTILS_LIBV4L2 diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make index d047885..911a022 100644 --- a/rules/v4l-utils.make +++ b/rules/v4l-utils.make @@ -34,6 +34,10 @@ V4L_UTILS_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --disable-qv4l2 +ifndef PTXCONF_V4L_UTILS_LIBV4LCONVERT_JPEG +V4L_UTILS_CONF_OPT += --without-jpeg +endif + # # Target-Install # -- 1.8.1.3 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] add xpkg extra-version support
With this it is possible to specify an extra-version string in the package
make rule. e.g.: PKG_EXTRAVERSION := -1
The extra-version string is added to the package version only.
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com
---
rules/post/ptxd_make_world_common.make |1 +
scripts/lib/ptxd_make_xpkg_common.sh |7 +++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/rules/post/ptxd_make_world_common.make
b/rules/post/ptxd_make_world_common.make
index 25d5f02..ec7a87d 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=$(call ptx/escape,$($(1)))
\
pkg_version=$(call ptx/escape,$($(1)_VERSION))
\
+ pkg_extraversion=$(call ptx/escape,$($(1)_EXTRAVERSION))
\
pkg_path=$(call ptx/escape,$($(1)_PATH))
\
pkg_src=$(call ptx/escape,$($(1)_SOURCE))
\
pkg_md5=$(call ptx/escape,$($(1)_MD5))
\
diff --git a/scripts/lib/ptxd_make_xpkg_common.sh
b/scripts/lib/ptxd_make_xpkg_common.sh
index deccd12..04bc849 100644
--- a/scripts/lib/ptxd_make_xpkg_common.sh
+++ b/scripts/lib/ptxd_make_xpkg_common.sh
@@ -77,6 +77,13 @@ ptxd_make_xpkg_init() {
ptxd_bailout ${FUNCNAME}: please define PKG_VERSION
fi
+#
+# Add extra version to package version
+#
+if [ ! -z ${pkg_extraversion} ]; then
+ pkg_xpkg_version=${pkg_xpkg_version}${pkg_extraversion//\/}
+fi
+
ptxd_make_world_init || return
# license
--
1.7.4.1
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] ptxdist mirror
2011/9/19 Alexander Dahl p...@lespocky.de: Reminds on some things I heard in a talk [1] at the Chemnitzer Linux Tage this year: to ensure reproducible builds you should have a backup of every source archive you ever downloaded and build in your project. We do this by setting SETUP_SRCDIR to a shared file system on a network server for which regular backups are done. I fully agree, but for the very first build after migrating I have to fetch the new archives from somewhere :) Thank you all for the quick responses. Regards Hubert -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] [gst-plugins-good] fix broken 'oss' plugin
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- rules/gst-plugins-good.in |1 - rules/gst-plugins-good.make |3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gst-plugins-good.in b/rules/gst-plugins-good.in index f0da5e7..3bff692 100644 --- a/rules/gst-plugins-good.in +++ b/rules/gst-plugins-good.in @@ -220,7 +220,6 @@ if GST_PLUGINS_GOOD config GST_PLUGINS_GOOD_OSS bool - depends on GST_PLUGINS_GOOD_BROKEN prompt oss config GST_PLUGINS_GOOD_OSS4 diff --git a/rules/gst-plugins-good.make b/rules/gst-plugins-good.make index 6c34a81..01b64b8 100644 --- a/rules/gst-plugins-good.make +++ b/rules/gst-plugins-good.make @@ -82,7 +82,8 @@ GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_WAVPARSE) += wavparse GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_Y4M) += y4m GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_Y4M) += y4menc GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_DIRECTSOUND)+= directsound -GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSS)+= oss +GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_OSS) += oss +GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_OSS) += ossaudio GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSS4) += oss4 GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_SUNAUDIO) += sunaudio GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSX_AUDIO) += osx_audio -- 1.7.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] [gst-plugins-good] fix broken 'oss4' plugin
Signed-off-by: Hubert Feurstein h.feurst...@gmail.com --- This patch is built on top of [gst-plugins-good] fix broken 'oss' plugin rules/gst-plugins-good.in |1 - rules/gst-plugins-good.make |3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gst-plugins-good.in b/rules/gst-plugins-good.in index 3bff692..c5281f4 100644 --- a/rules/gst-plugins-good.in +++ b/rules/gst-plugins-good.in @@ -224,7 +224,6 @@ if GST_PLUGINS_GOOD config GST_PLUGINS_GOOD_OSS4 bool - depends on GST_PLUGINS_GOOD_BROKEN prompt oss4 config GST_PLUGINS_GOOD_SUNAUDIO diff --git a/rules/gst-plugins-good.make b/rules/gst-plugins-good.make index 01b64b8..fe37382 100644 --- a/rules/gst-plugins-good.make +++ b/rules/gst-plugins-good.make @@ -84,7 +84,8 @@ GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_Y4M) += y4menc GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_DIRECTSOUND)+= directsound GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_OSS) += oss GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_OSS) += ossaudio -GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSS4) += oss4 +GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_OSS4) += oss4 +GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_OSS4) += oss4audio GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_SUNAUDIO) += sunaudio GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSX_AUDIO) += osx_audio GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSX_VIDEO) += osx_video -- 1.7.1 -- ptxdist mailing list ptxdist@pengutronix.de
