[ptxdist] [PATCH] modemmanager: version bump 1.6.6 -> 1.6.8
Signed-off-by: Ladislav Michl--- rules/modemmanager.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/modemmanager.make b/rules/modemmanager.make index ea6af7669..9afea1e7d 100644 --- a/rules/modemmanager.make +++ b/rules/modemmanager.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager # # Paths and names # -MODEMMANAGER_VERSION := 1.6.6 -MODEMMANAGER_MD5 := 99a46bd34ce65f8c18bd48994982922e +MODEMMANAGER_VERSION := 1.6.8 +MODEMMANAGER_MD5 := ac08d539ec3dc35db8d6b7c8d6c660ff MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION) MODEMMANAGER_SUFFIX:= tar.xz MODEMMANAGER_URL := http://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Newbie: Howto add luajit 2.x as a new package in ptxdist
On Mon, Jun 19, 2017 at 06:12:47PM +0200, Guillermo Rodriguez Garcia wrote: > Hi Michael, > > Have a look at the manual that Roland linked in his answer: > http://www.pengutronix.de/software/ptxdist/appnotes/OSELAS.BSP-Pengutronix-Generic-arm-Quickstart.pdf > > Specifically chapter 4, PTXdist Developer’s Manual, and section 4.2, > Adding new Packages. Hi Michael, LuaJIT is not Autotools-based and cross-compilation is complicated: According to the Makefile, you can only cross-compile from 64-bit host systems to 32-bit target systems with multilib-libraries. (gcc -m32) But maybe it's enough to advise the user in the HELP text, that he needs to have multilib libraries installed on his host system.. You have to pass custom variables in LUAJIT_MAKE_ENV. Also have a look at Buildroot, how they did it: https://github.com/buildroot/buildroot/blob/master/package/luajit Cheers, Clemens ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Newbie: Howto add luajit 2.x as a new package in ptxdist
Hi Michael, Have a look at the manual that Roland linked in his answer: http://www.pengutronix.de/software/ptxdist/appnotes/OSELAS.BSP-Pengutronix-Generic-arm-Quickstart.pdf Specifically chapter 4, PTXdist Developer’s Manual, and section 4.2, Adding new Packages. Best regards, Guillermo 2017-06-19 17:53 GMT+02:00 Michael Deiters: > Hi Roland, > > many thanks for the swift reply. > > My disconnect starts already at the first stage. My BSP has no information > that I need luajit in my project. I understand I need to create the "rules" > files to instruct PTXdist to compile luajit. My question is, how do the rule > file(s) look like, if I (simply) would like to include a source package from > a debian distro. I'm afraid I'm either far away from the correct approach or > very close... > > Thank you for your patience. > > Kind regards > Michael > > On Mon, 19 Jun 2017, Roland Hieber wrote: > >> Hi Michael, >> >> there is no need to add a -dev package for luajit, at least not for >> installing on the target. When crosscompiling, the install stage of your >> rules/luajit.make effectively calls `make install` in the luajit source >> folder, which should install the development headers to >> /sysroot-target/. When other packages depend on luajit, they >> will look there for the includes and libraries to link against. >> >> What is installed into the target root file system is different from that; >> your `targetinstall` stage is responsible for that and should copy all the >> files needed on the target to /root (e.g. by using $(call >> install_lib), $(call install_alternative) etc., see Section 5.2 in the >> PTXdist manual [1]). >> >> Hope that helps! >> >> - Roland >> >> [1]: >> http://www.pengutronix.de/software/ptxdist/appnotes/OSELAS.BSP-Pengutronix-Generic-arm-Quickstart.pdf >> >> On 18.06.2017 01:10, Michael Deiters wrote: >>> >>> Hi, >>> >>> I'm a newbie on ptxdist. I successfully managed to build my 1st BSP >>> based on Generic-arm recently. >>> >>> I'm getting lost on how to add luajit including the libluajit-5.1-dev as >>> package to ptxdist. I understand the approach to add an autotoolized >>> package, but for the desired luajit-5.1-dev, I can only find the apt-get >>> source on my host. >>> >>> I'm wondering if there isn't an easy way to let ptxdisk know about the >>> required package. I searched the web, but didn't found enlightenment... >>> >>> I would be grateful if somebody could point me the right direction. >>> >>> Many thanks in advance! >>> >>> Kind regards >>> Michael >>> >>> ___ >>> ptxdist mailing list >>> ptxdist@pengutronix.de >> >> >> -- >> 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 mailing list > ptxdist@pengutronix.de -- Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Newbie: Howto add luajit 2.x as a new package in ptxdist
Hi Roland, many thanks for the swift reply. My disconnect starts already at the first stage. My BSP has no information that I need luajit in my project. I understand I need to create the "rules" files to instruct PTXdist to compile luajit. My question is, how do the rule file(s) look like, if I (simply) would like to include a source package from a debian distro. I'm afraid I'm either far away from the correct approach or very close... Thank you for your patience. Kind regards Michael On Mon, 19 Jun 2017, Roland Hieber wrote: Hi Michael, there is no need to add a -dev package for luajit, at least not for installing on the target. When crosscompiling, the install stage of your rules/luajit.make effectively calls `make install` in the luajit source folder, which should install the development headers to /sysroot-target/. When other packages depend on luajit, they will look there for the includes and libraries to link against. What is installed into the target root file system is different from that; your `targetinstall` stage is responsible for that and should copy all the files needed on the target to /root (e.g. by using $(call install_lib), $(call install_alternative) etc., see Section 5.2 in the PTXdist manual [1]). Hope that helps! - Roland [1]: http://www.pengutronix.de/software/ptxdist/appnotes/OSELAS.BSP-Pengutronix-Generic-arm-Quickstart.pdf On 18.06.2017 01:10, Michael Deiters wrote: Hi, I'm a newbie on ptxdist. I successfully managed to build my 1st BSP based on Generic-arm recently. I'm getting lost on how to add luajit including the libluajit-5.1-dev as package to ptxdist. I understand the approach to add an autotoolized package, but for the desired luajit-5.1-dev, I can only find the apt-get source on my host. I'm wondering if there isn't an easy way to let ptxdisk know about the required package. I searched the web, but didn't found enlightenment... I would be grateful if somebody could point me the right direction. Many thanks in advance! Kind regards Michael ___ ptxdist mailing list ptxdist@pengutronix.de -- 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 mailing list ptxdist@pengutronix.de
Re: [ptxdist] Newbie: Howto add luajit 2.x as a new package in ptxdist
Hi Michael, there is no need to add a -dev package for luajit, at least not for installing on the target. When crosscompiling, the install stage of your rules/luajit.make effectively calls `make install` in the luajit source folder, which should install the development headers to /sysroot-target/. When other packages depend on luajit, they will look there for the includes and libraries to link against. What is installed into the target root file system is different from that; your `targetinstall` stage is responsible for that and should copy all the files needed on the target to /root (e.g. by using $(call install_lib), $(call install_alternative) etc., see Section 5.2 in the PTXdist manual [1]). Hope that helps! - Roland [1]: http://www.pengutronix.de/software/ptxdist/appnotes/OSELAS.BSP-Pengutronix-Generic-arm-Quickstart.pdf On 18.06.2017 01:10, Michael Deiters wrote: Hi, I'm a newbie on ptxdist. I successfully managed to build my 1st BSP based on Generic-arm recently. I'm getting lost on how to add luajit including the libluajit-5.1-dev as package to ptxdist. I understand the approach to add an autotoolized package, but for the desired luajit-5.1-dev, I can only find the apt-get source on my host. I'm wondering if there isn't an easy way to let ptxdisk know about the required package. I searched the web, but didn't found enlightenment... I would be grateful if somebody could point me the right direction. Many thanks in advance! Kind regards Michael ___ ptxdist mailing list ptxdist@pengutronix.de -- 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
Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8
On Mon, Jun 19, 2017 at 02:12:03PM +0200, Michael Olbrich wrote: > On Tue, Jun 06, 2017 at 04:36:30PM +0200, Clemens Gruber wrote: > > Signed-off-by: Clemens Gruber> > patchin: quilt: apply 'ptxdist-git/patches/freetype-2.8/series' > Applying patch 0001-generate-freetype-config-and-freetype2.pc-correctly.patch > patching file builds/unix/configure.ac > Hunk #1 succeeded at 1012 (offset 6 lines). > patching file builds/unix/freetype-config.in > Hunk #1 FAILED at 12. > Hunk #2 FAILED at 74. > Hunk #3 FAILED at 141. > 3 out of 3 hunks FAILED -- rejects in file builds/unix/freetype-config.in Ignore this. I missed the new version of this patch. 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
Re: [ptxdist] [PATCH] libpng: version bump 1.2.54 -> 1.6.29
On Tue, Jun 06, 2017 at 04:36:35PM +0200, Clemens Gruber wrote: > Also fix configure options. > patchin: quilt: apply 'ptxdist-git/patches/libpng-1.6.29/series' Applying patch 0001-add-SYSROOT-handling-to-libpng-config.patch can't find file to patch at input line 16 Perhaps you used the wrong -p or --strip option? mol > Signed-off-by: Clemens Gruber> --- > .../0001-add-SYSROOT-handling-to-libpng-config.patch | 0 > patches/{libpng-1.2.54 => libpng-1.6.29}/series| 0 > rules/libpng.make | 18 > +- > 3 files changed, 13 insertions(+), 5 deletions(-) > rename patches/{libpng-1.2.54 => > libpng-1.6.29}/0001-add-SYSROOT-handling-to-libpng-config.patch (100%) > rename patches/{libpng-1.2.54 => libpng-1.6.29}/series (100%) > > diff --git > a/patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch > b/patches/libpng-1.6.29/0001-add-SYSROOT-handling-to-libpng-config.patch > similarity index 100% > rename from > patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch > rename to > patches/libpng-1.6.29/0001-add-SYSROOT-handling-to-libpng-config.patch > diff --git a/patches/libpng-1.2.54/series b/patches/libpng-1.6.29/series > similarity index 100% > rename from patches/libpng-1.2.54/series > rename to patches/libpng-1.6.29/series > diff --git a/rules/libpng.make b/rules/libpng.make > index f23d9543f..e15fe18b0 100644 > --- a/rules/libpng.make > +++ b/rules/libpng.make > @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng > # > # Paths and names > # > -LIBPNG_VERSION := 1.2.54 > -LIBPNG_MD5 := bbb7a7264f1c7d9c444fd16bf6f89832 > +LIBPNG_VERSION := 1.6.29 > +LIBPNG_MD5 := 3245dbd76ea91e1437507357b858ec97 > LIBPNG := libpng-$(LIBPNG_VERSION) > LIBPNG_SUFFIX:= tar.xz > LIBPNG_URL := $(call ptx/mirror, SF, libpng/$(LIBPNG).$(LIBPNG_SUFFIX)) > @@ -31,9 +31,17 @@ LIBPNG_LICENSE := Zlib > # Prepare > # > > > -LIBPNG_AUTOCONF := \ > +LIBPNG_CONF_TOOL:= autoconf > +LIBPNG_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > - --without-libpng-compat > + --enable-unversioned-links \ > + --enable-unversioned-libpng-pc \ > + --enable-unversioned-libpng-config \ > + --enable-arm-neon=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON, yes, no) \ > + --disable-mips-msa \ > + --$(call ptx/endis, PTXCONF_ARCH_X86)-intel-sse \ > + --disable-powerpc-vsx \ > + --with-binconfigs > > # > > # Target-Install > @@ -48,7 +56,7 @@ $(STATEDIR)/libpng.targetinstall: > @$(call install_fixup, libpng,AUTHOR,"Robert Schwebel > ") > @$(call install_fixup, libpng,DESCRIPTION,missing) > > - @$(call install_lib, libpng, 0, 0, 0644, libpng12) > + @$(call install_lib, libpng, 0, 0, 0644, libpng16) > > @$(call install_finish, libpng) > > -- > 2.13.0 > > > ___ > 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- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] iftop: new package
This adds the well known tool 'iftop' for displaying bandwidth usage on a network interface. Signed-off-by: Alexander Dahl--- rules/iftop.in | 15 +++ rules/iftop.make | 57 2 files changed, 72 insertions(+) create mode 100644 rules/iftop.in create mode 100644 rules/iftop.make diff --git a/rules/iftop.in b/rules/iftop.in new file mode 100644 index 000..fc08378 --- /dev/null +++ b/rules/iftop.in @@ -0,0 +1,15 @@ +## SECTION=networking + +config IFTOP + tristate + prompt "iftop" + select LIBPCAP + select NCURSES + help + iftop does for network usage what top(1) does for CPU usage. It + listens to network traffic on a named interface and displays a + table of current bandwidth usage by pairs of hosts. + + http://www.ex-parrot.com/pdw/iftop/ + +# vim: ft=kconfig noet tw=72 diff --git a/rules/iftop.make b/rules/iftop.make new file mode 100644 index 000..135ef18 --- /dev/null +++ b/rules/iftop.make @@ -0,0 +1,57 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Alexander Dahl +# +# 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 +# +PACKAGES-$(PTXCONF_IFTOP) += iftop + +# +# Paths and names +# +IFTOP_VERSION := 1.0pre4 +IFTOP_MD5 := 7e6decb4958e8a4890cccac335239f24 +IFTOP := iftop-$(IFTOP_VERSION) +IFTOP_SUFFIX := tar.gz +IFTOP_URL := http://www.ex-parrot.com/pdw/iftop/download/$(IFTOP).$(IFTOP_SUFFIX) +IFTOP_SOURCE := $(SRCDIR)/$(IFTOP).$(IFTOP_SUFFIX) +IFTOP_DIR := $(BUILDDIR)/$(IFTOP) +IFTOP_LICENSE := GPL-2.0+ + +# +# Prepare +# + +IFTOP_CONF_TOOL:= autoconf +IFTOP_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --with-resolver=netdb \ + --with-libpcap + +# +# Target-Install +# + +$(STATEDIR)/iftop.targetinstall: + @$(call targetinfo) + + @$(call install_init, iftop) + @$(call install_fixup, iftop,PRIORITY,optional) + @$(call install_fixup, iftop,SECTION,base) + @$(call install_fixup, iftop,AUTHOR,"Alexander Dahl ") + @$(call install_fixup, iftop,DESCRIPTION,missing) + + @$(call install_copy, iftop, 0, 0, 0755, -, /usr/sbin/iftop) + + @$(call install_finish, iftop) + + @$(call touch) + +# vim: ft=make noet -- 2.1.4 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] dropwatch: new package
This adds a new package 'dropwatch', a tool for seeing where packets are dropped in the kernel. It was recently moved to a new upstream URL and is currently only available from Git. Included is one patch from buildroot, which is not yet upstream. Tested on an at91sam9g20 platform. Signed-off-by: Alexander Dahl--- .../0001-Fix-for-binutils-2.23.1.patch | 88 ++ patches/dropwatch-2015-07-06-g7c33d8a/series | 4 + rules/dropwatch.in | 13 rules/dropwatch.make | 66 4 files changed, 171 insertions(+) create mode 100644 patches/dropwatch-2015-07-06-g7c33d8a/0001-Fix-for-binutils-2.23.1.patch create mode 100644 patches/dropwatch-2015-07-06-g7c33d8a/series create mode 100644 rules/dropwatch.in create mode 100644 rules/dropwatch.make diff --git a/patches/dropwatch-2015-07-06-g7c33d8a/0001-Fix-for-binutils-2.23.1.patch b/patches/dropwatch-2015-07-06-g7c33d8a/0001-Fix-for-binutils-2.23.1.patch new file mode 100644 index 000..4eb5bbf --- /dev/null +++ b/patches/dropwatch-2015-07-06-g7c33d8a/0001-Fix-for-binutils-2.23.1.patch @@ -0,0 +1,88 @@ +From: Gustavo Zacarias +Date: Fri, 16 Jun 2017 08:50:03 +0200 +Subject: [PATCH] Fix for binutils 2.23.1 + +libbfd from binutils 2.23.1+ requires PACKAGE* definitions from autoconf. +Patch from https://fedorahosted.org/dropwatch/ticket/5 +Upstream status: new. + +Signed-off-by: Gustavo Zacarias +--- + src/lookup.c | 2 +- + src/lookup.h | 3 +++ + src/lookup_bfd.c | 2 +- + src/lookup_kas.c | 2 +- + 4 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/lookup.c b/src/lookup.c +index ba5499173983..809981b674d3 100644 +--- a/src/lookup.c b/src/lookup.c +@@ -27,13 +27,13 @@ + #include + #include + #include +-#include + #include + #include + #include + #include + + #include "lookup.h" ++#include + + extern struct lookup_methods bfd_methods; + extern struct lookup_methods kallsym_methods; +diff --git a/src/lookup.h b/src/lookup.h +index e6568d8b9445..47a7b569870b 100644 +--- a/src/lookup.h b/src/lookup.h +@@ -28,6 +28,9 @@ + #include + #include + ++// satisfy PR 14072 in bfd.h ++#define PACKAGE 1 ++#define PACKAGE_VERSION 1 + + /* + * Initalization routine +diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c +index cc7010beecec..271d42682a11 100644 +--- a/src/lookup_bfd.c b/src/lookup_bfd.c +@@ -25,13 +25,13 @@ + #include + #include + #include +-#include + #include + #include + #include + #include + + #include "lookup.h" ++#include + + + static int lookup_bfd_init(void) +diff --git a/src/lookup_kas.c b/src/lookup_kas.c +index 16e639fe5ae8..556cb62a9889 100644 +--- a/src/lookup_kas.c b/src/lookup_kas.c +@@ -25,7 +25,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -33,6 +32,7 @@ + #include + + #include "lookup.h" ++#include + + struct symbol_entry { + char *sym_name; diff --git a/patches/dropwatch-2015-07-06-g7c33d8a/series b/patches/dropwatch-2015-07-06-g7c33d8a/series new file mode 100644 index 000..cf27605 --- /dev/null +++ b/patches/dropwatch-2015-07-06-g7c33d8a/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Fix-for-binutils-2.23.1.patch +# 67ddfe89711030b81d1507e21ebd2023 - git-ptx-patches magic diff --git a/rules/dropwatch.in b/rules/dropwatch.in new file mode 100644 index 000..6ea54a1 --- /dev/null +++ b/rules/dropwatch.in @@ -0,0 +1,13 @@ +## SECTION=debug_tools + +config DROPWATCH + tristate + prompt "dropwatch" + select READLINE + select LIBNL3 + help + user space utility for use with dropwatch kernel protocol + + http://git.infradead.org/users/nhorman/dropwatch.git + +# vim: ft=kconfig noet tw=72 diff --git a/rules/dropwatch.make b/rules/dropwatch.make new file mode 100644 index 000..8015158 --- /dev/null +++ b/rules/dropwatch.make @@ -0,0 +1,66 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Alexander Dahl +# +# 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 +# +PACKAGES-$(PTXCONF_DROPWATCH) += dropwatch + +# +# Paths and names +# +# No tags: use a fake descriptive commit-ish to include the date +DROPWATCH_VERSION := 2015-07-06-g7c33d8a +DROPWATCH_MD5 := c4164e9f96bb5c0b801047685ed09ea5 +DROPWATCH := dropwatch-$(DROPWATCH_VERSION) +DROPWATCH_SUFFIX := tar.gz +DROPWATCH_URL := git://git.infradead.org/users/nhorman/dropwatch.git;tag=$(DROPWATCH_VERSION) +DROPWATCH_SOURCE := $(SRCDIR)/$(DROPWATCH).$(DROPWATCH_SUFFIX) +DROPWATCH_DIR := $(BUILDDIR)/$(DROPWATCH) +DROPWATCH_LICENSE := GPL-2.0 + +#