[ptxdist] [PATCH 1/7] ptxdist: Add list-packages command

[ptxdist] [PATCH 1/7] ptxdist: Add list-packages command

[Sascha Hauer]

This adds a command to list all packages currently selected. ptxdist
gurus can use 'ptxdist print PACKAGES' for the same purpose, this command
is for the people who can't remember the command. As a bonus list-packages
prints one package per line and sorts them alphabetically.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 bin/ptxdist | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bin/ptxdist b/bin/ptxdist
index 663c41e..b2c2e7a 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -898,6 +898,7 @@ Misc:
   nfsroot			run a userspace NFS server and export the nfsroot
   print <var>			print the contents of a variable, in the way
 				it is known by "make"
+  list-packages			print a list of all selected packages
   bash				enter a ptxdist environment bash shell
   bash <cmd> [args...]		execute <cmd> in ptxdist environment
   export_src <target dir>	export all source archives needed for this
@@ -1804,6 +1805,13 @@ EOF
 			ptxd_make_log "${images[@]}"
 			exit
 			;;
+		list-packages)
+			check_config || return
+			check_deps
+			( for i in $(ptxd_make_log "print-PACKAGES");
+				do echo $i
+			done ) | sort
+			;;
 		make)
 			check_premake_compiler &&
 			ptxd_make_log "${@}"
-- 
1.8.5.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/7] ptxdist: Add local-src command

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 bin/ptxdist                       |  8 ++++++++
 scripts/lib/ptxd_lib_local_src.sh | 41 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 scripts/lib/ptxd_lib_local_src.sh

diff --git a/bin/ptxdist b/bin/ptxdist
index b2c2e7a..0a86ad9 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -899,6 +899,8 @@ Misc:
   print <var>			print the contents of a variable, in the way
 				it is known by "make"
   list-packages			print a list of all selected packages
+  local-src <pkg> <directory>	overwrite a package source with a locally provided
+				directory containing the sourcecode.
   bash				enter a ptxdist environment bash shell
   bash <cmd> [args...]		execute <cmd> in ptxdist environment
   export_src <target dir>	export all source archives needed for this
@@ -1812,6 +1814,12 @@ EOF
 				do echo $i
 			done ) | sort
 			;;
+		local-src)
+			check_config || return
+			check_deps
+			ptxd_lib_local_src "${@}"
+			exit
+			;;
 		make)
 			check_premake_compiler &&
 			ptxd_make_log "${@}"
diff --git a/scripts/lib/ptxd_lib_local_src.sh b/scripts/lib/ptxd_lib_local_src.sh
new file mode 100644
index 0000000..11decda
--- /dev/null
+++ b/scripts/lib/ptxd_lib_local_src.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# Copyright (C) 2014 Sascha Hauer <s.hauer@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.
+#
+ptxd_lib_local_src() {
+	if [ $# != 2 ]; then
+		echo "Usage: local_src <package> <directory>"
+		exit 1
+	fi
+
+	pkgname="${1}"
+	target="${2}"
+
+	mkdir -p ${PTXDIST_WORKSPACE}/local_src
+
+	link="${PTXDIST_WORKSPACE}/local_src/${pkgname}${PTXDIST_PLATFORMSUFFIX}";
+
+	if [ -e ${link} ]; then
+		if [ -n "${PTX_FORCE}" ]; then
+			rm "${link}" || exit 1
+		else
+			echo "${link} already exists. Use -f to overwrite"
+			exit 1
+		fi
+	fi
+
+	if [ ! -d "${target}" ]; then
+		echo "${target} does not exist or is not a directory"
+		exit 1
+	fi
+
+	echo "Creating local_src link for $pkgname. Package $pkgname will be built from ${target}"
+
+	ln -s "${target}" "${link}"
+}
+export -f ptxd_lib_local_src
-- 
1.8.5.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/7] ptxdist: Add local-src command

[Alexander Dahl]

Hei hei, 

Am 2014-02-26 15:13, schrieb Sascha Hauer:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---

[snip]

> +  local-src <pkg> <directory>	overwrite a package source with a
> locally provided
> +				directory containing the sourcecode.

What exactly is the use case for this? Which source gets overwritten
with what other source and why?

Greets
Alex

-- 
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601  D1D5 8FBA 7744 CC87 10D0 ***

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/7] ptxdist: Add local-src command

[Sascha Hauer]

On Fri, Feb 28, 2014 at 02:48:20PM +0100, Alexander Dahl wrote:
> Hei hei, 
> 
> Am 2014-02-26 15:13, schrieb Sascha Hauer:
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> 
> [snip]
> 
> > +  local-src <pkg> <directory>	overwrite a package source with a
> > locally provided
> > +				directory containing the sourcecode.
> 
> What exactly is the use case for this? Which source gets overwritten
> with what other source and why?

You may be aware that you can put a link from local_src/${PACKAGE_NAME}_${PLATFORM}
to a local directory. In this case ptxdist will use this directory as
source directory for a package instead of the tarball. This is useful
if you are working on the sourcecode for a package while compiling with
ptxdist. The command is just a shortcut to create the link because I
always forget the exact name of the link.

Sascha

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

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/7] ptxdist: Add local-src command

[Uwe Kleine-König]

On Fri, Feb 28, 2014 at 03:01:50PM +0100, Sascha Hauer wrote:
> On Fri, Feb 28, 2014 at 02:48:20PM +0100, Alexander Dahl wrote:
> > Hei hei, 
> > 
> > Am 2014-02-26 15:13, schrieb Sascha Hauer:
> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > ---
> > 
> > [snip]
> > 
> > > +  local-src <pkg> <directory>	overwrite a package source with a
> > > locally provided
> > > +				directory containing the sourcecode.
> > 
> > What exactly is the use case for this? Which source gets overwritten
> > with what other source and why?
> 
> You may be aware that you can put a link from local_src/${PACKAGE_NAME}_${PLATFORM}
> to a local directory. In this case ptxdist will use this directory as
> source directory for a package instead of the tarball. This is useful
> if you are working on the sourcecode for a package while compiling with
> ptxdist. The command is just a shortcut to create the link because I
> always forget the exact name of the link.
Obviously yes, it's local_src/${PACKAGE_NAME}.${PLATFORM} :-)

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/7] ptxdist: Add local-src command

[Juergen Beisert]

On Friday 28 February 2014 15:01:50 Sascha Hauer wrote:
> [...]
> You may be aware that you can put a link from
> local_src/${PACKAGE_NAME}_${PLATFORM} to a local directory.

The dot is the correct delimiter:

local_src/${PACKAGE_NAME}.${PLATFORM}

jbe

-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/7] ptxdist: Add local-src command

[Alexander Dahl]

Hei hei, 

Am 2014-02-28 15:01, schrieb Sascha Hauer:
> You may be aware that you can put a link from
> local_src/${PACKAGE_NAME}_${PLATFORM}
> to a local directory. In this case ptxdist will use this directory as
> source directory for a package instead of the tarball. This is useful
> if you are working on the sourcecode for a package while compiling with
> ptxdist. The command is just a shortcut to create the link because I
> always forget the exact name of the link.

I was not aware of this, and I will try it. If I understood correctly it
should work without this new helping command. Together with the
possibility to create tarballs directly from git this could improve my
workflow a lot. Thanks. :-)

Greets
Alex

-- 
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601  D1D5 8FBA 7744 CC87 10D0 ***

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/7] barebox: Add optional dependency to host-libusb

[Sascha Hauer]

In some configurations barebox needs a host-libusb (imx-usb-loader enabled).
Detecting this is not possible in ptxdist, so add a Kconfig option to manually
select host-libusb when needed.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 platforms/barebox.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/platforms/barebox.in b/platforms/barebox.in
index 224bb41..6e65f83 100644
--- a/platforms/barebox.in
+++ b/platforms/barebox.in
@@ -9,6 +9,7 @@ config BAREBOX_ARCH_STRING
 
 menuconfig BAREBOX
 	select BOOTLOADER
+	select HOST_LIBUSB if BAREBOX_NEEDS_HOST_LIBUSB
 	prompt "barebox                       "
 	bool
 	help
@@ -51,4 +52,8 @@ config BAREBOX_BAREBOXENV
 	  environment. Enable this option access the barebox environment
 	  from the target Linux system.
 
+config BAREBOX_NEEDS_HOST_LIBUSB
+	prompt "barebox needs libusb"
+	bool
+
 endif
-- 
1.8.5.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 4/7] barebox: Only install defaultenv file if it exists

[Sascha Hauer]

Not all builds have a barebox_default_env. Only install it if it exists.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 rules/barebox.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/barebox.make b/rules/barebox.make
index 2dcc0ca..d0f03ba 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -150,7 +150,7 @@ endif
 	fi
 	@if [ -e $(BAREBOX_DIR)/common/barebox_default_env ]; then \
 		install -D -m644 $(BAREBOX_DIR)/common/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \
-	else \
+	elif [ -e $(BAREBOX_DIR)/barebox_default_env ]; then \
 		install -D -m644 $(BAREBOX_DIR)/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \
 	fi
 	@$(call touch)
-- 
1.8.5.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 5/7] add ptxsudo alias to ptxdist bash

[Sascha Hauer]

When using 'ptxdist bash' some tools installed by ptxdist may have to be
used as root. some sudo installations do not pass through the PATH environment
variable so that 'sudo <somecommand-in-sysroot-host>' results in command not
found error messages. This patch adds a ptxsudo alias that can be used in such
situations. The name has been chosen rather than regular 'sudo' since the
said feature is a security feature protecting against path spoofing which
we do not want to disable silently.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 bin/ptxdist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/ptxdist b/bin/ptxdist
index 0a86ad9..13bf9f7 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1712,6 +1712,7 @@ parse_second()
 . ~/.bashrc
 PS1="[ptx] \${PS1}"
 PATH="${PATH}"
+alias ptxsudo='sudo env PATH=$PATH'
 EOF
 				"${BASH}" --init-file "${bashrc}"
 			else
-- 
1.8.5.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 6/7] Add dfu-util rules for host

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 rules/host-dfu-util.in   | 13 +++++++++++++
 rules/host-dfu-util.make | 25 +++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 rules/host-dfu-util.in
 create mode 100644 rules/host-dfu-util.make

diff --git a/rules/host-dfu-util.in b/rules/host-dfu-util.in
new file mode 100644
index 0000000..7dfd42f
--- /dev/null
+++ b/rules/host-dfu-util.in
@@ -0,0 +1,13 @@
+## SECTION=hosttools
+
+config HOST_DFU_UTIL
+	tristate
+	prompt "dfu-util"
+	help
+	  dfu-util is the host side implementation of the DFU 1.0 and DFU 1.1
+	  specifications of the USB forum. DFU is intended to download and
+	  upload firmware to devices connected over USB. It ranges from small
+	  devices like micro-controller boards up to mobile phones. Using
+	  dfu-util you can download firmware to your DFU-enabled device or
+	  upload firmware from it. dfu-util has been tested with the Openmoko
+	  Neo1973 and Freerunner and many other devices. 
diff --git a/rules/host-dfu-util.make b/rules/host-dfu-util.make
new file mode 100644
index 0000000..2a8f648
--- /dev/null
+++ b/rules/host-dfu-util.make
@@ -0,0 +1,25 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Sascha Hauer <s.hauer@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_DFU_UTIL) += host-dfu-util
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+HOST_DFU_UTIL_CONF_TOOL	:= autoconf
+
+# vim: syntax=make
-- 
1.8.5.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 7/7] dfu-util: version bump to 0.7

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 rules/dfu-util.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/dfu-util.make b/rules/dfu-util.make
index 0fa0171..1470e42 100644
--- a/rules/dfu-util.make
+++ b/rules/dfu-util.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DFU_UTIL) += dfu-util
 #
 # Paths and names
 #
-DFU_UTIL_VERSION	:= 0.5
-DFU_UTIL_MD5		:= 36426e5eaedec4866576e6b3bd3eeafc
+DFU_UTIL_VERSION	:= 0.7
+DFU_UTIL_MD5		:= 56844020177d4db4c1ea2e926fe9d588
 DFU_UTIL		:= dfu-util-$(DFU_UTIL_VERSION)
 DFU_UTIL_SUFFIX		:= tar.gz
 DFU_UTIL_URL		:= http://dfu-util.gnumonks.org/releases/$(DFU_UTIL).$(DFU_UTIL_SUFFIX)
-- 
1.8.5.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/7] ptxdist: Add list-packages command

[Alexander Dahl]

[-- Attachment #1.1: Type: text/plain, Size: 1473 bytes --]

Hei hei,

would be nice to add another column with the license of the package. O:-)

Greets
Alex

Am 26.02.2014 15:13, schrieb Sascha Hauer:
> This adds a command to list all packages currently selected. ptxdist
> gurus can use 'ptxdist print PACKAGES' for the same purpose, this command
> is for the people who can't remember the command. As a bonus list-packages
> prints one package per line and sorts them alphabetically.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  bin/ptxdist | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/bin/ptxdist b/bin/ptxdist
> index 663c41e..b2c2e7a 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -898,6 +898,7 @@ Misc:
>    nfsroot			run a userspace NFS server and export the nfsroot
>    print <var>			print the contents of a variable, in the way
>  				it is known by "make"
> +  list-packages			print a list of all selected packages
>    bash				enter a ptxdist environment bash shell
>    bash <cmd> [args...]		execute <cmd> in ptxdist environment
>    export_src <target dir>	export all source archives needed for this
> @@ -1804,6 +1805,13 @@ EOF
>  			ptxd_make_log "${images[@]}"
>  			exit
>  			;;
> +		list-packages)
> +			check_config || return
> +			check_deps
> +			( for i in $(ptxd_make_log "print-PACKAGES");
> +				do echo $i
> +			done ) | sort
> +			;;
>  		make)
>  			check_premake_compiler &&
>  			ptxd_make_log "${@}"
> 



[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]

[-- Attachment #2: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/7] ptxdist: Add list-packages command

[Sascha Hauer]

On Wed, Feb 26, 2014 at 05:30:24PM +0100, Alexander Dahl wrote:
> Hei hei,
> 
> would be nice to add another column with the license of the package. O:-)

And then again, another column with the size of the package, the version
and whatever else. I think for now this is out of scope, but indeed
there's a lot more information that could be printed.

Sascha


> 
> Greets
> Alex
> 
> Am 26.02.2014 15:13, schrieb Sascha Hauer:
> > This adds a command to list all packages currently selected. ptxdist
> > gurus can use 'ptxdist print PACKAGES' for the same purpose, this command
> > is for the people who can't remember the command. As a bonus list-packages
> > prints one package per line and sorts them alphabetically.
> > 
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> >  bin/ptxdist | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> > 
> > diff --git a/bin/ptxdist b/bin/ptxdist
> > index 663c41e..b2c2e7a 100755
> > --- a/bin/ptxdist
> > +++ b/bin/ptxdist
> > @@ -898,6 +898,7 @@ Misc:
> >    nfsroot			run a userspace NFS server and export the nfsroot
> >    print <var>			print the contents of a variable, in the way
> >  				it is known by "make"
> > +  list-packages			print a list of all selected packages
> >    bash				enter a ptxdist environment bash shell
> >    bash <cmd> [args...]		execute <cmd> in ptxdist environment
> >    export_src <target dir>	export all source archives needed for this
> > @@ -1804,6 +1805,13 @@ EOF
> >  			ptxd_make_log "${images[@]}"
> >  			exit
> >  			;;
> > +		list-packages)
> > +			check_config || return
> > +			check_deps
> > +			( for i in $(ptxd_make_log "print-PACKAGES");
> > +				do echo $i
> > +			done ) | sort
> > +			;;
> >  		make)
> >  			check_premake_compiler &&
> >  			ptxd_make_log "${@}"
> > 
> 
> 



> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de


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

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/7] ptxdist: Add list-packages command

[Michael Olbrich]

I've applied all of them. Some with small cleanups.

Michael

On Wed, Feb 26, 2014 at 03:13:15PM +0100, Sascha Hauer wrote:
> This adds a command to list all packages currently selected. ptxdist
> gurus can use 'ptxdist print PACKAGES' for the same purpose, this command
> is for the people who can't remember the command. As a bonus list-packages
> prints one package per line and sorts them alphabetically.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  bin/ptxdist | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/bin/ptxdist b/bin/ptxdist
> index 663c41e..b2c2e7a 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -898,6 +898,7 @@ Misc:
>    nfsroot			run a userspace NFS server and export the nfsroot
>    print <var>			print the contents of a variable, in the way
>  				it is known by "make"
> +  list-packages			print a list of all selected packages
>    bash				enter a ptxdist environment bash shell
>    bash <cmd> [args...]		execute <cmd> in ptxdist environment
>    export_src <target dir>	export all source archives needed for this
> @@ -1804,6 +1805,13 @@ EOF
>  			ptxd_make_log "${images[@]}"
>  			exit
>  			;;
> +		list-packages)
> +			check_config || return
> +			check_deps
> +			( for i in $(ptxd_make_log "print-PACKAGES");
> +				do echo $i
> +			done ) | sort
> +			;;
>  		make)
>  			check_premake_compiler &&
>  			ptxd_make_log "${@}"
> -- 
> 1.8.5.3
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

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

-- 
ptxdist mailing list
ptxdist@pengutronix.de