[ptxdist] [PATCH] squash! libusbgx: fix license

2021-06-24 Thread Roland Hieber 
[rhi: add lines for the license statements too. The lib is LGPL, the
  examples are GPL, and are also installed on the target.]
Reviewed-by: Roland Hieber 
Signed-off-by: Roland Hieber 
---
 rules/libusbgx.make | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/libusbgx.make b/rules/libusbgx.make
index 517c7d87df20..da2980d953fd 100644
--- a/rules/libusbgx.make
+++ b/rules/libusbgx.make
@@ -25,7 +25,9 @@ LIBUSBGX_SOURCE   := \
 LIBUSBGX_DIR   := $(BUILDDIR)/$(LIBUSBGX)
 LIBUSBGX_LICENSE   := GPL-2.0-or-later AND LGPL-2.1-or-later
 LIBUSBGX_LICENSE_FILES := \
+   
file://examples/gadget-export.c;startline=6;endline=14;md5=89ff91d940b4bc09b6de0300b34a888f
 \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+   
file://src/usbg.c;startline=10;endline=18;md5=75c08ee73fa8cdd35281fdcbe8874ff5 \
file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c
 
 # 
-- 
2.29.2


___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

[ptxdist] [PATCH] libusbgx: bring submenu arrow in line with other options

2021-06-24 Thread Roland Hieber 
Fixes: 204be3e0f85f82e96630 (2021-05-06, "libusbgx: make example and tool 
selection fine grained")
Signed-off-by: Roland Hieber 
---
 rules/libusbgx.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/libusbgx.in b/rules/libusbgx.in
index dc751ec46fdf..13252a3a7234 100644
--- a/rules/libusbgx.in
+++ b/rules/libusbgx.in
@@ -2,7 +2,7 @@
 
 menuconfig LIBUSBGX
bool
-   prompt "libusbgx"
+   prompt "libusbgx  "
help
  libusbgx is a C library encapsulating the kernel USB gadget-configfs
  userspace API functionality.
-- 
2.29.2


___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

Re: [ptxdist] [PATCH] can-utils: version bump: v2020.02.04 -> v2021.06.0

2021-06-24 Thread Roland Hieber 
Hi Oleksij,

On Thu, Jun 24, 2021 at 10:51:34AM +0200, Oleksij Rempel wrote:
> Signed-off-by: Oleksij Rempel 
> ---
>  .../autogen.sh|  0
>  rules/berlios-can-utils.in| 20 +++
>  rules/berlios-can-utils.make  | 13 ++--
>  3 files changed, 19 insertions(+), 14 deletions(-)
>  rename patches/{canutils-v2020.02.04 => canutils-v2021.06.0}/autogen.sh 
> (100%)
> 
> diff --git a/patches/canutils-v2020.02.04/autogen.sh 
> b/patches/canutils-v2021.06.0/autogen.sh
> similarity index 100%
> rename from patches/canutils-v2020.02.04/autogen.sh
> rename to patches/canutils-v2021.06.0/autogen.sh
> diff --git a/rules/berlios-can-utils.in b/rules/berlios-can-utils.in
> index fa15c3636..b1ec974b7 100644
> --- a/rules/berlios-can-utils.in
> +++ b/rules/berlios-can-utils.in
> @@ -49,6 +49,10 @@ config BERLIOS_CAN_UTILS_CANSEND
>   bool
>   prompt "cansend"
>  
> +config BERLIOS_CAN_UTILS_CANSEQUENCE
> + bool
> + prompt "cansequence"
> +
>  config BERLIOS_CAN_UTILS_CANSNIFFER
>   bool
>   prompt "cansniffer"
> @@ -97,21 +101,21 @@ config BERLIOS_CAN_UTILS_SLCANPTY
>   bool
>   prompt "slcanpty"
>  
> -config BERLIOS_CAN_UTILS_JSPY
> +config BERLIOS_CAN_UTILS_J1939SPY
>   bool
> - prompt "jspy"
> + prompt "j1939spy"
>  
> -config BERLIOS_CAN_UTILS_JSR
> +config BERLIOS_CAN_UTILS_J1939SR
>   bool
> - prompt "jsr"
> + prompt "j1939sr"
>  
> -config BERLIOS_CAN_UTILS_JACD
> +config BERLIOS_CAN_UTILS_J1939ACD
>   bool
> - prompt "jacd"
> + prompt "j1939acd"
>  
> -config BERLIOS_CAN_UTILS_JCAT
> +config BERLIOS_CAN_UTILS_J1939CAT
>   bool
> - prompt "jcat"
> + prompt "j1939cat"

Please also add matching lines to scripts/migrate/migrate_ptx to rename
these options in existing ptxconfigs on "ptxdist migrate".

 - Roland

>  
>  config BERLIOS_CAN_UTILS_TESTJ1939
>   bool
> diff --git a/rules/berlios-can-utils.make b/rules/berlios-can-utils.make
> index 8cc51a40d..464166fea 100644
> --- a/rules/berlios-can-utils.make
> +++ b/rules/berlios-can-utils.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BERLIOS_CAN_UTILS) += berlios-can-utils
>  #
>  # Paths and names
>  #
> -BERLIOS_CAN_UTILS_VERSION:= v2020.02.04
> -BERLIOS_CAN_UTILS_MD5:= 5ca2e7b840bb5fbe8a30967e076dc16e
> +BERLIOS_CAN_UTILS_VERSION:= v2021.06.0
> +BERLIOS_CAN_UTILS_MD5:= 6f4eb3739fb9179588fa2824889213bb
>  BERLIOS_CAN_UTILS:= canutils-$(BERLIOS_CAN_UTILS_VERSION)
>  BERLIOS_CAN_UTILS_SUFFIX := tar.gz
>  BERLIOS_CAN_UTILS_URL:= 
> https://github.com/linux-can/can-utils/archive/$(BERLIOS_CAN_UTILS_VERSION).$(BERLIOS_CAN_UTILS_SUFFIX)
> @@ -45,6 +45,7 @@ BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANGW) 
> += /usr/bin/cangw
>  BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANLOGSERVER) += 
> /usr/bin/canlogserver
>  BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANPLAYER) += 
> /usr/bin/canplayer
>  BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANSEND) += 
> /usr/bin/cansend
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANSEQUENCE) += 
> /usr/bin/cansequence
>  BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANSNIFFER) += 
> /usr/bin/cansniffer
>  BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPDUMP) += 
> /usr/bin/isotpdump
>  BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPRECV) += 
> /usr/bin/isotprecv
> @@ -57,10 +58,10 @@ 
> BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_LOG2LONG) += 
> /usr/bin/log2lon
>  BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAN_ATTACH) += 
> /usr/bin/slcan_attach
>  BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAND) += /usr/bin/slcand
>  BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCANPTY) += 
> /usr/bin/slcanpty
> -BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSPY) += /usr/bin/jspy
> -BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSR) += /usr/bin/jsr
> -BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JACD) += /usr/bin/jacd
> -BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JCAT) += /usr/bin/jcat
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_J1939SPY) += 
> /usr/bin/j1939spy
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_J1939SR) += 
> /usr/bin/j1939sr
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_J1939ACD) += 
> /usr/bin/j1939acd
> +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_J1939CAT) += 
> /usr/bin/j1939cat
>  BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_TESTJ1939) += 
> /usr/bin/testj1939
>  
>  $(STATEDIR)/berlios-can-utils.targetinstall:
> -- 
> 2.30.2
> 
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to 
> ptxdist-requ...@pengutronix.de
> 

-- 
Roland Hieber, Pengutronix e.K.  | r.hie...@pengutronix.de |
Steuerwalder Str. 21

[ptxdist] [PATCH 1/2] template: code-signing-provider: ignore in license report

2021-06-24 Thread Michael Tretter 
If the template is used to create a code-signing-provider, an example
script will be put into local_src. This script can be ignored in the
license report.

Signed-off-by: Michael Tretter 
---
 rules/templates/template-code-signing-provider-make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/templates/template-code-signing-provider-make 
b/rules/templates/template-code-signing-provider-make
index 94830d92e9e7..4cf9cac358cf 100644
--- a/rules/templates/template-code-signing-provider-make
+++ b/rules/templates/template-code-signing-provider-make
@@ -18,6 +18,7 @@ HOST_@PACKAGE@_CODE_SIGNING_VERSION   := @VERSION@
 HOST_@PACKAGE@_CODE_SIGNING:= 
@package@-code-signing-$(HOST_@PACKAGE@_CODE_SIGNING_VERSION)
 HOST_@PACKAGE@_CODE_SIGNING_URL:= 
file://local_src/@package@-code-signing
 HOST_@PACKAGE@_CODE_SIGNING_DIR:= 
$(HOST_BUILDDIR)/$(HOST_@PACKAGE@_CODE_SIGNING)
+HOST_@PACKAGE@_CODE_SIGNING_LICENSE:= ignore
 
 HOST_@PACKAGE@_CODE_SIGNING_CONF_TOOL  := NO
 
-- 
2.29.2


___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

[ptxdist] [PATCH 2/2] host-ptx-code-signing-dev: ignore in license report

2021-06-24 Thread Michael Tretter 
The package consists of a script based on the code signing template in
PTXdist and a few keys. It should be ignored in the license report.

Signed-off-by: Michael Tretter 
---
 rules/host-ptx-code-signing-dev.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/host-ptx-code-signing-dev.make 
b/rules/host-ptx-code-signing-dev.make
index d97ae60ef140..af7a774bc9a4 100644
--- a/rules/host-ptx-code-signing-dev.make
+++ b/rules/host-ptx-code-signing-dev.make
@@ -21,6 +21,7 @@ HOST_PTX_CODE_SIGNING_DEV_SUFFIX  := tar.gz
 HOST_PTX_CODE_SIGNING_DEV_URL  := 
https://git.pengutronix.de/cgit/ptx-code-signing-dev/snapshot/$(HOST_PTX_CODE_SIGNING_DEV).$(HOST_PTX_CODE_SIGNING_DEV_SUFFIX)
 HOST_PTX_CODE_SIGNING_DEV_SOURCE   := 
$(SRCDIR)/$(HOST_PTX_CODE_SIGNING_DEV).$(HOST_PTX_CODE_SIGNING_DEV_SUFFIX)
 HOST_PTX_CODE_SIGNING_DEV_DIR  := 
$(HOST_BUILDDIR)/$(HOST_PTX_CODE_SIGNING_DEV)
+HOST_PTX_CODE_SIGNING_DEV_LICENSE  := ignore
 
 CODE_SIGNING_ENV-$(PTXCONF_HOST_PTX_CODE_SIGNING_DEV) += 
$(SOFTHSM_CODE_SIGNING_ENV)
 
-- 
2.29.2


___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

[ptxdist] [PATCH] can-utils: version bump: v2020.02.04 -> v2021.06.0

2021-06-24 Thread Oleksij Rempel 
Signed-off-by: Oleksij Rempel 
---
 .../autogen.sh|  0
 rules/berlios-can-utils.in| 20 +++
 rules/berlios-can-utils.make  | 13 ++--
 3 files changed, 19 insertions(+), 14 deletions(-)
 rename patches/{canutils-v2020.02.04 => canutils-v2021.06.0}/autogen.sh (100%)

diff --git a/patches/canutils-v2020.02.04/autogen.sh 
b/patches/canutils-v2021.06.0/autogen.sh
similarity index 100%
rename from patches/canutils-v2020.02.04/autogen.sh
rename to patches/canutils-v2021.06.0/autogen.sh
diff --git a/rules/berlios-can-utils.in b/rules/berlios-can-utils.in
index fa15c3636..b1ec974b7 100644
--- a/rules/berlios-can-utils.in
+++ b/rules/berlios-can-utils.in
@@ -49,6 +49,10 @@ config BERLIOS_CAN_UTILS_CANSEND
bool
prompt "cansend"
 
+config BERLIOS_CAN_UTILS_CANSEQUENCE
+   bool
+   prompt "cansequence"
+
 config BERLIOS_CAN_UTILS_CANSNIFFER
bool
prompt "cansniffer"
@@ -97,21 +101,21 @@ config BERLIOS_CAN_UTILS_SLCANPTY
bool
prompt "slcanpty"
 
-config BERLIOS_CAN_UTILS_JSPY
+config BERLIOS_CAN_UTILS_J1939SPY
bool
-   prompt "jspy"
+   prompt "j1939spy"
 
-config BERLIOS_CAN_UTILS_JSR
+config BERLIOS_CAN_UTILS_J1939SR
bool
-   prompt "jsr"
+   prompt "j1939sr"
 
-config BERLIOS_CAN_UTILS_JACD
+config BERLIOS_CAN_UTILS_J1939ACD
bool
-   prompt "jacd"
+   prompt "j1939acd"
 
-config BERLIOS_CAN_UTILS_JCAT
+config BERLIOS_CAN_UTILS_J1939CAT
bool
-   prompt "jcat"
+   prompt "j1939cat"
 
 config BERLIOS_CAN_UTILS_TESTJ1939
bool
diff --git a/rules/berlios-can-utils.make b/rules/berlios-can-utils.make
index 8cc51a40d..464166fea 100644
--- a/rules/berlios-can-utils.make
+++ b/rules/berlios-can-utils.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BERLIOS_CAN_UTILS) += berlios-can-utils
 #
 # Paths and names
 #
-BERLIOS_CAN_UTILS_VERSION  := v2020.02.04
-BERLIOS_CAN_UTILS_MD5  := 5ca2e7b840bb5fbe8a30967e076dc16e
+BERLIOS_CAN_UTILS_VERSION  := v2021.06.0
+BERLIOS_CAN_UTILS_MD5  := 6f4eb3739fb9179588fa2824889213bb
 BERLIOS_CAN_UTILS  := canutils-$(BERLIOS_CAN_UTILS_VERSION)
 BERLIOS_CAN_UTILS_SUFFIX   := tar.gz
 BERLIOS_CAN_UTILS_URL  := 
https://github.com/linux-can/can-utils/archive/$(BERLIOS_CAN_UTILS_VERSION).$(BERLIOS_CAN_UTILS_SUFFIX)
@@ -45,6 +45,7 @@ BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANGW) += 
/usr/bin/cangw
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANLOGSERVER) += 
/usr/bin/canlogserver
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANPLAYER) += 
/usr/bin/canplayer
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANSEND) += /usr/bin/cansend
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANSEQUENCE) += 
/usr/bin/cansequence
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_CANSNIFFER) += 
/usr/bin/cansniffer
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPDUMP) += 
/usr/bin/isotpdump
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_ISOTPRECV) += 
/usr/bin/isotprecv
@@ -57,10 +58,10 @@ 
BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_LOG2LONG) += /usr/bin/log2lon
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAN_ATTACH) += 
/usr/bin/slcan_attach
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAND) += /usr/bin/slcand
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCANPTY) += 
/usr/bin/slcanpty
-BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSPY) += /usr/bin/jspy
-BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSR) += /usr/bin/jsr
-BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JACD) += /usr/bin/jacd
-BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JCAT) += /usr/bin/jcat
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_J1939SPY) += 
/usr/bin/j1939spy
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_J1939SR) += /usr/bin/j1939sr
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_J1939ACD) += 
/usr/bin/j1939acd
+BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_J1939CAT) += 
/usr/bin/j1939cat
 BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_TESTJ1939) += 
/usr/bin/testj1939
 
 $(STATEDIR)/berlios-can-utils.targetinstall:
-- 
2.30.2


___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de