[ptxdist] [PATCH 1/3] libusb: rename libusbx to libusb

[ptxdist] [PATCH 1/3] libusb: rename libusbx to libusb

[Alexander Aring]

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
Maybe next year we have a libusbx again. :-)

 .../0001-libusb-needs-librt-and-libpthread.patch}           | 13 ++++++-------
 patches/libusb-1.0.18/series                                |  1 +
 patches/libusbx-1.0.18/series                               |  1 -
 rules/libusb.make                                           |  6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)
 rename patches/{libusbx-1.0.18/0001-libusbx-libusb-needs-librt-and-libpthread.patch => libusb-1.0.18/0001-libusb-needs-librt-and-libpthread.patch} (73%)
 create mode 100644 patches/libusb-1.0.18/series
 delete mode 100644 patches/libusbx-1.0.18/series

diff --git a/patches/libusbx-1.0.18/0001-libusbx-libusb-needs-librt-and-libpthread.patch b/patches/libusb-1.0.18/0001-libusb-needs-librt-and-libpthread.patch
similarity index 73%
rename from patches/libusbx-1.0.18/0001-libusbx-libusb-needs-librt-and-libpthread.patch
rename to patches/libusb-1.0.18/0001-libusb-needs-librt-and-libpthread.patch
index 2ee3f72..2d0ebb5 100644
--- a/patches/libusbx-1.0.18/0001-libusbx-libusb-needs-librt-and-libpthread.patch
+++ b/patches/libusb-1.0.18/0001-libusb-needs-librt-and-libpthread.patch
@@ -1,10 +1,9 @@
-From e5c3ffc155a33a9d8f97dc1524be9a776d4ed656 Mon Sep 17 00:00:00 2001
+From 57ec2296445225a11706b1a1eaae56b37a06c9eb Mon Sep 17 00:00:00 2001
 From: Alexander Aring <alex.aring@gmail.com>
 Date: Fri, 28 Mar 2014 12:04:23 +0100
-Subject: [PATCH] libusbx: libusb needs librt and libpthread
+Subject: [PATCH] libusb: needs librt and libpthread
 
-This patch is taken from the old libusb package and changes to apply the
-libusbx package. Original commit msg from patch is:
+Original commit msg from older libusb package:
 
 Add missing dependencies.
 
@@ -19,11 +18,11 @@ Signed-off-by: Alexander Aring <alex.aring@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libusb-1.0.pc.in b/libusb-1.0.pc.in
-index 7bc33c1..0c6fea7 100644
+index aa023b3..eded053 100644
 --- a/libusb-1.0.pc.in
 +++ b/libusb-1.0.pc.in
 @@ -6,6 +6,6 @@ includedir=@includedir@
- Name: libusbx-1.0
+ Name: libusb-1.0
  Description: C API for USB device access from Linux, Mac OS X, Windows and OpenBSD/NetBSD userspace
  Version: @VERSION@
 -Libs: -L${libdir} -lusb-1.0
@@ -31,5 +30,5 @@ index 7bc33c1..0c6fea7 100644
  Libs.private: @LIBS@
  Cflags: -I${includedir}/libusb-1.0
 -- 
-1.9.1
+1.9.2
 
diff --git a/patches/libusb-1.0.18/series b/patches/libusb-1.0.18/series
new file mode 100644
index 0000000..ea8d389
--- /dev/null
+++ b/patches/libusb-1.0.18/series
@@ -0,0 +1 @@
+0001-libusb-needs-librt-and-libpthread.patch
diff --git a/patches/libusbx-1.0.18/series b/patches/libusbx-1.0.18/series
deleted file mode 100644
index 4284244..0000000
--- a/patches/libusbx-1.0.18/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-libusbx-libusb-needs-librt-and-libpthread.patch
diff --git a/rules/libusb.make b/rules/libusb.make
index addc4d8..0699cc1 100644
--- a/rules/libusb.make
+++ b/rules/libusb.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_LIBUSB) += libusb
 # Paths and names
 #
 LIBUSB_VERSION	:= 1.0.18
-LIBUSB_MD5	:= f2ccd0589dde901dfd5607459f77bf44
-LIBUSB		:= libusbx-$(LIBUSB_VERSION)
+LIBUSB_MD5	:= 4a6d049923efc6496f1d383054dac1a6
+LIBUSB		:= libusb-$(LIBUSB_VERSION)
 LIBUSB_SUFFIX	:= tar.bz2
-LIBUSB_URL	:= $(call ptx/mirror, SF, libusbx/$(LIBUSB).$(LIBUSB_SUFFIX))
+LIBUSB_URL	:= $(call ptx/mirror, SF, libusb/$(LIBUSB).$(LIBUSB_SUFFIX))
 LIBUSB_SOURCE	:= $(SRCDIR)/$(LIBUSB).$(LIBUSB_SUFFIX)
 LIBUSB_DIR	:= $(BUILDDIR)/$(LIBUSB)
 LIBUSB_LICENSE	:= LGPLv2.1
-- 
1.9.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/3] configure.ac: add check for python 2.x version

[Alexander Aring]

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
We can also check for a python 1.x

I am not a python guru but being to be one. I never saw a python 1.x the last
eight years. I don't know if the current python ipkg scripts can deal with
python 1.x

There exists also a m4 script to check the MAJOR version of python but I see no
m4 directory in ptxdist. I used SED for this which is already checked. And YES
I don't know why but python sends the version string on stderr that's why I add
a redirection from stdout to stderr "2>&1" there.

 configure.ac | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/configure.ac b/configure.ac
index 2a97944..73027c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -304,6 +304,19 @@ AC_ARG_WITH(python, AS_HELP_STRING([--with-python],[name of the python executabl
 	AC_PATH_PROGS(PYTHON, python2.7 python2.6 python)
 	AC_SUBST(PYTHON)
     ])
+
+dnl
+dnl Check for python 2.x
+dnl
+AC_MSG_CHECKING([python version])
+PYTHON_VERSION=`$PYTHON --version 2>&1 | $SED -ne "1 s/Python \([[0-9]]\)/\1/p"`
+case "$PYTHON_VERSION" in
+3.*) AC_MSG_ERROR([we need at least python 2.x but found $PYTHON_VERSION]) ;;
+2.*) ;;
+*)   AC_MSG_ERROR([we need at least python 2.x]) ;;
+esac
+AC_MSG_RESULT([$PYTHON_VERSION])
+
 dnl
 dnl We need the Python distutils
 dnl
-- 
1.9.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/3] configure.ac: check for python2 binary as well

[Alexander Aring]

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
My distribution shipped out a python2 symlink to current python 2.x version.
I think we can check for this also.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 73027c8..8c00771 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,7 +301,7 @@ AC_ARG_WITH(python, AS_HELP_STRING([--with-python],[name of the python executabl
 	AC_SUBST(PYTHON)
 	AC_MSG_NOTICE([Using python executable $PYTHON])
     ],[
-	AC_PATH_PROGS(PYTHON, python2.7 python2.6 python)
+	AC_PATH_PROGS(PYTHON, python2 python2.7 python2.6 python)
 	AC_SUBST(PYTHON)
     ])
 
-- 
1.9.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/3] configure.ac: add check for python 2.x version

[Uwe Kleine-König]

On Tue, Apr 15, 2014 at 10:02:33AM +0200, Alexander Aring wrote:
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ---
> We can also check for a python 1.x
> 
> I am not a python guru but being to be one. I never saw a python 1.x the last
> eight years. I don't know if the current python ipkg scripts can deal with
> python 1.x
> 
> There exists also a m4 script to check the MAJOR version of python but I see no
> m4 directory in ptxdist. I used SED for this which is already checked. And YES
> I don't know why but python sends the version string on stderr that's why I add
> a redirection from stdout to stderr "2>&1" there.
> 
>  configure.ac | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/configure.ac b/configure.ac
> index 2a97944..73027c8 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -304,6 +304,19 @@ AC_ARG_WITH(python, AS_HELP_STRING([--with-python],[name of the python executabl
>  	AC_PATH_PROGS(PYTHON, python2.7 python2.6 python)
>  	AC_SUBST(PYTHON)
>      ])
> +
> +dnl
> +dnl Check for python 2.x
> +dnl
> +AC_MSG_CHECKING([python version])
> +PYTHON_VERSION=`$PYTHON --version 2>&1 | $SED -ne "1 s/Python \([[0-9]]\)/\1/p"`
> +case "$PYTHON_VERSION" in
> +3.*) AC_MSG_ERROR([we need at least python 2.x but found $PYTHON_VERSION]) ;;
I'd say "Python 3.3.4" (that's what my python3 reports) qualifies as "at
least python 2.x". So this message looks wrong.

Alternatively (i.e. I'm not sure if that approach is better):

	$ python -c 'import sys; print(sys.version_info[0])'
	2
	$ python3 -c 'import sys; print(sys.version_info[0])'
	3

Also s/python/Python/gc ?

Best regards
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/3] configure.ac: add check for python 2.x version

[Alexander Aring]

On Tue, Apr 15, 2014 at 10:23:14AM +0200, Uwe Kleine-König wrote:
> On Tue, Apr 15, 2014 at 10:02:33AM +0200, Alexander Aring wrote:
> > Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> > ---
> > We can also check for a python 1.x
> > 
> > I am not a python guru but being to be one. I never saw a python 1.x the last
> > eight years. I don't know if the current python ipkg scripts can deal with
> > python 1.x
> > 
> > There exists also a m4 script to check the MAJOR version of python but I see no
> > m4 directory in ptxdist. I used SED for this which is already checked. And YES
> > I don't know why but python sends the version string on stderr that's why I add
> > a redirection from stdout to stderr "2>&1" there.
> > 
> >  configure.ac | 13 +++++++++++++
> >  1 file changed, 13 insertions(+)
> > 
> > diff --git a/configure.ac b/configure.ac
> > index 2a97944..73027c8 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -304,6 +304,19 @@ AC_ARG_WITH(python, AS_HELP_STRING([--with-python],[name of the python executabl
> >  	AC_PATH_PROGS(PYTHON, python2.7 python2.6 python)
> >  	AC_SUBST(PYTHON)
> >      ])
> > +
> > +dnl
> > +dnl Check for python 2.x
> > +dnl
> > +AC_MSG_CHECKING([python version])
> > +PYTHON_VERSION=`$PYTHON --version 2>&1 | $SED -ne "1 s/Python \([[0-9]]\)/\1/p"`
> > +case "$PYTHON_VERSION" in
> > +3.*) AC_MSG_ERROR([we need at least python 2.x but found $PYTHON_VERSION]) ;;
> I'd say "Python 3.3.4" (that's what my python3 reports) qualifies as "at
> least python 2.x". So this message looks wrong.
> 
ok, yes. Copy&pasted from sed version check...

> Alternatively (i.e. I'm not sure if that approach is better):
> 
> 	$ python -c 'import sys; print(sys.version_info[0])'
> 	2
> 	$ python3 -c 'import sys; print(sys.version_info[0])'
> 	3
>

Oh, I tried this with:

python3 -c "import sys;print version_info.major"

which doesn't work on python3 now I know the syntax difference. Thanks!
Then check python version with python would be better.

> Also s/python/Python/gc ?
> 
ok.

Thanks.

- Alex

-- 
ptxdist mailing list
ptxdist@pengutronix.de