Re: [ptxdist] [PATCH] [mgetty] import debian patches for mgetty 1.1.36, taken from:
Josef Holzmayr wrote: Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de --- patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff | 6097 ++ patches/mgetty_1.1.36/series |1 + 2 files changed, 6098 insertions(+), 0 deletions(-) create mode 100644 patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff create mode 100644 patches/mgetty_1.1.36/series diff --git a/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff b/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff new file mode 100644 index 000..4fb7a35 --- /dev/null +++ b/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff can you please add the canonical patch header to that diff file. @@ -0,0 +1,6097 @@ +--- mgetty-1.1.36.orig/logfile.c mgetty-1.1.36/logfile.c cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [mgetty] bump version to 1.1.36
Josef Holzmayr wrote:
Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de
---
rules/mgetty.in |2 +-
rules/mgetty.make | 14 ++
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/rules/mgetty.in b/rules/mgetty.in
index 03f85b9..c7896a4 100644
--- a/rules/mgetty.in
+++ b/rules/mgetty.in
@@ -20,7 +20,7 @@ if MGETTY
config MGETTY_CONFIG
prompt Name of policy.h file to be used
string
- default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-1.1.30/policy.h-dist
+ default
${PTXDIST_PLATFORMDIR}/build-target/mgetty-${PTXCONF_MGETTY_VERSION}/policy.h-dist
help
FIXME: This item needs to be documented
diff --git a/rules/mgetty.make b/rules/mgetty.make
index c77e745..908190f 100644
--- a/rules/mgetty.make
+++ b/rules/mgetty.make
@@ -17,14 +17,12 @@ PACKAGES-$(PTXCONF_MGETTY) += mgetty
#
# Paths and names
#
-MGETTY_VERSION = 1.1.30
-MGETTY_DATE = Dec16
-MGETTY = mgetty$(MGETTY_VERSION)
-MGETTY_SUFFIX= tar.gz
-MGETTY_URL =
ftp://alpha.greenie.net/pub/mgetty/source/1.1/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
-MGETTY_SOURCE= $(SRCDIR)/$(MGETTY)-$(MGETTY_DATE).$(MGETTY_SUFFIX)
-MGETTY_DIR = $(BUILDDIR)/mgetty-$(MGETTY_VERSION)
-
+MGETTY_VERSION := 1.1.36
+MGETTY := mgetty_$(MGETTY_VERSION)
+MGETTY_SUFFIX:= orig.tar.gz
+MGETTY_URL :=
ftp://ftp.de.debian.org/debian/pool/main/m/mgetty/$(MGETTY).$(MGETTY_SUFFIX)
please use $(PTXCONF_SETUP_DEBMIRROR)/pool/
+MGETTY_SOURCE:= $(SRCDIR)/$(MGETTY).$(MGETTY_SUFFIX)
+MGETTY_DIR := $(BUILDDIR)/mgetty-$(MGETTY_VERSION)
#
# Get
otherwise it looks good.
cheers, Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Linux Solutions for Science and Industry | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [mgetty] import patches from Debian
Josef Holzmayr wrote: Taken from: http://ftp.de.debian.org/debian/pool/main/m/mgetty/mgetty_1.1.36-1.5.diff.gz Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de --- patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff | 6105 ++ patches/mgetty_1.1.36/series |1 + 2 files changed, 6106 insertions(+), 0 deletions(-) create mode 100644 patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff create mode 100644 patches/mgetty_1.1.36/series diff --git a/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff b/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff new file mode 100644 index 000..04b8c95 --- /dev/null +++ b/patches/mgetty_1.1.36/mgetty_1.1.36-1.5.diff @@ -0,0 +1,6105 @@ +Subject: [mgetty] various patches, taken from Debian +From: Josef Holzmayr holzm...@rsi-elektrotechnik.de + +These are the patches to mgetty as used by Debian. an URL pointing to the patches would be fine. + +Signed-off-by: Josef Holzmayr holzm...@rsi-elektrotechnik.de cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] -Wl,-rpath-link in link stage
Jon Smirl wrote: How do I fix this? It works if I take out -Wl,-rpath-link but that string is in the LDFLAGS variable. powerpc-603e-linux-gnu-gcc -L/home/apps/OSELAS.BSP-Phytec-phyCORE-12-1/platform-phyCORE-MPC5200B-tiny/sysroot-target/lib -L/home/apps/OSELAS.BSP-Phytec-phyCORE-12-1/platform-phyCORE-MPC5200B-tiny/sysroot-target/usr/lib -Wl,-rpath-link -Wl,/home/apps/OSELAS.BSP-Phytec-phyCORE-12-1/platform-phyCORE-MPC5200B-tiny/sysroot-target/lib -Wl,-rpath-link -Wl,/home/apps/OSELAS.BSP-Phytec-phyCORE-12-1/platform-phyCORE-MPC5200B-tiny/sysroot-target/usr/lib -Xlinker --allow-multiple-definition -o brutefir brutefir.o fftw_convolver.o bfconf.o bfrun.o firwindow.o emalloc.o shmalloc.o dai.o bfconf_lexical.o inout.o dither.o delay.o -lfftw3 -lfftw3f -lm -ldl powerpc-603e-linux-gnu-ld -shared -fPIC -L/home/apps/OSELAS.BSP-Phytec-phyCORE-12-1/platform-phyCORE-MPC5200B-tiny/sysroot-target/lib -L/home/apps/OSELAS.BSP-Phytec-phyCORE-12-1/platform-phyCORE-MPC5200B-tiny/sysroot-target/usr/lib -Wl,-rpath-link -Wl,/home/apps/OSELAS.BSP-Phytec-phyCORE-12-1/platform-phyCORE-MPC5200B-tiny/sysroot-target/lib -Wl,-rpath-link -Wl,/home/apps/OSELAS.BSP-Phytec-phyCORE-12-1/platform-phyCORE-MPC5200B-tiny/sysroot-target/usr/lib -o alsa.bfio bfio_alsa.fpic.o emalloc.fpic.o inout.fpic.o -lasound -lc powerpc-603e-linux-gnu-ld: unrecognized option '-Wl,-rpath-link' powerpc-603e-linux-gnu-ld: use the --help option for usage information make[1]: *** [alsa.bfio] Error 1 make[1]: *** Waiting for unfinished jobs make[1]: Leaving directory `/home/apps/OSELAS.BSP-Phytec-phyCORE-12-1/platform-phyCORE-MPC5200B-tiny/build-target/brutefir-1.0k' make: *** [/home/apps/OSELAS.BSP-Phytec-phyCORE-12-1/platform-phyCORE-MPC5200B-tiny/state/brutefir.compile] Error 2 Don't use ld to link, just use gcc. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] PATCH: copy avahi shared libraries for qt4 if option is activated
Markus Rathgeb wrote: Thanks again Marc! Google and the line wrapping problem: Will it be acceptable to send the patches attached (text files) instead of inline? Could this be handled by the online mailing list archive? Don't know, let's test, send a patch attached. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] PATCH: copy avahi shared libraries for qt4 if option is activated
) ^ obsolete, please remove + @$(call install_fixup, libsoup,DEPENDS,) + @$(call install_fixup, libsoup,DESCRIPTION,missing) + + @$(call install_copy, libsoup, 0, 0, 0755, $(LIBSOUP_DIR)/libsoup/.libs/libsoup-2.4.so.1.2.0, /usr/lib/libsoup-2.4.so.1.2.0) ^^ please install libs 644 and use - as src. + @$(call install_link, libsoup, libsoup-2.4.so.1.2.0, /usr/lib/libsoup-2.4.so.1) + @$(call install_link, libsoup, libsoup-2.4.so.1.2.0, /usr/lib/libsoup-2.4.so) + + @$(call install_finish, libsoup) + + @$(call touch, $@) ^^^ obsolete, please remove + +# +# Clean +# + +libsoup_clean: + rm -rf $(STATEDIR)/libsoup.* + rm -rf $(PKGDIR)/libsoup_* + rm -rf $(LIBSOUP_DIR) cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] PATCH [2]: copy libavahi-client if it is build
Markus Rathgeb wrote: From the official documentation: avahi-client: a simplifying C wrapper around the D-Bus API. We recommend using this API in C or C++ progams. The D-Bus internals are hidden completely. In the configure of avahi you can found: == BUILD_CLIENT=no (You need avahi-daemon and D-Bus!) if test x$BUILD_DAEMON = xyes -a x$HAVE_DBUS = xyes ; then BUILD_CLIENT=yes fi == Patch that installs the libavahi-client shared objects if that are built. I suggest to make it selectable via the kconfig interface: config AVAHI_LIBAVAHI_CLIENT bool libavahi_client select AVAHI_DBUS don't forget to add a help text ;) Signed-off-by: Markus Rathgeb rathgeb.mar...@googlemail.com === --- ptxdist/rules/avahi.make 2009-10-13 15:08:13.0 +0200 +++ /tmp/avahi.make 2009-10-13 15:46:48.0 +0200 @@ -163,6 +163,12 @@ @$(call install_link, avahi, libavahi-qt4.so.1.0.2, /usr/lib/libavahi-qt4.so) endif +ifeq ($(PTXCONF_AVAHI_DAEMON)$(PTXCONF_AVAHI_DBUS),yy) use ifdef PTXCONF_AVAHI_LIBAVAI_CLIENT + @$(call install_copy, avahi, 0, 0, 0644, -, /usr/lib/libavahi-client.so.3.2.5) + @$(call install_link, avahi, libavahi-client.so.3.2.5, /usr/lib/libavahi-client.so.3) + @$(call install_link, avahi, libavahi-client.so.3.2.5, /usr/lib/libavahi-client.so) +endif + ifdef PTXCONF_AVAHI_DAEMON #avahi daemon (avahi mDNS/DNS-SD Implementation) #depends on expat cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Can't build X server
Michael Olbrich wrote: On Wed, Oct 21, 2009 at 12:59:38PM -0600, Gary Thomas wrote: checking for X11... configure: error: Package requirements (xextproto xtrans xcb = 1.1.92) were not met: No package 'xtrans' found I can reproduce this. We're working on the correct solution. Until it's done you can you can work around this by copying platform-test_arm/sysroot-target/usr/share/pkgconfig/xtrans.pc to platform-test_arm/sysroot-target/usr/lib/pkgconfig/xtrans.pc and then run 'ptxdist go' again. a fix has been pushed to mainline as: 42eedc6d92dc838985635476e2b01c68fb2e6a21 cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [ANNOUNCE] ptxdist-1.99.19 released
Tim Sander wrote: Hi I'm just running the 1.99.19 Release of ptxdist against our custimized ptxdist project for the imx35. It seems as if module init tools are not working as expected. The error output is also somewhat uninformative (File missing?). If someone has a hint where to look, i'll start digging for the error again. A ptxdist compile kernel to test if just some kernel dependency is missing didn't remedy the problem. wooops, tnx for testing. please try this patch: From 11927df0f91461fff0bd00fe6406a16cdce1d552 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde m...@pengutronix.de Date: Thu, 29 Oct 2009 14:35:42 +0100 Subject: [PATCH] [module-init-tools] readded fix for systems without docbook2man ...which was lost in 5d026f1eccf264996fa30acf9ff7d290aeae8c94 Reported-by: Tim Sander ti...@vlsi.informatik.tu-darmstadt.de Signed-off-by: Marc Kleine-Budde m...@pengutronix.de --- rules/module-init-tools.make |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make index d9d75f4..d69cd5f 100644 --- a/rules/module-init-tools.make +++ b/rules/module-init-tools.make @@ -39,6 +39,7 @@ $(MODULE_INIT_TOOLS_SOURCE): MODULE_INIT_TOOLS_PATH := PATH=$(CROSS_PATH) MODULE_INIT_TOOLS_ENV := $(CROSS_ENV) +MODULE_INIT_TOOLS_MAKEVARS := MAN5= MAN8= # # autoconf -- 1.6.5 -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [ANNOUNCE] ptxdist-1.99.19 released
Tim Sander wrote: Hi please try this patch: Patch seems to work by dooing a ptxdist clean; ptxdist go. tnx for testing. for the record: fix has been commited to master Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Busybox-1.15.2
Hey, ladislav.mi...@seznam.cz wrote: Signed-off-by: Ladislav Michl la...@linux-mips.org tnx for the patch, however git am refuses to import it. There are problems with the .in files, so I removed them and did a freshly import. Seems to work now. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] generated Kconfig files ?
Bart De Vos wrote: Hello, In an attempt to migrate from ptxdist 1.99.5 to 1.99.19.1 i ran into the following problems: -- ptxdist migrate info: successfully migrated '/opt/eia/build/ptxdist-1.99.19.1/selected_ptxconfig' config/Kconfig:12: can't open file generated/fixme.in ptxdist: 'ptx oldconfig' returned with an error -- This is what i did: download 1.99.19.1 and 1.99.19.1-patches and extract into dir /opt/ptxdist-new cd /opt/ptxdist-new configure --prefix=/opt/ptxdist-new make sudo make install cp /opt/ptxdist/ptxconfig /opt/ptxdist-new cp /opt/ptxdist/platformconfig /opt/ptxdist-new ptxdist select ptxconfig ptxdist platform platformconfig ptxdist toolchain /path/to/compiler/bin ptxdist migrate Please don't extract ptxdist in the same directory where you want to install it. Don't build your project in the ptxdist directory. Please delete /opt/ptxdist-new and start over. 1) create some temp directory and download ptxdist and patched 2) extract ptxdist and patches 3) ./configure --prefix=/opt/ptxdist-1.99.19.1 4) make 5) sudo make install 6) create your project workspace on a fast local driver, e.g.: mkdir ~/ptxdist-workspace 7) go into that directory and copy your config files into it cd ~/ptxdist-workspace cp /opt/ptxdist/ptxconfig . cp /opt/ptxdist/platformconfig . 8) create a convenience link: ln -sf /opt/ptxdist-1.99.19.1/bin/ptxdist-1.99.19.1 p 9) activate your config: ./p select ptxconfig ./p platform platformconfig ./p toolchain 10) do the migration step: ./p migrate 11) you might want to change your srcdir and point it to a common download location: ./p setup Source Directories - Source Directory (this configuration is for your ptxdist-1.99.19.1, so just needed once) 12) build: ./p go cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] avahi
Hey Markus, Markus Rathgeb wrote: - added Option for libavahi-client - more useful (the common) default values for AVAHI_DBUS_SYS and AVAHI_DBUS_SOCKET - copy the configuration file of avahi for dbus (if option is set) Signed-off-by: Markus Rathgeb rathgeb.mar...@googlemail.com thanks for the patch, it has been applied. But that wasn't easy :) Please rebase your working tree to ptxdist master before creating patches. Or you might want to cherry pick your patch on top of the ptxdist master tree. In the official tree, there isn't a rules.orig dir, but it seems to be in your git tree. With git there's no need for this kludge. Please consider to have a patch for a subject, I've splitted your patch into three patches. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [avahi] copy the configuration file of avahi for dbus
Markus Rathgeb wrote: Good morning! On Tue, Nov 17, 2009 at 11:20 PM, Marc Kleine-Budde m...@pengutronix.de wrote: Markus Rathgeb wrote: The default file comes with the avahi sources -- why you do not want to use that file and created the one in the generic directory? The reason behind this if someone wants to use a modified file. The current install_alternative first looks in $workspace/projectroot/ then it $ptxdist/generic. Isn't there a problem, that the file will be forgotten while updating avahi to a more recent version after a undefined time? good point. Perhaps there could be an install function that will use $workspace/projectroot if there is a correspondent file and otherwise it will call a normal install to use the file that come with the sources. We can extend the install_alternative to look in $workspace/projectroot as another fallback That is just a perspective I want point to. ;-) cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [tslib] update plugins/input-raw.c to upstream's trunk version
Uwe Kleine-König wrote: This adds all patches against plugins/input-raw.c between version 1.0 and r78 (dating from 2009-09-30) taken from svn://svn.berlios.de/tslib/trunk/tslib Motivation was r57 because (at least currently) mc13783-ts doesn't report pressure values. Signed-off-by: Uwe Kleine-König u.kleine-koe...@pengutronix.de applied tnx, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] PATCH: [alsa-utils] Added dependencies to ncurses form, menu panel libs
Carsten Schlote wrote: commit bf210b52cc120417aad3f8b2fced3c5dada2fa12 Author: Carsten Schlote c.schl...@konzeptpark.de Date: Thu Nov 19 10:27:11 2009 +0100 [alsa-utils] Added dependencies to ncurses form, menu panel libs =20 Probably to save some space, the form, menu and panel shared libs are now install options. Alsamixer requires them, so I added appropriate SELECTs to the alsa-utils .in file. tnx for the patch. Someone mangled the mail, so that git am failed to apply it. However I've applied it by hand and pushed to master. You can send pull requests, too. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] PATCH: [alsa-utils] Added dependencies to ncurses form, menu panel libs
Carsten Schlote wrote: commit bf210b52cc120417aad3f8b2fced3c5dada2fa12 Author: Carsten Schlote c.schl...@konzeptpark.de Date: Thu Nov 19 10:27:11 2009 +0100 [alsa-utils] Added dependencies to ncurses form, menu panel libs =20 Probably to save some space, the form, menu and panel shared libs are now install options. Alsamixer requires them, so I added appropriate SELECTs to the alsa-utils .in file. tnx for the patch. Someone mangled the mail, so that git am failed to apply it. However I've applied it by hand and pushed to master. You can send pull requests, too. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] PATCH: [pcmciautils] Added PARALLELMFLAGS_BROKEN to compile stage
Carsten Schlote wrote: commit d405a47f0ba553619faa47b5f764949f78de0a27 Author: Carsten Schlote c.schl...@konzeptpark.de Date: Thu Nov 19 12:17:46 2009 +0100 [pcmciautils] Added PARALLELMFLAGS_BROKEN to compile stage =20 This package lacks appropriate dependancies for parallel build. As the package is very small I didn't added proper deps to the makefile. It wouldn't be worth the effort. Tnx for spotting the problem. However I'm not sure if adding PARALLELMFLAGS_BROKEN helps here. For target with autogenerated .compile stages it's better to use: PKG_MAKE_PAR := NO cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] PATCH: [pcmciautils] Added PARALLELMFLAGS_BROKEN to compile stage
Carsten Schlote wrote: commit d405a47f0ba553619faa47b5f764949f78de0a27 Author: Carsten Schlote c.schl...@konzeptpark.de Date: Thu Nov 19 12:17:46 2009 +0100 [pcmciautils] Added PARALLELMFLAGS_BROKEN to compile stage =20 This package lacks appropriate dependancies for parallel build. As the package is very small I didn't added proper deps to the makefile. It wouldn't be worth the effort. Tnx for spotting the problem. However I'm not sure if adding PARALLELMFLAGS_BROKEN helps here. For target with autogenerated .compile stages it's better to use: PKG_MAKE_PAR := NO cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] testmail
testmail -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] testmail
Marc Kleine-Budde wrote: testmail we had some problem with our email and listserver, seems to work again cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] PULL Request: OSELAS.Toolchain/for-upstream / Update for GCC 4.4.1 and Binutils 2.20
Andrea Fino wrote: Am Freitag, den 20.11.2009, 11:07 +0100 schrieb Andrea Fino: I am getting this: rror: unknown switch `b' usage: git-clone [options] [--] repo [dir] cschlote at kplaws107lx:~/src/ptx$ git --version git version 1.6.5.6.gb3118 Maybe your GIT exe is some older version. But you should be able to do the following (you might use man pages and fix the example below): git clone git://www.vahanus.net/OSELAS.Toolchain.git http://www.vahanus.net/OSELAS.Toolchain.git ln -s OSELAS.Toolchain OSELAS.Toolchain-1.99.svn # Above required by build scripts; used as install basename in /opt cd OSELAS.Toolchain-1.99.svn git checkout -b for-upstream origin/for-upstream make -f build_all_v2.mk help Find your desired target in the output, then make -f build_all_v2.mk make-target from help output I am now getting an error (p is not found) Any hints? Best regards, Andrea Fino make -f build_all_v2.mk dist/oselas.toolchain-1.99.svn-i586-unknown-linux-gnu-gcc-4.3.2-glibc-2.8-binutils-2.18-kernel-2.6.27-sanitized_1.99.svn_i386.deb building i586-unknown-linux-gnu-gcc-4.3.2-glibc-2.8-binutils-2.18-kernel-2.6.27-sanitized nice -20 ./p --force go --ptxconfig=ptxconfigs/i586-unknown-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig nice: ./p: No such file or directory make: *** [gstate/i586-unknown-linux-gnu-gcc-4.3.2-glibc-2.8-binutils-2.18-kernel-2.6.27-sanitized.build] Error 127 You have to link ptxdist into the directory as p, e.g. if your ptxdist is installed to /usr/local/bin ln -s /usr/local/bin/ptxdist p cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Error while compiling BSP
Frederik Sdun wrote:
Hi,
I try to build a custom BSP but ptxdist always bails out:
OSELAS.BSP-JB-itlp-trunk $ ptxdist go
error: failed to source lib:
/opt/lib/ptxdist-1.99.svn/scripts/lib/ptxd_make_00-init.sh
Work/OSELAS.BSP-JB-itlp-trunk $ ll
/opt/lib/ptxdist-1.99.svn/scripts/lib/ptxd_make_00-init.sh
-rw-r--r-- 1 student student 6018 2009-11-20 09:15
/opt/lib/ptxdist-1.99.svn/scripts/lib/ptxd_make_00-init.sh
I'm using a custom toolchain with quite old packages, but this seems to
be a general problem.
The toolchain is probably compiled without sysroot support. I assumed
that nowadays all toolchains come with sysroot support, so ptxdist tries
to figure it out, but fails without a proper error message.
IIRC Ladis got the same problem, he commented out the part looking for
the sysroot, you can try this patch, too:
diff --git a/scripts/lib/ptxd_make_00-init.sh
b/scripts/lib/ptxd_make_00-init.sh
index 245b431..8d8cc9c 100644
--- a/scripts/lib/ptxd_make_00-init.sh
+++ b/scripts/lib/ptxd_make_00-init.sh
@@ -226,10 +226,10 @@ ptxd_init_cross_env() {
ptxd_make_init() {
ptxd_init_arch
-if ptxd_get_ptxconf PTXCONF_LIBC /dev/null
- ! ptxd_get_ptxconf PTXCONF_BUILD_TOOLCHAIN /dev/null; then
- ptxd_init_sysroot_toolchain || return
-fi
+#if ptxd_get_ptxconf PTXCONF_LIBC /dev/null
+# ! ptxd_get_ptxconf PTXCONF_BUILD_TOOLCHAIN /dev/null; then
+# ptxd_init_sysroot_toolchain || return
+#fi
ptxd_init_ptxdist_path
ptxd_init_cross_env
If i source /opt/lib/ptxdist-1.99.svn/scripts/lib/ptxd_make_00-init.sh
manually, i get some of these errors:
ptxd_get_ptxconf: command not found
after a few greps i figured out that the missing command is defined in
libptxdist.sh. Sourcing it by hand returns no error:
OSELAS.BSP-JB-itlp-trunk $ source
/opt/lib/ptxdist-1.99.svn/scripts/libptxdist.sh
OSELAS.BSP-JB-itlp-trunk $ echo $?
0
Any ideas how to fix this?
cheers, Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Linux Solutions for Science and Industry | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] Perl?
Gary Thomas wrote: On 11/30/2009 11:31 AM, Robert Schwebel wrote: On Mon, Nov 30, 2009 at 10:50:31AM -0700, Gary Thomas wrote: Has anyone any experience with adding perl to ptxdist? Yes, but no good ones :-) Seriously - we should have a look at what OE is doing there. I've seen that they actually have something. I've looked at the OE setup and it's not pretty :-) I guess I'll slog on with this since I'm in need of Perl... IIRC buildroot has perl, too Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] OSELAS.Toolchain: eglic 2.10, gcc 4.4.1, bintuils 2.20
Carsten Schlote wrote: Hi I updated the 'for-upstream' branch on my GIT repository. The branch adds support for eglic 2.10, gcc 4.4.1, bintuils 2.20. I compiled and uploaded some debian packages for Ubuntu 9.10: ARM Xscale, powerpc-603e and i363. I successfully compiled a powerpc and i686 ptxdist project with the resulting toolchains. See http://www.vahanus.net/~csc/wiki/index.php/OSELAS_Toolchain for more information and the GIT and binary download links. Any feedback is welcomed. wow, quite some work. I'll look at it as soom as my time permits. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Typo in kernel.make
Rene Huber wrote: Hi, I believe there is a small typo in rules/kernel.make in the clean stage: $(KERNE_PATH) should actually be $(KERNEL_PATH). Doh! Fixed in master. cherrs, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Error in iptables.make
Marc Kleine-Budde wrote: Rene Huber wrote: Hi, The rules/iptables.make file contains an error in the target install stage. The IPv6 section installs the IPv4 library and associated links, and the IPv4 section installs the IPv6 library and links. When only one is selected, the iptables command fails. what a mess, I'll fix it asap done. I've also pushed the fix to the stable/ptxdist-1.99.20.x branch. FYI: you can copy the fixed iptables rule to your project, that will overwrite the faulty rule in the 1.99.20 release. thanks, Marc P.S.: I'm about to go to bed now, have you more fixes? :) -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Fixed a problem where genhdimg could generate a corrupt image file.
geor...@novatech-llc.com wrote: From: ptxdist2 ptxdi...@opteron.novatech-llc.com pad() wasn't always padding the output file to the correct length. On some machines dd wasn't reading full blocks which resulted in an incorrectly padded file. pad() now makes one call to dd to write the input file using conv=sync to pad to the nearest 512 byte boundry. Then dd is called again if additional 512 byte '\0' blocks are needed to meet the padding size. Signed-off-by: George McCollister geor...@novatech-llc.com Tested-by: George McCollister geor...@novatech-llc.com tnx for debugging the problem, applied to master cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Building of PHP5, qt examples and qwt fails
Hello, Alexander Stapff wrote: Please try the attached patch for ptxdist. If it still fails with this patch the qt examples compile without any error! mol, do we need this patch in ptxdist master? cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] klibc-udev.make didn't install_initramfs /lib/udev/rules.d
Jon Ringle wrote: Marc, Can you apply this patch, please. Is this an Acked-by? Sure will do. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 0/1] rename build-target-klibc
Hello Jon, what do you think about renaming build-target-klibc into build-klibc-target. Juergen complained that the tap completion doesn't work as expected compared to the previous release of ptxdist, where this dir wasn't created. cheers, Marc -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC] [sysroot-cross] add dummy-strip
Wolfram Sang wrote: Provide a dummy, no-op version of strip as a lot of makefiles (and install -s) execute just 'strip' and this leaks in the host version. This approach should be OK as we do stripping at a later stage anyway. For debugging purpose it's bad if the package strips itself. Signed-off-by: Wolfram Sang w.s...@pengutronix.de --- I threw away the patches for NMAP and still could build it \o/ @Marc: This package needs to be processed before packages for the target are built. Where is it best to add the dependency? look for FAKEROOT in rules/ and add this package accordingly. @all: Do you see any side-effects? rules/cross-dummy-strip.in |5 + rules/cross-dummy-strip.make | 33 + scripts/dummy-strip.sh |8 3 files changed, 46 insertions(+), 0 deletions(-) create mode 100644 rules/cross-dummy-strip.in create mode 100644 rules/cross-dummy-strip.make create mode 100644 scripts/dummy-strip.sh diff --git a/rules/cross-dummy-strip.in b/rules/cross-dummy-strip.in new file mode 100644 index 000..9cd921a --- /dev/null +++ b/rules/cross-dummy-strip.in @@ -0,0 +1,5 @@ +## SECTION=crosstools + +config CROSS_DUMMY_STRIP + bool + default y diff --git a/rules/cross-dummy-strip.make b/rules/cross-dummy-strip.make new file mode 100644 index 000..ca8feab --- /dev/null +++ b/rules/cross-dummy-strip.make @@ -0,0 +1,33 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Wolfram Sang w.s...@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 +# +CROSS_PACKAGES-$(PTXCONF_CROSS_DUMMY_STRIP) += cross-dummy-strip + +$(STATEDIR)/cross-dummy-strip.extract: + @$(call targetinfo) + @$(call touch, $@) + +$(STATEDIR)/cross-dummy-strip.prepare: + @$(call targetinfo) + @$(call touch, $@) + +$(STATEDIR)/cross-dummy-strip.compile: + @$(call targetinfo) + @$(call touch, $@) + +$(STATEDIR)/cross-dummy-strip.install: + @$(call targetinfo) + install -D -m 755 $(PTXDIST_TOPDIR)/scripts/dummy-strip.sh $(PTXCONF_SYSROOT_CROSS)/bin/strip + @$(call touch, $@) + +# vim: syntax=make diff --git a/scripts/dummy-strip.sh b/scripts/dummy-strip.sh new file mode 100644 index 000..3546592 --- /dev/null +++ b/scripts/dummy-strip.sh @@ -0,0 +1,8 @@ +#! /bin/sh +# +# This scripts gets installed into the cross-environment as a 'dummy'-strip +# program. As programs like 'install -s' just call 'strip', this prevents +# leaking in of the host-version of strip. Also, it does intentionally +# nothing as we want to strip at a later stage. +echo ptxdist: Discarding strip command '$0 $*' + you might want to add you (c) to this file. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC] [sysroot-cross] add dummy-strip
Wolfram Sang wrote: Provide a dummy, no-op version of strip as a lot of makefiles (and install -s) execute just 'strip' and this leaks in the host version. This approach should be OK as we do stripping at a later stage anyway. Signed-off-by: Wolfram Sang w.s...@pengutronix.de --- I threw away the patches for NMAP and still could build it \o/ @Marc: This package needs to be processed before packages for the target are built. Where is it best to add the dependency? @all: Do you see any side-effects? rules/cross-dummy-strip.in |5 + rules/cross-dummy-strip.make | 33 + scripts/dummy-strip.sh |8 3 files changed, 46 insertions(+), 0 deletions(-) create mode 100644 rules/cross-dummy-strip.in create mode 100644 rules/cross-dummy-strip.make create mode 100644 scripts/dummy-strip.sh diff --git a/rules/cross-dummy-strip.in b/rules/cross-dummy-strip.in new file mode 100644 index 000..9cd921a --- /dev/null +++ b/rules/cross-dummy-strip.in @@ -0,0 +1,5 @@ +## SECTION=crosstools + +config CROSS_DUMMY_STRIP + bool + default y diff --git a/rules/cross-dummy-strip.make b/rules/cross-dummy-strip.make new file mode 100644 index 000..ca8feab --- /dev/null +++ b/rules/cross-dummy-strip.make @@ -0,0 +1,33 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Wolfram Sang w.s...@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 +# +CROSS_PACKAGES-$(PTXCONF_CROSS_DUMMY_STRIP) += cross-dummy-strip + +$(STATEDIR)/cross-dummy-strip.extract: + @$(call targetinfo) + @$(call touch, $@) please remove + +$(STATEDIR)/cross-dummy-strip.prepare: + @$(call targetinfo) + @$(call touch, $@) dito + +$(STATEDIR)/cross-dummy-strip.compile: + @$(call targetinfo) + @$(call touch, $@) dito + +$(STATEDIR)/cross-dummy-strip.install: + @$(call targetinfo) + install -D -m 755 $(PTXDIST_TOPDIR)/scripts/dummy-strip.sh $(PTXCONF_SYSROOT_CROSS)/bin/strip + @$(call touch, $@) dito +# vim: syntax=make diff --git a/scripts/dummy-strip.sh b/scripts/dummy-strip.sh new file mode 100644 index 000..3546592 the rest ist just nitpicking --- /dev/null +++ b/scripts/dummy-strip.sh @@ -0,0 +1,8 @@ +#! /bin/sh +# +# This scripts gets installed into the cross-environment as a 'dummy'-strip +# program. As programs like 'install -s' just call 'strip', this prevents +# leaking in of the host-version of strip. Also, it does intentionally +# nothing as we want to strip at a later stage. IMHO it looks better with an # here +echo ptxdist: Discarding strip command '$0 $*' use $@ here (however it makes no big difference here:) cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC] [sysroot-cross] add dummy-strip
Wolfram Sang wrote: What about... diff --git a/rules/cross-dummy-strip.in b/rules/cross-dummy-strip.in new file mode 100644 index 000..9cd921a --- /dev/null +++ b/rules/cross-dummy-strip.in @@ -0,0 +1,5 @@ +## SECTION=crosstools + +config CROSS_DUMMY_STRIP +bool +default y ...dropping this entirely and... diff --git a/rules/cross-dummy-strip.make b/rules/cross-dummy-strip.make new file mode 100644 index 000..ca8feab --- /dev/null +++ b/rules/cross-dummy-strip.make @@ -0,0 +1,33 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Wolfram Sang w.s...@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 +# +CROSS_PACKAGES-$(PTXCONF_CROSS_DUMMY_STRIP) += cross-dummy-strip ...simply using 'CROSS_PACKAGES-y' here? Looks better to me. sorry, this probably doesn't work. This line is used to identify a package, and sets up a mapping from PTXCONF_CROSS_DUMMY_STRIP to cross-dummy-strip and vice versa. Whis is the base for the automatic dependency generation. This also means tha the package is _allways_ installed, even if building toolchains or bare metal targets. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 01/11] [sysroot-cross] add dummy-strip
Wolfram Sang wrote: Provide a dummy, no-op version of strip as a lot of makefiles (and install -s) execute just 'strip' and this leaks in the host version. This approach should be OK as we do stripping at a later stage anyway and want to keep the debug-info until then. looks good, although we use (C) in ptxdist all oder the place. Fix it, add my Acked-by an push to upstream. Signed-off-by: Wolfram Sang w.s...@pengutronix.de --- rules/cross-dummy-strip.in |8 rules/cross-dummy-strip.make | 33 + rules/post/virtual.make |4 scripts/dummy-strip.sh | 11 +++ 4 files changed, 56 insertions(+), 0 deletions(-) create mode 100644 rules/cross-dummy-strip.in create mode 100644 rules/cross-dummy-strip.make create mode 100644 scripts/dummy-strip.sh diff --git a/rules/cross-dummy-strip.in b/rules/cross-dummy-strip.in new file mode 100644 index 000..7241dbb --- /dev/null +++ b/rules/cross-dummy-strip.in @@ -0,0 +1,8 @@ +## SECTION=crosstools + +config CROSS_DUMMY_STRIP + bool + default y + help + Dummy, no-op strip to prevent leak-in of another strip-version. + Always selected. diff --git a/rules/cross-dummy-strip.make b/rules/cross-dummy-strip.make new file mode 100644 index 000..23864c6 --- /dev/null +++ b/rules/cross-dummy-strip.make @@ -0,0 +1,33 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Wolfram Sang w.s...@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 +# +CROSS_PACKAGES-$(PTXCONF_CROSS_DUMMY_STRIP) += cross-dummy-strip + +$(STATEDIR)/cross-dummy-strip.extract: + @$(call targetinfo) + @$(call touch) + +$(STATEDIR)/cross-dummy-strip.prepare: + @$(call targetinfo) + @$(call touch) + +$(STATEDIR)/cross-dummy-strip.compile: + @$(call targetinfo) + @$(call touch) + +$(STATEDIR)/cross-dummy-strip.install: + @$(call targetinfo) + install -D -m 755 $(PTXDIST_TOPDIR)/scripts/dummy-strip.sh $(PTXCONF_SYSROOT_CROSS)/bin/strip + @$(call touch) + +# vim: syntax=make diff --git a/rules/post/virtual.make b/rules/post/virtual.make index aad92df..b52e513 100644 --- a/rules/post/virtual.make +++ b/rules/post/virtual.make @@ -8,6 +8,10 @@ # see the README file. # +ifdef PTXCONF_CROSS_DUMMY_STRIP +$(STATEDIR)/virtual-cross-tools.install: $(STATEDIR)/cross-dummy-strip.install +endif + ifdef PTXCONF_HOST_FAKEROOT $(STATEDIR)/virtual-cross-tools.install: $(STATEDIR)/host-fakeroot.install endif diff --git a/scripts/dummy-strip.sh b/scripts/dummy-strip.sh new file mode 100644 index 000..345f443 --- /dev/null +++ b/scripts/dummy-strip.sh @@ -0,0 +1,11 @@ +#! /bin/sh +# dummy-strip.sh for PTXdist - Copyright (c) 2009 by Wolfram Sang C? +# +# This scripts gets installed into the cross-environment as a 'dummy'-strip +# program. As programs like 'install -s' just call 'strip', this prevents +# leaking in of the host-version of strip. Also, it does intentionally +# nothing as we want to strip at a later stage. +# +echo ptxdist: Discarding 'strip $*' +exit 0 + cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Linux Solutions for Science and Industry | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ptxdist on OS X?
Hey Markus, I think we can keep the list on CC as long as we stick to English ;) Markus Heidt wrote: Bevor wir die Liste spammen, denke ich, dass es privat besser ist. YMMV: Perhaps someone has tried, too, but is doing something else in his/her holidays :) Es hat also noch keiner in der Community das alles auf Os x probiert? A college of mine tried. First you need a case sensitive filesystem. IIRC some parts of the toolchain need this. ptxdist will refuse to run on a non case sensitive one. Also beim Kompilieren von ptxdist gabs so einige Änderungen auch an Skriptdateien. Z.B. Fakeroot gibt's gar nicht. What do you mean, there's no fakeroot for osx? At least for the toolchain we don't need any fakeroot. Ich hatte schon probiert auf meinem G5 Ubuntu 9.04 zu installieren. Leider geht der Bildschirm häufig schwarz und man kommt da nur per Restart wieder raus. Keine Lomeldungen gefunden:( I'm running ubuntu since 7.09 (or was it 7.10) on my G4, updating until the recent 9.10 release. No problems so far. Mich hat ein wenig irritiert, dass Ubuntu über VM nicht zu empfehlen sei? It's slow. It just takes more time to compile ich habe nur noch einen G4 mini, auf dem ich Ubuntu hoffentlich erfolgreicher installieren könnte oder einen 700er AMD, der aber wohl sehr langsam wäre. Dass Target wäre übrigens ein powerpc603 für eine Smartcam. Irgendein Tip, welche Schiene den meisten Erfolg verspricht? The fastest solution is to set up a vm with recent ubuntu.In the mean time buy a PC and put ubuntu native on it :) cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ptxdist on OS X?
directive... (cached) yes checking whether __attribute__((visibility())) is supported... (cached) yes checking for broken __attribute__((visibility()))... (cached) no checking for broken __attribute__((alias()))... (cached) no checking whether to put _rtld_local into .sdata section... (cached) yes checking for powerpc-603e-linux-gnu-readelf... no checking for .preinit_array/.init_array/.fini_array support... (cached) yes checking for libunwind-support in compiler... no checking for -z nodelete option... (cached) yes checking for -z nodlopen option... (cached) yes checking for -z initfirst option... (cached) yes checking for -z relro option... no configure: error: linker with -z relro support required make: *** [/Volumes/ptx/OSELAS.Toolchain-1.99.3.6/platform-powerpc-603e-linux-gnu-gcc-4.3.2-glibc-2.8-binutils-2.18-kernel-2.6.27-sanitized/state/glibc-headers.prepare] Error 1 I managed to compile half way though the first gcc stage, then the laptop and the person using it went sleeping. Tell me how far you got. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ptxdist on OS X?
Markus Heidt wrote: Hi Marc, Thanks for the amazingly quick response. ptxdist: http://git.pengutronix.de/?p=mkl/ptxdist.git;a=shortlog;h=refs/heads/dev/osx The configure script is missing. I only found a autoconf config.ac. I copied a configure of the other distributions into the directory... just run ./autogen.sh, and you'll find a configure. The /opt/local/sbin path is upfront now. sudo make install throws error-code at the end, but ptxdist was created which ptxdist /usr/local/bin/ptxdist seems to be ok !? which command does fail? BTW: installing isn't needed. Put ptdist-1.99.19.1/bin in path, or link the ptxdist script into your project (the OSELAS.Toolchain dir). ptxdist works in the project though, so the install must have worked. fixed in dev/osx... Yes, I can confirm that all my patches in the scripts aren't necessary anymore. It's better to work on a case sensitive disk, but I disabled the test in dev/osx Ok, now I'm using a case sensitive disk. checking for ld --version-script... no *** WARNING: You should not compile GNU libc without versioning. Not using *** versioning will introduce incompatibilities so that old binaries *** will not run anymore. *** For versioning you need recent binutils (binutils-2.8.1.0.23 or newer). checking for .previous assembler directive... no checking for .popsection assembler directive... no checking for .protected and .hidden assembler directive... (cached) yes checking whether __attribute__((visibility())) is supported... (cached) yes checking for broken __attribute__((visibility()))... (cached) no checking for broken __attribute__((alias()))... (cached) no checking whether to put _rtld_local into .sdata section... (cached) yes checking for powerpc-603e-linux-gnu-readelf... no checking for .preinit_array/.init_array/.fini_array support... (cached) yes checking for libunwind-support in compiler... no checking for -z nodelete option... (cached) yes checking for -z nodlopen option... (cached) yes checking for -z initfirst option... (cached) yes checking for -z relro option... no configure: error: linker with -z relro support required make: *** [/Volumes/ptx/OSELAS.Toolchain-1.99.3.6/platform-powerpc-603e-linux-gnu-gcc-4.3.2-glibc-2.8-binutils-2.18-kernel-2.6.27-sanitized/state/glibc-headers.prepare] okay...I'll try to make a patch, although that OSX laptop just currently on a train :) So I'm doing it blindfold. I managed to compile half way though the first gcc stage, then the laptop and the person using it went sleeping. Tell me how far you got. Unfortunately it hangs at the zelro again. But I'm using OS X 10.5 If you tell me, that OS X 10.6 gets through, I could use a 10.6 machine as well. So far those machines aren't used as mediacenter and by my wife, so that these weren't my prefered environments. I checked for a better ld or as though, which is still no 2.x version. Therefore I guess, that you are getting stuck there as well. No, we just have to fool glibc's configure script :) Again thanks a lot for the quick help, cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ptxdist on OS X?
Marc Kleine-Budde wrote: http://git.pengutronix.de/?p=mkl/ptxdist.git;a=shortlog;h=refs/heads/dev/osx The configure script is missing. I only found a autoconf config.ac. I copied a configure of the other distributions into the directory... just run ./autogen.sh, and you'll find a configure. I force-pushed updated the dev/osx branch: OSELAS.Toolchain: http://git.pengutronix.de/?p=mkl/OSELAS.Toolchain.git;a=shortlog;h=refs/heads/dev/osx I tried to build an ARM compiler, but the powerpc needs different hints, but at least the z_relro should be fixed now. please test. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] sdl patch
Robert Schwebel wrote: Can you check this patch? patches/SDL-1.2.13/SDL-1.2.10-sdl-config.in.diff It looks almost ready for upstream, but the first part which just comments out some lines doesn't look right. Let me think. The sdl-config tool has the possibility to set the prefix via command line parameters. However for a third packet calling sdl-config it's hard to figure out which the correct prefix is. In ptxdist sdl-config is installed in sysroot-cross/bin, the third package thinks that sysroot-cross is the prefix. But in ptxdist the correct prefix is sysroot-target/usr. This is why the option to set the prefix is commented out. I think this should be discussed on the sdl list. Cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [ntp] add patch file to fix undefined MOD_NANO
Alexander Stein wrote: Hello Marc, Am Dienstag, 5. Januar 2010 10:22:41 schrieb Marc Kleine-Budde: When did you get this problem? The upcoming ptxdist release will use the latest stable ntp-4.2.6. Did you get this problem with the new version, too? I got this problem based on the commit 550818d56b39528fe5d9d134bebd3c4e82661ca6 aka tag ptxdist-1.99.20. I just tested ntp-4.2.6 from ptxdist commit ee9c22fd9242c80f242007fc759ea85517676a96 and still got the same error, but the lines may have shifted. Ohhh I see...Can you add these lines along with the output of the compiler to the patch ntp-define-fix.patch and the usual From: Subject: and S-o-b line? This may be related to some specific toolchains, due to some defines. I use the Codesourcery Sourcery G++ Lite 2009q3-67 toolchain. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [ntp] Add patch for fixing a undefined MOD_NANO
Marc Kleine-Budde wrote: Alexander Stein wrote: Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com --- patches/ntp-4.2.4p7/Fix-undefined-MOD_NANO.patch | 50 ++ patches/ntp-4.2.4p7/series |1 + 2 files changed, 51 insertions(+), 0 deletions(-) create mode 100644 patches/ntp-4.2.4p7/Fix-undefined-MOD_NANO.patch create mode 100644 patches/ntp-4.2.4p7/series diff --git a/patches/ntp-4.2.4p7/Fix-undefined-MOD_NANO.patch b/patches/ntp-4.2.4p7/Fix-undefined-MOD_NANO.patch new file mode 100644 index 000..5970a89 --- /dev/null +++ b/patches/ntp-4.2.4p7/Fix-undefined-MOD_NANO.patch @@ -0,0 +1,50 @@ +From 4ccca7260da74d8f9a238a79c03da440831bd33e Mon Sep 17 00:00:00 2001 +From: Alexander Stein alexander.st...@systec-electronic.com +Date: Tue, 5 Jan 2010 13:13:02 +0100 +Subject: [PATCH] Fix undefined MOD_NANO + +With gcc version 4.4.1 (Sourcery G++ Lite 2009q3-67) I get this error: + +ntp_loopfilter.c: In function 'local_clock': +ntp_loopfilter.c:571: error: 'MOD_NANO' undeclared (first use in this function) +ntp_loopfilter.c:571: error: (Each undeclared identifier is reported only once +ntp_loopfilter.c:571: error: for each function it appears in.) +ntp_loopfilter.c: In function 'loop_config': +ntp_loopfilter.c:896: error: 'MOD_NANO' undeclared (first use in this function) +make[4]: *** [ntp_loopfilter.o] Error 1 + +Fix it by chaning MOD_NANO to STA_NANO. + +I got this problem based on the commit +550818d56b39528fe5d9d134bebd3c4e82661ca6 aka tag ptxdist-1.99.20. +I just tested ntp-4.2.6 from ptxdist commit +ee9c22fd9242c80f242007fc759ea85517676a96 and still got the same error, but the +lines may have shifted. Doh! I meant the lines about the codesourcery toolchain. I'll fix the patch description tnx, ported to 4.2.6 and commited Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] ptxdist on OS X?
Hello,
Markus Heidt wrote:
host-mpfr.get
checking for __gmpz_init in -lgmp... no
configure: error: libgmp not found or uses a different ABI.
Please read the INSTALL file -- see In case of problem.
make: ***
[/Volumes/Development/cross/OSELAS.Toolchain/platform-powerpc-603e-linux-gnu-gcc-4.3.2-glibc-2.8-binutils-2.18-kernel-2.6.27-sanitized/state/host-mpfr.prepare]
The (not so funny) thing is, that it worked on 10.6. The problem
probably is that gmp has been produced in 64 bit whereas mpfr wants to
link in 32 bitsor the other way round.
A real gross hack would be to create a script with the contents:
#!/bin/bash
declare -a GCC_ARRAY
GCC_ARRAY=( $(type -a -P gcc) )
GCC=${GCC_ARRAY[1]}
exec ${GCC} -m32 $...@}
and copy it to e.g.: /usr/local/bin and put /usr/local/bin: in PATH
before /usr/bin (or whereever gcc lives).
you may have to rebuils the whole toolchain.
cheers, marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] ptxdist on OS X?
Markus Heidt wrote:
Hi Marc,
No improvement.
What I did:
echo $PATH
/usr/local/bin:/sw/bin:/sw/sbin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/usr/local/git/bin:/usr/X11R6/bin
noname:OSELAS.Toolchain markus$ which gcc
/usr/local/bin/gcc
noname:OSELAS.Toolchain markus$ more /usr/local/bin/gcc
#!/bin/bash
declare -a GCC_ARRAY
GCC_ARRAY=( $(type -a -P gcc) )
GCC=${GCC_ARRAY[1]}
exec ${GCC} -m32 $...@}
please try again with -m64 instead of m32
within my ptxdist directory:
make clean
configure
make
sudo make install
that's not needed
Within the OSELAS.Toolchain, which I didn't change.
ptxdist select
ptxconfigs/powerpc-603e-linux-gnu_gcc-4.3.2_glibc-2.8_binutils-2.18_kernel-2.6.27-sanitized.ptxconfig
please do a:
ptxdist clean, then ptxdist go
cheers, Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] ptxdist on OS X?
Markus Heidt wrote: Thanks Stefan and Marc, The -m64 gcc option suggested by Marc worked as well: you can use -m32, too. But you have to rebuild your complete toolchain. I've found a bugzilla where this problem is discussed [1]. But's it's quite long. BTW: with 10.6 you'll run into a problem discussed here. My dev/osx [2] branch contains a patch, though. BTW: I managed to compile a powerpc toolchain on 10.6 but only on a case sensitive filesystem. cheers, Marc [1] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41180 [2] http://git.pengutronix.de/?p=mkl/OSELAS.Toolchain.git;a=shortlog;h=refs/heads/dev/osx -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 48/48] [attr] Fixed series file typo
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de I had to change the .gz file to plain text to provide this patchstack and forgot to fix the series file. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de you probably want to squash this patch Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 42/48] Added .gitignore files for automatic files.
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/.gitignore |1 + scripts/.gitignore |3 +++ scripts/kconfig/.gitignore |7 +++ 3 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 rules/.gitignore create mode 100644 scripts/.gitignore create mode 100644 scripts/kconfig/.gitignore diff --git a/rules/.gitignore b/rules/.gitignore new file mode 100644 index 000..c45e8a2 --- /dev/null +++ b/rules/.gitignore @@ -0,0 +1 @@ +ptxdist-version.in diff --git a/scripts/.gitignore b/scripts/.gitignore new file mode 100644 index 000..f95e377 --- /dev/null +++ b/scripts/.gitignore @@ -0,0 +1,3 @@ +ptxdist_version.sh +lxdialog + diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore new file mode 100644 index 000..7a3f992 --- /dev/null +++ b/scripts/kconfig/.gitignore @@ -0,0 +1,7 @@ +*.o +lex.zconf.c +lkc_defs.h +mconf +zconf.tab.c +conf +lex.backup even without that patch I don't have untracked files in my ptxdist tree. seems to be obsolete. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 37/48] [ppp] Added lzo compression support. Use internal pon/poff commands
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/ppp.in | 27 +-- rules/ppp.make | 18 +++--- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/rules/ppp.in b/rules/ppp.in index 827d500..60e15a0 100644 --- a/rules/ppp.in +++ b/rules/ppp.in @@ -7,6 +7,7 @@ menuconfig PPP select LIBC_DL select LIBC_RESOLV if PPP_PLUGINS select LIBC_CRYPT if PPP_NEEDS_CRYPT + select LIBLZO if PPP_USE_LZO select LIBPCAP if PPP_FILTER select LIBPCAP_IPV6 if PPP_FILTER PPP_IPV6 select OPENSSL if PPP_SRP @@ -32,6 +33,12 @@ config PPP_SUID Makes the pppd binary SUID for ruMakes the pppd binary SUID for Makes the pppd binary SUID for running as a server. +config PPP_USE_LZO + bool Use LZO library for compression + default n + help + FIXME: This item needs to be documented + config PPP_IPV6 bool prompt enable ipv6 support @@ -202,9 +209,25 @@ config PPP_INST_PPPSTATS intervals for a specified PPP interface. config PPP_INST_PONOFF - bool install pon/poff + bool Install pon, poff scripts + help + FIXME: This item needs to be documented + +config PPP_INST_PLOG + bool Install plog script + default n help - FIXME + FIXME: This item needs to be documented + +config PPP_PLUGIN_RP_PPPOE_DISCOVERY + bool Install pppoe-discovery + select PPP_PLUGINS + select PPP_OE + default n + help + FIXME: This item needs to be documented + +comment startup options config PPP_STARTSCRIPT bool diff --git a/rules/ppp.make b/rules/ppp.make index 5d2c384..0752575 100644 --- a/rules/ppp.make +++ b/rules/ppp.make @@ -3,6 +3,7 @@ # Copyright (C) 2003 by Marc Kleine-Budde kleine-bu...@gmx.de for # GYRO net GmbH i...@gyro-net.de, Hannover, Germany # 2008, 2009 by Juergen Beisert juer...@kreuzholzen.de +# 2008, 2009 by Carsten Schlote c.schl...@konzeptpark.de # # See CREDITS for details about who has contributed to this project. # @@ -53,10 +54,14 @@ PPP_MAKE_PAR := NO # PPP_SHARED_INST_PATH := /usr/lib/pppd/$(PPP_VERSION) +ifndef PTXCONF_PPP_USE_LZO +PPP_LZO := --disable-lzo +endif grep shows me no lzo support in ppp, maybe here's a missing a ppp patch + $(STATEDIR)/ppp.prepare: @$(call targetinfo) @cd $(PPP_DIR) $(PPP_PATH) $(PPP_ENV) \ - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc $(PPP_LZO) ifdef PTXCONF_PPP_IPV6 @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y) @@ -209,8 +214,15 @@ ifdef PTXCONF_PPP_INST_PPPSTATS endif ifdef PTXCONF_PPP_INST_PONOFF - @$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/pon) - @$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/poff) + @$(call install_copy, ppp, 0, 0, 0755, \ + $(PPP_DIR)/scripts/pon, /usr/sbin/pon, n) + @$(call install_copy, ppp, 0, 0, 0755, \ + $(PPP_DIR)/scripts/poff, /usr/sbin/poff, n) +endif we already copy pon, poff. With install_alternative you have even the possibility to use them from your BSP. + +ifdef PTXCONF_PPP_INST_PLOG + @$(call install_copy, ppp, 0, 0, 0755, \ + $(PPP_DIR)/scripts/plog, /usr/sbin/plog, n) endif ifdef PTXCONF_PPP_PLUGINS cheers Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 34/48] [nfsutils] Added option to install mount.nfs
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de we already install mount.nfs, seems to be obsolete cheers, Marc Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/nfsutils.in |4 rules/nfsutils.make |5 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/rules/nfsutils.in b/rules/nfsutils.in index a653d22..f315797 100644 --- a/rules/nfsutils.in +++ b/rules/nfsutils.in @@ -107,6 +107,10 @@ config NFSUTILS_INSTALL_SHOWMOUNT bool prompt Install /sbin/showmount +config NFSUTILS_INSTALL_MOUNTNFS + bool + prompt Install /sbin/mount.nfs + config NFSUTILS_INSTALL_STATD bool prompt Install /sbin/statd diff --git a/rules/nfsutils.make b/rules/nfsutils.make index 9bcd68e..aaafd99 100644 --- a/rules/nfsutils.make +++ b/rules/nfsutils.make @@ -144,6 +144,11 @@ ifdef PTXCONF_NFSUTILS_INSTALL_SHOWMOUNT @$(call install_copy, nfsutils, 0, 0, 0755, -, /sbin/showmount) endif +ifdef PTXCONF_NFSUTILS_INSTALL_MOUNTNFS + @$(call install_copy, nfsutils, 0, 0, 0755, \ + -, /sbin/mount.nfs) +endif + ifdef PTXCONF_NFSUTILS_INSTALL_STATD @$(call install_copy, nfsutils, 0, 0, 0755, -, /sbin/rpc.statd) @$(call install_copy, nfsutils, 0, 0, 0755, -, /sbin/start-statd) -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 33/48] [mtd-utils] Some lzo compression fix, more config options
+ifdef PTXCONF_MTD_UTILS_FLASH_OTP_DUMP + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/flash_otp_dump) +endif +ifdef PTXCONF_MTD_UTILS_FLASH_OTP_INFO + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/flash_otp_info) endif ifdef PTXCONF_MTD_UTILS_FLASH_UNLOCK - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/flash_unlock) + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/flash_unlock) endif ifdef PTXCONF_MTD_UTILS_FLASHCP - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/flashcp) + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/flashcp) endif ifdef PTXCONF_MTD_UTILS_FTL_CHECK - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/ftl_check) + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/ftl_check) endif ifdef PTXCONF_MTD_UTILS_FTL_FORMAT - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/ftl_format) + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/ftl_format) endif -ifdef PTXCONF_MTD_UTILS_JFFS2_DUMP - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/jffs2dump) +ifdef PTXCONF_MTD_UTILS_JFFS2DUMP + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/jffs2dump) endif - -ifdef PTXCONF_MTD_UTILS_MTDDEBUG - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/mtd_debug) +ifdef PTXCONF_MTD_UTILS_MKFS.JFFS2 + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/mkfs.jffs2) +endif +ifdef PTXCONF_MTD_UTILS_MTD_DEBUG + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/mtd_debug) endif ifdef PTXCONF_MTD_UTILS_NANDDUMP - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/nanddump) + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/nanddump) +endif +ifdef PTXCONF_MTD_UTILS_NANDTEST + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/nandtest) endif ifdef PTXCONF_MTD_UTILS_NANDWRITE - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/nandwrite) + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/nandwrite) endif ifdef PTXCONF_MTD_UTILS_NFTL_FORMAT - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/nftl_format) + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/nftl_format) endif ifdef PTXCONF_MTD_UTILS_NFTLDUMP - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/nftldump) + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/nftldump) endif -ifdef PTXCONF_MTD_UTILS_MKJFFS2 - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/mkfs.jffs2) +ifdef PTXCONF_MTD_UTILS_RECV_IMAGE + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/recv_image) +endif +ifdef PTXCONF_MTD_UTILS_RFDDUMP + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/rfddump) +endif +ifdef PTXCONF_MTD_UTILS_RFDFORMAT + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/rfdformat) +endif +ifdef PTXCONF_MTD_UTILS_SERVE_IMAGE + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/serve_image) +endif +ifdef PTXCONF_MTD_UTILS_SUMTOOL + @$(call install_copy, mtd-utils, 0, 0, 0755, -, /usr/sbin/sumtool) endif ifdef PTXCONF_MTD_UTILS_SUMTOOL @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ @@ -172,6 +208,23 @@ ifdef PTXCONF_MTD_UTILS_UBINIZE @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/ubinize) endif +ifdef PTXCONF_MTD_UTILS_UBICRC32_PL + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/ubicrc32.pl) +endif +ifdef PTXCONF_MTD_UTILS_UBIGEN + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/ubigen) +endif +ifdef PTXCONF_MTD_UTILS_UBIMIRROR + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/ubimirror) +endif +ifdef PTXCONF_MTD_UTILS_UNUBI + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/unubi) +endif + ifdef PTXCONF_MTD_UTILS_MTDINFO @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/mtdinfo) -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 31/48] [libsysfs] Added option to install systool
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de applied, cheers, Marc --- rules/libsysfs.in | 15 ++- rules/libsysfs.make |4 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/rules/libsysfs.in b/rules/libsysfs.in index 501410d..399435d 100644 --- a/rules/libsysfs.in +++ b/rules/libsysfs.in @@ -1,6 +1,6 @@ ## SECTION=system_libraries -config LIBSYSFS +menuconfig LIBSYSFS tristate prompt libsysfs help @@ -8,3 +8,16 @@ config LIBSYSFS provides a tree of system devices. libsysfs provides a stable programming interface to sysfs and eases querying system devices and their attributes. + +if LIBSYSFS + +config LIBSYSFS_SYSTOOL + bool + prompt install sysfs systool + help + Enable this tio get the program 'systool' + to query sysfs entries: it can list devices + by bus, class, and topology. + +endif + diff --git a/rules/libsysfs.make b/rules/libsysfs.make index 123a304..f12eabc 100644 --- a/rules/libsysfs.make +++ b/rules/libsysfs.make @@ -64,6 +64,10 @@ $(STATEDIR)/libsysfs.targetinstall: @$(call install_link, libsysfs, libsysfs.so.2.0.1, /usr/lib/libsysfs.so.2) @$(call install_link, libsysfs, libsysfs.so.2.0.1, /usr/lib/libsysfs.so) +ifdef PTXCONF_LIBSYSFS_SYSTOOL + @$(call install_copy, libsysfs, 0, 0, 0775, -, /usr/bin/systool) +endif + @$(call install_finish, libsysfs) @$(call touch) -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 30/48] [gettext] Updated to version 0.17
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/gettext.make |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/gettext.make b/rules/gettext.make index ec4e3d1..65b3d59 100644 --- a/rules/gettext.make +++ b/rules/gettext.make @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_GETTEXT) += gettext # # Paths and names # -GETTEXT_VERSION := 0.16.1 +GETTEXT_VERSION := 0.17 the last time I tried this, it broke compilation on arm. please check GETTEXT := gettext-$(GETTEXT_VERSION) GETTEXT_SUFFIX := tar.gz GETTEXT_URL := $(PTXCONF_SETUP_GNUMIRROR)/gettext/$(GETTEXT).$(GETTEXT_SUFFIX) cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 28/48] [procps] Added installation of alternative /etc/sysctl.conf
carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de applied, tnx marc --- generic/etc/sysctl.conf |4 rules/procps.make |2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) create mode 100644 generic/etc/sysctl.conf diff --git a/generic/etc/sysctl.conf b/generic/etc/sysctl.conf new file mode 100644 index 000..b10c21d --- /dev/null +++ b/generic/etc/sysctl.conf @@ -0,0 +1,4 @@ +# +# /etc/sysctl.conf - Configuration file for setting system variables +# See sysctl.conf (5) for information. +# diff --git a/rules/procps.make b/rules/procps.make index 57f8fdb..403714b 100644 --- a/rules/procps.make +++ b/rules/procps.make @@ -90,6 +90,8 @@ endif ifdef PTXCONF_PROCPS_SYSCTL @$(call install_copy, procps, 0, 0, 0755, -, \ /sbin/sysctl) + + @$(call install_alternative, procps, 0, 0, 0644, /etc/sysctl.conf, n) endif ifdef PTXCONF_PROCPS_PS @$(call install_copy, procps, 0, 0, 0755, -, \ -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 25/48] [openvpn] Added OpenVPN 2.0.9
, openvpn,DESCRIPTION,missing) + + @$(call install_copy, openvpn, 0, 0, 0755, $(OPENVPN_DIR)/openvpn, /usr/sbin/openvpn) please use - as source + + @$(call install_copy, openvpn, 0, 0, 0755, /etc/openvpn) + + @$(call install_finish, openvpn) + + @$(call touch) + +# +# Clean +# + +openvpn_clean: + rm -rf $(STATEDIR)/openvpn.* + rm -rf $(PKGDIR)/openvpn_* + rm -rf $(OPENVPN_DIR) + +# vim: syntax=make + please try to provide some startup scripts and a config file template. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 24/48] [miredo] Added miredo 1.2.2
+# + +MIREDO_PATH := PATH=$(CROSS_PATH) +MIREDO_ENV := $(CROSS_ENV) + +# +# autoconf +# +MIREDO_AUTOCONF := $(CROSS_AUTOCONF_USR) \ + --localstatedir=/var \ + --without-Judy + +$(STATEDIR)/miredo.prepare: + @$(call targetinfo) + @$(call clean, $(MIREDO_DIR)/config.cache) + @cd $(MIREDO_DIR) \ + $(MIREDO_PATH) $(MIREDO_ENV) \ + ./configure $(MIREDO_AUTOCONF) + @$(call touch) please remove that rule + +# +# Compile +# + +$(STATEDIR)/miredo.compile: + @$(call targetinfo) + cd $(MIREDO_DIR) $(MIREDO_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch) please remove that rule + +# +# Install +# + +$(STATEDIR)/miredo.install: + @$(call targetinfo) + @$(call install, MIREDO) + @$(call touch) please remove that rule + +# +# Target-Install +# + +$(STATEDIR)/miredo.targetinstall: + @$(call targetinfo) + + @$(call install_init, miredo) + @$(call install_fixup, miredo,PACKAGE,miredo) + @$(call install_fixup, miredo,PRIORITY,optional) + @$(call install_fixup, miredo,VERSION,$(MIREDO_VERSION)) + @$(call install_fixup, miredo,SECTION,base) + @$(call install_fixup, miredo,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) + @$(call install_fixup, miredo,DEPENDS,) + @$(call install_fixup, miredo,DESCRIPTION,missing) + + # -- Library section + + @$(call install_copy, miredo, 0, 0, 0644, -, /usr/lib/libteredo.so.5.0.0) + @$(call install_link, miredo, libteredo.so.5.0.0, /usr/lib/libteredo.so.5) + + @$(call install_copy, miredo, 0, 0, 0644, -, /usr/lib/libtun6.so.0.1.1) + @$(call install_link, miredo, libtun6.so.0.1.1, /usr/lib/libtun6.so.0.1) + @$(call install_link, miredo, libtun6.so.0.1.1, /usr/lib/libtun6.so.0) + + @$(call install_copy, miredo, 0, 0, 0755, -, /usr/lib/miredo/miredo-privproc) + + # -- Executables + + @$(call install_copy, miredo, 0, 0, 0755, -, /usr/bin/teredo-mire) + + @$(call install_copy, miredo, 0, 0, 0755, -, /usr/sbin/miredo) + @$(call install_copy, miredo, 0, 0, 0755, -, /usr/sbin/miredo-server) + @$(call install_copy, miredo, 0, 0, 0755, -, /usr/sbin/miredo-checkconf) + + # -- Configs + + @$(call install_copy, miredo, 0, 0, 0755, -, /etc/miredo/client-hook) + @$(call install_copy, miredo, 0, 0, 0644, -, /etc/miredo/miredo.conf) + + @$(call install_copy, miredo, 0, 0, 0644, $(MIREDO_DIR)/misc/miredo-server.conf, /etc/miredo/miredo-server.conf) please consider copying miredo-server.conf to generic/etc and use install_alternative, here + + #...@$(call install_alternate, miredo, 0, 0, 0644, /etc/init.d/miredo-server, n) + + @$(call install_finish, miredo) + + @$(call touch) + + +# +# Clean +# + +miredo_clean: + rm -rf $(STATEDIR)/miredo.* + rm -rf $(PKGDIR)/miredo_* + rm -rf $(MIREDO_DIR) + +# vim: syntax=make -- ptxdist mailing list ptxdist@pengutronix.de cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 14/48] [attr] Added packet for libattr.so and tools.
: ++install install-dev install-lib: ++endif ++ + include $(BUILDRULES) +Index: attr-2.4.44/include/Makefile +=== +--- attr-2.4.44.orig/include/Makefile2009-07-31 11:02:14.0 +0200 attr-2.4.44/include/Makefile 2009-12-15 17:41:11.0 +0100 +@@ -33,7 +33,7 @@ + include $(BUILDRULES) + + install-dev: default +-$(INSTALL) -m 755 -d $(PKG_INC_DIR) +-$(INSTALL) -m 644 $(INST_HFILES) $(PKG_INC_DIR) ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR) ++$(INSTALL) -m 644 $(INST_HFILES) $(DESTDIR)$(PKG_INC_DIR) + + install install-lib: diff --git a/patches/attr-2.4.44/series b/patches/attr-2.4.44/series index 0785744..ba0adef 100644 --- a/patches/attr-2.4.44/series +++ b/patches/attr-2.4.44/series @@ -1,4 +1,3 @@ - - - +attr_2.4.44-1.diff.gz fix-buildsystem.diff + diff --git a/rules/attr.in b/rules/attr.in index 4e4fa56..6bc8d69 100644 --- a/rules/attr.in +++ b/rules/attr.in @@ -11,8 +11,14 @@ menuconfig ATTR http://acl.bestbits.at/ +config ATTR_SHARED +bool +depends on ATTR +prompt Install shared lib + config ATTR_GETTEXT bool depends on ATTR + default y why should this be the default? prompt gettext support diff --git a/rules/attr.make b/rules/attr.make index b78c61c..dcb42ea 100644 --- a/rules/attr.make +++ b/rules/attr.make @@ -23,6 +23,8 @@ ATTR_SOURCE := $(SRCDIR)/$(ATTR).src.$(ATTR_SUFFIX) ATTR_DIR := $(BUILDDIR)/$(ATTR) ATTR_URL := \ + http://mirrors.zerg.biz/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ + http://mirror.dknss.com/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/cmd_tars-oct_09/$(ATTR).src.$(ATTR_SUFFIX) @@ -42,6 +44,7 @@ $(ATTR_SOURCE): ATTR_PATH:= PATH=$(CROSS_PATH) ATTR_ENV := \ $(CROSS_ENV) \ + DESTDIR=$(PKGDIR)/$(ATTR) \ LIBTOOL=$(PTXCONF_SYSROOT_CROSS)/bin/libtool # @@ -49,7 +52,13 @@ ATTR_ENV := \ # ATTR_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --disable-shared + --libexecdir=/usr/lib + +ifdefPTXCONF_ATTR_SHARED +ATTR_AUTOCONF += --enable-shared +else +ATTR_AUTOCONF += --disable-shared +endif ifdef PTXCONF_ATTR_GETTEXT ATTR_AUTOCONF += --enable-gettext @@ -58,6 +67,15 @@ ATTR_AUTOCONF += --disable-gettext endif # +# Install +# + +$(STATEDIR)/attr.install: + @$(call targetinfo) + @$(call install, ATTR) + @$(call touch) + +# # Target-Install # @@ -77,6 +95,12 @@ $(STATEDIR)/attr.targetinstall: @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/setfattr) @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/getfattr) +ifdefPTXCONF_ATTR_SHARED + @$(call install_copy, attr, 0, 0, 0644, -, /usr/lib/libattr.so.1.1.0) + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so.1) + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so) +endif + @$(call install_finish, attr) @$(call touch) -- ptxdist mailing list ptxdist@pengutronix.de cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 13/48] [acl] Added packet for libacl.so and tools.
+ +# +# Install +# + +#$(STATEDIR)/acl.install: +#@$(call targetinfo) +#cd $(ACL_DIR) $(ACL_PATH) $(ACL_ENV) $(MAKE) $(ATTR_MVAR) $(BROKEN_PARALLELMFLAGS) install +# +#$(call install, ACL,,h) +# +#mkdir -p $(SYSROOT)/usr/include/ +#cp $(PKGDIR)/$(ACL)/usr/include/sys/acl.h $(SYSROOT)/usr/include/sys +#cp $(PKGDIR)/$(ACL)/usr/include/acl $(SYSROOT)/usr/include -R +#mkdir -p $(SYSROOT)/usr/lib/ +#cp $(PKGDIR)/$(ACL)/usr/lib/libacl*.so $(SYSROOT)/usr/lib/ +# +#mkdir -p $(PTXCONF_SYSROOT_CROSS)/usr/include/ +#cp $(PKGDIR)/$(ACL)/usr/include/sys/acl.h $(PTXCONF_SYSROOT_CROSS)/usr/include/sys +#cp $(PKGDIR)/$(ACL)/usr/include/acl $(PTXCONF_SYSROOT_CROSS)/usr/include -R +#mkdir -p $(PTXCONF_SYSROOT_CROSS)/usr/lib/ +#cp $(PKGDIR)/$(ACL)/usr/lib/libacl*.so $(PTXCONF_SYSROOT_CROSS)/usr/lib/ +# +#@$(call touch) please remove that rule + + +# +# Target-Install +# + +$(STATEDIR)/acl.targetinstall: + @$(call targetinfo) + + @$(call install_init, acl) + @$(call install_fixup, acl,PACKAGE,acl) + @$(call install_fixup, acl,PRIORITY,optional) + @$(call install_fixup, acl,VERSION,$(ACL_VERSION)) + @$(call install_fixup, acl,SECTION,base) + @$(call install_fixup, acl,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) + @$(call install_fixup, acl,DEPENDS,) + @$(call install_fixup, acl,DESCRIPTION,missing) + + @$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/chacl) + @$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/setfacl) + @$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/getfacl) + +ifdefPTXCONF_ACL_SHARED + @$(call install_copy, acl, 0, 0, 0644, -, /usr/lib/libacl.so.1.1.0) + @$(call install_link, acl, libacl.so.1.1.0, /usr/lib/libacl.so.1) + @$(call install_link, acl, libacl.so.1.1.0, /usr/lib/libacl.so) +endif + + @$(call install_finish, acl) + + @$(call touch) + +# +# Clean +# + +acl_clean: + rm -rf $(STATEDIR)/acl.* + rm -rf $(PKGDIR)/acl_* + rm -rf $(ACL_DIR) + +# vim: syntax=make cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 28/48] [procps] Added installation of alternative /etc/sysctl.conf
Ladislav Michl wrote: On Thu, Jan 07, 2010 at 09:28:07PM +0100, Marc Kleine-Budde wrote: carsten.schl...@gmx.net wrote: From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de applied, tnx As newer kernels emulates binary interface we probably do not want to support obsolete interfaces, right? http://lwn.net/Articles/361001/ Kernel help says: | CONFIG_SYSCTL_SYSCALL: | | | | sys_sysctl uses binary paths that have been found challenging | | to properly maintain and use. The interface in /proc/sys | | using paths with ascii names is now the primary path to this | | information. | | | | Almost nothing using the binary sysctl interface so if you are | | trying to save some space it is probably safe to disable this, | | making your kernel marginally smaller. ... and your system will get even smaller without sysctl binary. Btw, 'sysctl' branch was merged 24 Dec 2009. Some people can really enjoy Christmas ;-) luckily, I haven't pushed that commit not yet. :) However it's probably interesting for olther kernels than the latest -rc :) Carsten can you please add a notice to PTXCONF_PROCPS_SYSCTL's helptext stating that this is a deprecated interface. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Busybox build error
Rene Huber wrote:
Using ptxdist-2010.01.0 I get the busybox build error shown below.
It looks like the binary does not get renamed by the new dummy-strip.
In my case the target system is x86 and I don't use any cross compiler,
perhaps the host strip does need to leak through here.
CC util-linux/umount.o
AR util-linux/lib.a
LINKbusybox_unstripped
Trying libraries: crypt m
Library crypt is not needed, excluding it
Library m is not needed, excluding it
Final link with: none
ptxdist: Discarding 'strip -s --remove-section=.note -remove-section=.comment
busybox_unstripped -o busybox'
the dummy strip does not support -o that's a bug, but why doesn't this show
up here?
ahh...now I get it.
you don't use any cross compiler so busybox will use strip which is dummy
strip now. we use a cross compiler busybox is cross-aware and will use
$CROSS_COMPILE-strip, which will work, of course.
chmod: cannot access `busybox': No such file or directory
make[1]: *** [busybox] Error 1
make[1]: Leaving directory `/home/rhuber/test/build-target/busybox-1.15.2'
make: *** [/home/rhuber/test/state/busybox.compile] Error 2
cheers, Marc
please try the attached patch:
---
From d90e885ac877b8a4037d7ab138cc4aaf8230072f Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde m...@pengutronix.de
Date: Fri, 8 Jan 2010 15:27:28 +0100
Subject: [PATCH] [dummy-strip] add support for -o option
Compiling busybox without a CROSS_COMPILE defined, which is a valid use
case, busybox will use strip for stripping. Since commit
b0b990da3d10efe6368004408649bd3b35fd0b47 we have a dummy strip installed
to SYSROOT_CROSS. This command does nothing.
However busybox uses strip input -o output during strip, to create
the stripped variant. Our dummy strip doens't support the '-o' option.
This is why busybox fails withs:
ptxdist: Discarding 'strip -s --remove-section=.note
-remove-section=.comment busybox_unstripped -o busybox'
This patch add support for '-o' to strip.
Reported-by: Rene Huber renehub...@netscape.net
Signed-off-by: Marc Kleine-Budde m...@pengutronix.de
CC: Wolfram Sang w.s...@pengutronix.de
---
scripts/dummy-strip.sh | 33 ++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/scripts/dummy-strip.sh b/scripts/dummy-strip.sh
index 21d2eb6..05e58c8 100644
--- a/scripts/dummy-strip.sh
+++ b/scripts/dummy-strip.sh
@@ -1,11 +1,38 @@
-#! /bin/sh
-# dummy-strip.sh for PTXdist - Copyright (C) 2009 by Wolfram Sang
+#!/bin/bash
+#
+# dummy-strip.sh for ptxdist - Copyright (C) 2009 by Wolfram Sang
+#2010 by Marc Kleine-Budde
#
# This scripts gets installed into the cross-environment as a 'dummy'-strip
# program. As programs like 'install -s' just call 'strip', this prevents
# leaking in of the host-version of strip. Also, it does intentionally
# nothing as we want to strip at a later stage.
#
+
echo ptxdist: Discarding 'strip $*'
-exit 0
+unset output
+unset input
+
+while [ ${#} -ne 0 ]; do
+arg=${1}
+shift
+
+case ${arg} in
+ -o)
+ output=${1}
+ shift
+ ;;
+ -*)
+ ;;
+ *)
+ input=${arg}
+ ;;
+esac
+done
+
+if [ -n ${output} ]; then
+cp ${input} ${output} || exit
+fi
+
+exit 0
--
1.6.5.7
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] Busybox build error
Wolfram Sang wrote: However busybox uses strip input -o output during strip, to create the stripped variant. Our dummy strip doens't support the '-o' option. This is why busybox fails withs: ptxdist: Discarding 'strip -s --remove-section=.note -remove-section=.comment busybox_unstripped -o busybox' This patch add support for '-o' to strip. Hmm, that means we have a stripped binary when not using cross-toolchains and an unstripped one if using the host-toolchain. I wouldn't say this is a show-stopper, but maybe we can additionally convince busybox to not strip? And then strip ourselves at the targetinstall stage as usual? Yes, that should be possilbe. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/3] [attr] Added packet for libattr.so and tools.
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de This target build is required for other target tools or for included attr control functions. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/attr.in |7 ++- rules/attr.make | 26 -- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/rules/attr.in b/rules/attr.in index 4e4fa56..196df22 100644 --- a/rules/attr.in +++ b/rules/attr.in @@ -5,12 +5,17 @@ menuconfig ATTR select HOST_GETTEXT if ATTR_GETTEXT prompt attr help - This is the extended attributes project for the ext2 and ext3 filesystems. For reference, have a look at the project homepage: http://acl.bestbits.at/ +config ATTR_SHARED + bool + depends on ATTR + default y + prompt Install shared lib + config ATTR_GETTEXT bool depends on ATTR diff --git a/rules/attr.make b/rules/attr.make index b78c61c..bb003a3 100644 --- a/rules/attr.make +++ b/rules/attr.make @@ -23,6 +23,8 @@ ATTR_SOURCE := $(SRCDIR)/$(ATTR).src.$(ATTR_SUFFIX) ATTR_DIR := $(BUILDDIR)/$(ATTR) ATTR_URL := \ + http://mirrors.zerg.biz/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ + http://mirror.dknss.com/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/$(ATTR).src.$(ATTR_SUFFIX) \ ftp://oss.sgi.com/projects/xfs/cmd_tars-oct_09/$(ATTR).src.$(ATTR_SUFFIX) @@ -49,7 +51,13 @@ ATTR_ENV := \ # ATTR_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --disable-shared + --libexecdir=/usr/lib does it actually install something to libexecdir? IMHO it should be /usr/lib/package or /usr/bin + +ifdefPTXCONF_ATTR_SHARED +ATTR_AUTOCONF += --enable-shared +else +ATTR_AUTOCONF += --disable-shared +endif ifdef PTXCONF_ATTR_GETTEXT ATTR_AUTOCONF += --enable-gettext @@ -58,6 +66,15 @@ ATTR_AUTOCONF += --disable-gettext endif # +# Install +# + +$(STATEDIR)/attr.install: + @$(call targetinfo) + @$(call install, ATTR) + @$(call touch) please remove that rule + +# # Target-Install # @@ -77,6 +94,11 @@ $(STATEDIR)/attr.targetinstall: @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/setfattr) @$(call install_copy, attr, 0, 0, 0755, -, /usr/bin/getfattr) +ifdefPTXCONF_ATTR_SHARED + @$(call install_copy, attr, 0, 0, 0644, -, /usr/lib/libattr.so.1.1.0) + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so.1) + @$(call install_link, attr, libattr.so.1.1.0, /usr/lib/libattr.so) +endif @$(call install_finish, attr) @$(call touch) @@ -87,7 +109,7 @@ $(STATEDIR)/attr.targetinstall: attr_clean: rm -rf $(STATEDIR)/attr.* - rm -rf $(PKGDIR)/attr_* + rm -rf $(ATTR_PKGDIR)/* rm -rf $(ATTR_DIR) # vim: syntax=make otherwise it looks good Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] [attr] Added additional patches for ATTR
2010-01-08 15:37:20.0 +0100 +@@ -89,9 +89,11 @@ + $(MAKE) $(AM_MAKEFLAGS) include/builddefs; \ + fi + +-install: default $(addsuffix -install,$(SUBDIRS)) +-$(INSTALL) -m 755 -d $(PKG_DOC_DIR) +-$(INSTALL) -m 644 README $(PKG_DOC_DIR) ++install: install-bin install-dev install-lib ++ ++install-bin: default $(addsuffix -install,$(SUBDIRS)) ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR) ++$(INSTALL) -m 644 README $(DESTDIR)$(PKG_DOC_DIR) + + install-dev: default $(addsuffix -install-dev,$(SUBDIRS)) + +Index: attr-2.4.44/attr/Makefile +=== +--- attr-2.4.44.orig/attr/Makefile 2009-07-31 11:02:14.0 +0200 attr-2.4.44/attr/Makefile2010-01-08 15:37:20.0 +0100 +@@ -29,6 +29,6 @@ + include $(BUILDRULES) + + install: default +-$(INSTALL) -m 755 -d $(PKG_BIN_DIR) +-$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR) ++$(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR) + install-dev install-lib: +Index: attr-2.4.44/doc/Makefile +=== +--- attr-2.4.44.orig/doc/Makefile2009-07-31 11:02:14.0 +0200 attr-2.4.44/doc/Makefile 2010-01-08 15:37:20.0 +0100 +@@ -32,12 +32,12 @@ + + install: default + $(SUBDIRS_MAKERULE) +-$(INSTALL) -m 755 -d $(PKG_DOC_DIR) +-$(INSTALL) -m 644 PORTING CHANGES.gz $(PKG_DOC_DIR) ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR) ++$(INSTALL) -m 644 PORTING CHANGES.gz $(DESTDIR)$(PKG_DOC_DIR) + ifeq ($(PKG_DISTRIBUTION), debian) + $(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz + else +-$(INSTALL) -m 644 COPYING $(PKG_DOC_DIR) ++$(INSTALL) -m 644 COPYING $(DESTDIR)$(PKG_DOC_DIR) + endif + + install-dev install-lib: $(SUBDIRS) +Index: attr-2.4.44/getfattr/Makefile +=== +--- attr-2.4.44.orig/getfattr/Makefile 2009-07-31 11:02:14.0 +0200 attr-2.4.44/getfattr/Makefile2010-01-08 15:37:20.0 +0100 +@@ -30,6 +30,6 @@ + include $(BUILDRULES) + + install: default +-$(INSTALL) -m 755 -d $(PKG_BIN_DIR) +-$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR) ++$(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR) + install-dev install-lib: +Index: attr-2.4.44/setfattr/Makefile +=== +--- attr-2.4.44.orig/setfattr/Makefile 2009-07-31 11:02:14.0 +0200 attr-2.4.44/setfattr/Makefile2010-01-08 15:37:20.0 +0100 +@@ -30,6 +30,6 @@ + include $(BUILDRULES) + + install: default +-$(INSTALL) -m 755 -d $(PKG_BIN_DIR) +-$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR) ++$(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR) + install-dev install-lib: +Index: attr-2.4.44/man/Makefile +=== +--- attr-2.4.44.orig/man/Makefile2009-07-31 11:02:14.0 +0200 attr-2.4.44/man/Makefile 2010-01-08 15:37:20.0 +0100 +@@ -21,6 +21,7 @@ + + SUBDIRS = man1 man2 man3 man5 + ++ifeq ($(PKG_DISTRIBUTION), debian) + default : $(SUBDIRS) + + install : $(addsuffix -install,$(SUBDIRS)) +@@ -38,4 +39,9 @@ + %-install-lib: + $(MAKE) -C $* install-lib + ++else ++default: ++install install-dev install-lib: ++endif ++ + include $(BUILDRULES) +Index: attr-2.4.44/include/Makefile +=== +--- attr-2.4.44.orig/include/Makefile2009-07-31 11:02:14.0 +0200 attr-2.4.44/include/Makefile 2010-01-08 15:37:20.0 +0100 +@@ -33,7 +33,7 @@ + include $(BUILDRULES) + + install-dev: default +-$(INSTALL) -m 755 -d $(PKG_INC_DIR) +-$(INSTALL) -m 644 $(INST_HFILES) $(PKG_INC_DIR) ++$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR) ++$(INSTALL) -m 644 $(INST_HFILES) $(DESTDIR)$(PKG_INC_DIR) + + install install-lib: diff --git a/patches/attr-2.4.44/series b/patches/attr-2.4.44/series index 0785744..4e0e3b5 100644 --- a/patches/attr-2.4.44/series +++ b/patches/attr-2.4.44/series @@ -1,4 +1,2 @@ - - - fix-buildsystem.diff +fix-buildsystem-additions.diff does this patch collide with the previous one? cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/3] [host-attr] Added host compile for libattr.so and headers
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools, e.g. e2fstools or other host tools which need to care about xattr on filesystems. applied, tnx Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-attr.in |2 + rules/host-attr.make | 61 ++ 2 files changed, 63 insertions(+), 0 deletions(-) create mode 100644 rules/host-attr.make diff --git a/rules/host-attr.in b/rules/host-attr.in index 4cf5ed8..ced71aa 100644 --- a/rules/host-attr.in +++ b/rules/host-attr.in @@ -2,3 +2,5 @@ config HOST_ATTR tristate + help + FIXME diff --git a/rules/host-attr.make b/rules/host-attr.make new file mode 100644 index 000..0227aa9 --- /dev/null +++ b/rules/host-attr.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Carsten Schlote c.schl...@konzeptpark.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_ATTR) += host-attr + +# +# Paths and names +# +HOST_ATTR_DIR= $(HOST_BUILDDIR)/$(ATTR) + +# +# Get +# + +$(STATEDIR)/host-attr.get: $(STATEDIR)/attr.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-attr.extract: + @$(call targetinfo) + @$(call clean, $(HOST_ATTR_DIR)) + @$(call extract, ATTR, $(HOST_BUILDDIR)) + @$(call patchin, ATTR, $(HOST_ATTR_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_ATTR_PATH := PATH=$(HOST_PATH) +HOST_ATTR_ENV:= $(HOST_ENV) + +# +# autoconf +# +HOST_ATTR_AUTOCONF := $(HOST_AUTOCONF) + + +# +# Clean +# + +host-attr_clean: + rm -rf $(STATEDIR)/host-attr.* + rm -rf $(HOST_ATTR_DIR) + +# vim: syntax=make -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [miredo][v2] Added miredo 1.2.2
) + + +# +# Clean +# + +miredo_clean: + rm -rf $(STATEDIR)/miredo.* + rm -rf $(PKGDIR)/miredo_* + rm -rf $(MIREDO_DIR) + +# vim: syntax=make -- ptxdist mailing list ptxdist@pengutronix.de cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [miredo][v2] Added miredo 1.2.2
Carsten Schlote wrote: The dummy patch is required to keep 'patchin' working, otherwise the build stops. damn, no autogen.sh without a patch? No, the patchin macro stalls and refuses to continue due to empty patch, even without any patch or series file. Just the default autogen.sh script was linked. The dummy script fixes this problem for now. patchin bug/unexpected behaviour? rather unexpected and thus a bug please add that comment to the dummy patch Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 30/48] [gettext] Updated to version 0.17
'__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:240: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:244: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:248: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:253: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:256: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:261: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:266: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:271: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:276: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:281: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:290: error: expected ')' before '__wc' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:299: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'towlower_l' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:302: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'towupper_l' /opt/OSELAS.Toolchain-1.99.3/arm-1136jfs-linux-gnueabi/gcc-4.3.2-glibc-2.8-binutils-2.19-kernel-2.6.27-sanitized/bin/../sysroot-arm-1136jfs-linux-gnueabi/usr/include/wctype.h:310: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'towctrans_l' In file included from mbchar.c:22: mbchar.h:239: error: expected ')' before 'wc' make[5]: Leaving directory `/home/frogger/pengutronix/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-ARM-reference/build-target/gettext-0.17/gettext-runtime/gnulib-lib' make[5]: *** [mbchar.o] Error 1 -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [miredo][v2] Added miredo 1.2.2
Carsten Schlote wrote: The dummy script fixes this problem for now. patchin bug/unexpected behaviour? rather unexpected and thus a bug please add that comment to the dummy patch I tried, but this causes patchin to stop due to garbadge in patch file? even with hashes in the beginning? # # is this really a comment? # Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] [attr] Patches for build fixes.
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Somehow the build still breaks. Reworked previous patch and added more fixes. I've reduced the patch to a minimum. please pull and try if it works for you, too. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [openvpn][v2] Added OpenVPN 2.0.9
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Added simple to use VPN packet. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/openvpn.in | 22 + rules/openvpn.make | 88 2 files changed, 110 insertions(+), 0 deletions(-) create mode 100644 rules/openvpn.in create mode 100644 rules/openvpn.make diff --git a/rules/openvpn.in b/rules/openvpn.in new file mode 100644 index 000..5c6fe69 --- /dev/null +++ b/rules/openvpn.in @@ -0,0 +1,22 @@ +## SECTION=networking here a blank line, please +menuconfig OPENVPN + tristate + default n default n is default, please remove + prompt OpenVPN please all lowercase + select OPENSSL + select LIBLZO if OPENVPN_LZO +help + This adds OpenVPN to your root filesystem. Plain vanilla + packet. + +if OPENVPN + +config OPENVPN_LZO + bool + prompt Enable LZO compression + help +This enables the LZO compression code. Selecting this option +will select the LZO library as well. +If unsure, say N. + +endif diff --git a/rules/openvpn.make b/rules/openvpn.make new file mode 100644 index 000..5179af5 --- /dev/null +++ b/rules/openvpn.make @@ -0,0 +1,88 @@ +# -*-makefile-*- +# $Id: template 6655 2007-01-02 12:55:21Z rsc $ please remove that line +# +# Copyright (C) 2007 by Carsten Schlote c.schl...@konzeptpark.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 +# +PACKAGES-$(PTXCONF_OPENVPN) += openvpn + +# +# Paths and names +# +OPENVPN_VERSION := 2.0.9 +OPENVPN := openvpn-$(OPENVPN_VERSION) +OPENVPN_SUFFIX := tar.gz +OPENVPN_URL := http://openvpn.net/release/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_DIR := $(BUILDDIR)/$(OPENVPN) + + +# +# Get +# + +$(OPENVPN_SOURCE): + @$(call targetinfo, $@) + @$(call get, OPENVPN) + +# +# Prepare +# + +OPENVPN_PATH := PATH=$(CROSS_PATH) +OPENVPN_ENV := $(CROSS_ENV) + +# +# autoconf +# +OPENVPN_AUTOCONF := $(CROSS_AUTOCONF_USR) + +ifdef PTXCONF_OPENVPN_LZO +OPENVPN_LZO := --enable-lzo +else +OPENVPN_LZO := --disable-lzo +endif + +# +# Target-Install +# + +$(STATEDIR)/openvpn.targetinstall: + @$(call targetinfo) + + @$(call install_init, openvpn) + @$(call install_fixup, openvpn,PACKAGE,openvpn) + @$(call install_fixup, openvpn,PRIORITY,optional) + @$(call install_fixup, openvpn,VERSION,$(OPENVPN_VERSION)) + @$(call install_fixup, openvpn,SECTION,base) + @$(call install_fixup, openvpn,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) + @$(call install_fixup, openvpn,DEPENDS,) + @$(call install_fixup, openvpn,DESCRIPTION,missing) + + @$(call install_copy, openvpn, 0, 0, 0755, -, /usr/sbin/openvpn) + + @$(call install_copy, openvpn, 0, 0, 0755, /etc/openvpn) + + @$(call install_finish, openvpn) + + @$(call touch) + +# +# Clean +# + +openvpn_clean: + rm -rf $(STATEDIR)/openvpn.* + rm -rf $(OPENVPN_PKGDIR)/* + rm -rf $(OPENVPN_DIR) + +# vim: syntax=make + some startscripts would be nice. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [miredo][v2] Added miredo 1.2.2
Carsten Schlote wrote: even with hashes in the beginning? # # is this really a comment? # :-) Yes, of course :-) crap Marc, okay thena comment to the series file -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/3] [mtd-utils] Selects HOST_MTD_UTILS, more configs
Carsten Schlote wrote: -Ursprüngliche Nachricht- Von: ptxdist-boun...@pengutronix.de [mailto:ptxdist- boun...@pengutronix.de] Im Auftrag von Marc Kleine-Budde Gesendet: Freitag, 8. Januar 2010 20:19 An: ptxdist@pengutronix.de Betreff: Re: [ptxdist] [PATCH 1/3] [mtd-utils] Selects HOST_MTD_UTILS, more configs Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de This patch adds config options for the remaining MTD utils. As we need to build images, we also select the host mtd utils I don't see why mtd-utils needs the host mtd-utils? Hmm, good question and I think there was a reason one year ago or so. The host tools should be selected by the image options. Just the LZO flag should be cloned, if set for the target. we just build LZO support for the host unconditionally. imagine a rather small image where you don't have mts-utils on the target. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/2] [acl][v3] Added packet for libacl.so and acl tools.
) + + @$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/chacl) + @$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/setfacl) + @$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/getfacl) + +ifdefPTXCONF_ACL_SHARED + @$(call install_copy, acl, 0, 0, 0644, -, /usr/lib/libacl.so.1.1.0) + @$(call install_link, acl, libacl.so.1.1.0, /usr/lib/libacl.so.1) + @$(call install_link, acl, libacl.so.1.1.0, /usr/lib/libacl.so) +endif + + @$(call install_finish, acl) + + @$(call touch) + +# +# Clean +# + +acl_clean: + rm -rf $(STATEDIR)/acl.* + rm -rf $(ACL_PKGDIR)/* + rm -rf $(ACL_DIR) + +# vim: syntax=make -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] [host-acl][v3] Added host compile for libacl.so and headers
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de This local build is required for other local build tools, e.g. the e2fsprogs or other stuff needed ACL support for filesystems on the host side. The host-libacl.in file has no .make file to delete. tnx, applied with minor changes Marc Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-acl.in|7 + rules/host-acl.make | 60 ++ rules/host-libacl.in |5 3 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 rules/host-acl.in create mode 100644 rules/host-acl.make delete mode 100644 rules/host-libacl.in diff --git a/rules/host-acl.in b/rules/host-acl.in new file mode 100644 index 000..7023b7e --- /dev/null +++ b/rules/host-acl.in @@ -0,0 +1,7 @@ +## SECTION=hosttools_noprompt + +config HOST_ACL + tristate + select HOST_ATTR + help + FIXME diff --git a/rules/host-acl.make b/rules/host-acl.make new file mode 100644 index 000..ba2be8d --- /dev/null +++ b/rules/host-acl.make @@ -0,0 +1,60 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Carsten Schlote c.schl...@konzeptpark.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_ACL) += host-acl + +# +# Paths and names +# +HOST_ACL_DIR = $(HOST_BUILDDIR)/$(ACL) + +# +# Get +# + +$(STATEDIR)/host-acl.get: $(STATEDIR)/acl.get + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-acl.extract: + @$(call targetinfo) + @$(call clean, $(HOST_ACL_DIR)) + @$(call extract, ACL, $(HOST_BUILDDIR)) + @$(call patchin, ACL, $(HOST_ACL_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_ACL_PATH:= PATH=$(HOST_PATH) +HOST_ACL_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_ACL_AUTOCONF:= $(HOST_AUTOCONF) + +# +# Clean +# + +host-acl_clean: + rm -rf $(STATEDIR)/host-acl.* + rm -rf $(HOST_ACL_DIR) + +# vim: syntax=make diff --git a/rules/host-libacl.in b/rules/host-libacl.in deleted file mode 100644 index 8c5fea1..000 --- a/rules/host-libacl.in +++ /dev/null @@ -1,5 +0,0 @@ -## SECTION=hosttools_noprompt - -config HOST_LIBACL - tristate - select HOST_ATTR -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [openvpn][v3] Added OpenVPN 2.0.9
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Added simple to use VPN packet. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/openvpn.in | 21 rules/openvpn.make | 87 2 files changed, 108 insertions(+), 0 deletions(-) create mode 100644 rules/openvpn.in create mode 100644 rules/openvpn.make I've fixed these things diff --git a/rules/openvpn.in b/rules/openvpn.in new file mode 100644 index 000..2c69338 --- /dev/null +++ b/rules/openvpn.in @@ -0,0 +1,21 @@ +## SECTION=networking empty line here, please +menuconfig OPENVPN + tristate + prompt openvpn + select OPENSSL + select LIBLZO if OPENVPN_LZO +help + This adds OpenVPN to your root filesystem. Plain vanilla + packet. + +if OPENVPN + +config OPENVPN_LZO + bool + prompt Enable LZO compression + help +This enables the LZO compression code. Selecting this option +will select the LZO library as well. +If unsure, say N. + +endif diff --git a/rules/openvpn.make b/rules/openvpn.make new file mode 100644 index 000..da79d5f --- /dev/null +++ b/rules/openvpn.make @@ -0,0 +1,87 @@ +# -*-makefile-*- +# +# Copyright (C) 2007 by Carsten Schlote c.schl...@konzeptpark.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 +# +PACKAGES-$(PTXCONF_OPENVPN) += openvpn + +# +# Paths and names +# +OPENVPN_VERSION := 2.0.9 +OPENVPN := openvpn-$(OPENVPN_VERSION) +OPENVPN_SUFFIX := tar.gz +OPENVPN_URL := http://openvpn.net/release/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_DIR := $(BUILDDIR)/$(OPENVPN) + + +# +# Get +# + +$(OPENVPN_SOURCE): + @$(call targetinfo, $@) please remove + @$(call get, OPENVPN) + +# +# Prepare +# + +OPENVPN_PATH := PATH=$(CROSS_PATH) +OPENVPN_ENV := $(CROSS_ENV) + +# +# autoconf +# +OPENVPN_AUTOCONF := $(CROSS_AUTOCONF_USR) + +ifdef PTXCONF_OPENVPN_LZO +OPENVPN_LZO := --enable-lzo +else +OPENVPN_LZO := --disable-lzo you probably want to write OPENVPN_AUTOCONF += here +endif + +# +# Target-Install +# + +$(STATEDIR)/openvpn.targetinstall: + @$(call targetinfo) + + @$(call install_init, openvpn) + @$(call install_fixup, openvpn,PACKAGE,openvpn) + @$(call install_fixup, openvpn,PRIORITY,optional) + @$(call install_fixup, openvpn,VERSION,$(OPENVPN_VERSION)) + @$(call install_fixup, openvpn,SECTION,base) + @$(call install_fixup, openvpn,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) + @$(call install_fixup, openvpn,DEPENDS,) + @$(call install_fixup, openvpn,DESCRIPTION,missing) + + @$(call install_copy, openvpn, 0, 0, 0755, -, /usr/sbin/openvpn) + + @$(call install_copy, openvpn, 0, 0, 0755, /etc/openvpn) + + @$(call install_finish, openvpn) + + @$(call touch) + +# +# Clean +# + +openvpn_clean: + rm -rf $(STATEDIR)/openvpn.* + rm -rf $(OPENVPN_PKGDIR)/* + rm -rf $(OPENVPN_DIR) + +# vim: syntax=make + and applied it. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [gdb] Add patch for gdb-6.8
Alexander Stein wrote: Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com applied, tnx Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Updated libuuid and libblkid
Carsten Schlote wrote: There are newer versions of libuuid and libblkid available in util-linux-ng. It includes also the blkid and uuidgen binaries. As a newer version was a requirement for some other updated tool, I changed the .in files to switch over to these new libs. Ideally there should be stand-alone packages for both libraries, but I couldn't find stand-alone sources yet. To ease later migration I added .in configs for both libs to select the right packages. So packages can select just (HOST_) LIBUUID or LIBBLKID as depends. nice, cool idea. The old code in e2fsprogs is commented out, so mixed installation of libs and binaries from both e2fsprogs and util-linux.ng is avoid. Internal libs are disabled by autoconf for e2fsprogs. please just remove the code, we've got git if we want to get the old source back. see more comments in the individual patches inline cheers, Marc Carsten [host-libuuid] Added virtual package [host-libblkid] Added virtual package [host-mtd-utils] Fixup dep to libuuid [libuuid] Added virtual package [libblkid] Added virtual package [host-util-linux-ng] Added host build for newer libuuid and libblkid [ptxdist] (1/4) Switch to newer versions of libuuid and libblkid [ptxdist] (2/4) Switch to newer versions of libuuid and libblkid [ptxdist] (3/4) Switch to newer versions of libuuid and libblkid [ptxdist] (4/4) Switch to newer versions of libuuid and libblkid -- ptxdist mailing list ptxdist@pengutronix.de -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 02/10] [host-libblkid] Added virtual package
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Currently HOST_E2FSPROGS is selected for those host tools, who need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual host package 'host-libblkid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-libblkid.in | 12 1 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 rules/host-libblkid.in diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in new file mode 100644 index 000..62c463b --- /dev/null +++ b/rules/host-libblkid.in @@ -0,0 +1,12 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBBLKID + tristate + select HOST_E2FSPROGS + help + Helper to select the host packet containing a recent libblkid.so + library and its header. + + The following packages provide libblkid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 03/10] [host-mtd-utils] Fixup dep to libuuid
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Selects virtual package for libuuid.so, which is required for the ubifs tools. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-mtd-utils.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in index 2e501c0..9636aea 100644 --- a/rules/host-mtd-utils.in +++ b/rules/host-mtd-utils.in @@ -4,4 +4,4 @@ config HOST_MTD_UTILS tristate select HOST_LIBLZO select HOST_ZLIB - select HOST_E2FSPROGS + select HOST_LIBUUID -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 04/10] [libuuid] Added virtual package
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Currently E2FSPROGS is selected for those target packages, which need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual package 'libuuid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/libuuid.in | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 rules/libuuid.in diff --git a/rules/libuuid.in b/rules/libuuid.in new file mode 100644 index 000..b603af1 --- /dev/null +++ b/rules/libuuid.in @@ -0,0 +1,13 @@ +## SECTION=system_libraries + +config LIBUUID + tristate + prompt libuuid + select E2FSPROGS this is not enough, please select the E2FSPROGS_LIBUUID Marc + help + Helper to select the target packet containing a recent libuuid.so + library and its header. + + The following packages provide libuuid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 05/10] [libblkid] Added virtual package
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Currently E2FSPROGS is selected for those target packages, which need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual package 'libblkid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/libblkid.in | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 rules/libblkid.in diff --git a/rules/libblkid.in b/rules/libblkid.in new file mode 100644 index 000..c3d873c --- /dev/null +++ b/rules/libblkid.in @@ -0,0 +1,13 @@ +## SECTION=system_libraries + +config LIBBLKID + tristate + prompt libblkid + select E2FSPROGS please select the E2FSPROGS_LIBBLKID, too Marc + help + Helper to select the target packet containing a recent libblkid.so + library and its header. + + The following packages provide libblkid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 08/10] (2/4) Switch to newer versions of libuuid and libblkid
install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen) +#endif please remove the code entirely. ## @@ -173,9 +176,9 @@ ifdef PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/badblocks) endif -ifdef PTXCONF_E2FSPROGS_INSTALL_BLKID - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/blkid) -endif +#ifdef PTXCONF_E2FSPROGS_INSTALL_BLKID +#@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/blkid) +#endif please remove the code entirely. ifdef PTXCONF_E2FSPROGS_INSTALL_DUMPE2FS @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/dumpe2fs) diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index da3d749..8424ca1 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -4,16 +4,19 @@ menuconfig UTIL_LINUX_NG tristate prompt util-linux-ng select HOST_GETTEXT - # select LIBC_UTIL - # we may need libuuid from E2FSPROGS, but we always need blkid - select E2FSPROGS - select E2FSPROGS_LIBBLKID - select E2FSPROGS_LIBUUIDif UTIL_LINUX_NG_MKSWAP_UUID - select NCURSES if UTIL_LINUX_NG_USES_NCURSES - select UTIL_LINUX_NG_USES_NCURSES if UTIL_LINUX_NG_CFDISK || UTIL_LINUX_NG_SETTERM + select UTIL_LINUX_NG_LIBBLKID + select UTIL_LINUX_NG_LIBUUIDif UTIL_LINUX_NG_MKSWAP_UUID + select NCURSES if UTIL_LINUX_NG_USES_NCURSES what happend to the ncurses tabs? + select UTIL_LINUX_NG_USES_NCURSES if UTIL_LINUX_NG_CFDISK || UTIL_LINUX_NG_SETTERM if UTIL_LINUX_NG +config UTIL_LINUX_NG_LIBBLKID + bool in e2fsprogs libblkid linked against libuuid, if this is still true, this must be handled somewhere. I suggest to add it to the libblkid.in + +config UTIL_LINUX_NG_LIBUUID + bool + config UTIL_LINUX_NG_USES_NCURSES bool @@ -154,4 +157,20 @@ config UTIL_LINUX_NG_MCOOKIE mcookie generates a 128-bit random hexadecimal number for use with the X authority system. +config UTIL_LINUX_NG_INSTALL_UUIDGEN + bool + select UTIL_LINUX_NG_LIBUUID + prompt uuidgen + help + Enable support for uuidgen program. + +config UTIL_LINUX_NG_INSTALL_BLKID + bool + select UTIL_LINUX_NG_LIBBLKID + select UTIL_LINUX_NG_LIBUUID + prompt blkid + help + Enable support for blkid program. + + endif diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 4727a70..ee3e410 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -146,6 +146,26 @@ ifdef PTXCONF_UTIL_LINUX_NG_MCOOKIE @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/mcookie) endif +ifdef PTXCONF_UTIL_LINUX_NG_LIBBLKID + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /lib/libblkid.so.1.1.0) please install the libs 0644 + @$(call install_link, util-linux-ng, libblkid.so.1.1.0, /lib/libblkid.so.1) + @$(call install_link, util-linux-ng, ../../lib/libblkid.so.1.1.0, /usr/lib/libblkid.so) +endif + +ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_BLKID + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/blkid) +endif + +ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID dito + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /lib/libuuid.so.1.3.0) + @$(call install_link, util-linux-ng, libuuid.so.1.3.0, /lib/libuuid.so.1) + @$(call install_link, util-linux-ng, ../../lib/libuuid.so.1.3.0, /usr/lib/libuuid.so) +endif + +ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_UUIDGEN + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen) +endif + @$(call install_finish, util-linux-ng) @$(call touch) cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 09/10] (3/4) Switch to newer versions of libuuid and libblkid
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch modifies the virtual packages for the transition. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/libblkid.in |3 ++- rules/libuuid.in |3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/libblkid.in b/rules/libblkid.in index c3d873c..aad2230 100644 --- a/rules/libblkid.in +++ b/rules/libblkid.in @@ -3,7 +3,8 @@ config LIBBLKID tristate prompt libblkid - select E2FSPROGS + select UTIL_LINUX_NG + select UTIL_LINUX_NG_LIBBLKID help Helper to select the target packet containing a recent libblkid.so library and its header. diff --git a/rules/libuuid.in b/rules/libuuid.in index b603af1..e2cca68 100644 --- a/rules/libuuid.in +++ b/rules/libuuid.in @@ -3,7 +3,8 @@ config LIBUUID tristate prompt libuuid - select E2FSPROGS + select UTIL_LINUX_NG + select UTIL_LINUX_NG_LIBUUID help Helper to select the target packet containing a recent libuuid.so library and its header. -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 06/10] [host-util-linux-ng] Added host build for newer libuuid and libblkid
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libuuid and libblkid then the e2fsprogs. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-util-linux-ng.in |8 +++ rules/host-util-linux-ng.make | 42 + 2 files changed, 50 insertions(+), 0 deletions(-) create mode 100644 rules/host-util-linux-ng.in create mode 100644 rules/host-util-linux-ng.make diff --git a/rules/host-util-linux-ng.in b/rules/host-util-linux-ng.in new file mode 100644 index 000..b457267 --- /dev/null +++ b/rules/host-util-linux-ng.in @@ -0,0 +1,8 @@ +## SECTION=hosttools + +config HOST_UTIL_LINUX_NG + tristate + prompt util-linux-ng (host libs) + select HOST_GETTEXT + help + Useful hosttools and libs for linux ng utils. diff --git a/rules/host-util-linux-ng.make b/rules/host-util-linux-ng.make new file mode 100644 index 000..448f3d2 --- /dev/null +++ b/rules/host-util-linux-ng.make @@ -0,0 +1,42 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Carsten Schlote c.schl...@konzeptpark.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_UTIL_LINUX_NG) += host-util-linux-ng + +# +# Paths and names +# +HOST_UTIL_LINUX_NG_DIR = $(HOST_BUILDDIR)/$(UTIL_LINUX_NG) + +# +# Get +# + +$(STATEDIR)/host-util-linux-ng.get: $(STATEDIR)/util-linux-ng.get + @$(call targetinfo) + @$(call touch) + +# +# Prepare +# + +# +# autoconf +# + +HOST_UTIL_LINUX_NG_AUTOCONF := \ + $(HOST_AUTOCONF) \ + --disable-use-tty-group \ + --disable-makeinstall-chown ^^ please use a tab, no spaces Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 10/10] (4/4) Switch to newer versions of libuuid and libblkid
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de util-linux-ng provides newer versions of libblkid and libuuid than the e2fsprogs sources do. This patch modifies the virtual host packages for the transition. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/host-libblkid.in |2 +- rules/host-libuuid.in |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in index 62c463b..31490b7 100644 --- a/rules/host-libblkid.in +++ b/rules/host-libblkid.in @@ -2,7 +2,7 @@ config HOST_LIBBLKID tristate - select HOST_E2FSPROGS + select HOST_UTIL_LINUX_NG help Helper to select the host packet containing a recent libblkid.so library and its header. diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in index 53731b0..f88e79f 100644 --- a/rules/host-libuuid.in +++ b/rules/host-libuuid.in @@ -2,7 +2,7 @@ config HOST_LIBUUID tristate - select HOST_E2FSPROGS + select HOST_UTIL_LINUX_NG help Helper to select the host packet containing a recent libuuid.so library and its header. -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 04/10] [libuuid] Added virtual package
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Currently E2FSPROGS is selected for those target packages, which need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual package 'libuuid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de Acked-by: Marc Kleine-Budde m...@pengutronix.de --- rules/libuuid.in | 14 ++ 1 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 rules/libuuid.in diff --git a/rules/libuuid.in b/rules/libuuid.in new file mode 100644 index 000..8134ee6 --- /dev/null +++ b/rules/libuuid.in @@ -0,0 +1,14 @@ +## SECTION=system_libraries + +config LIBUUID + tristate + prompt libuuid + select E2FSPROGS + select E2FSPROGS_LIBUUID + help + Helper to select the target packet containing a recent libuuid.so + library and its header. + + The following packages provide libuuid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [v4] Review changes for host-util-linux-ng
Carsten Schlote wrote: Marc Kleine-Budde wrote: Carsten Schlote wrote: That's the last missing ACK... so just this patch is posted. can you fix the remaining prompt issue for the host package and give me a git repo to pull from? See last patch post on list for the git-feed. The prompt issue is already included in this patch. Simply removed, so that the package will auto-deselect if no longer needed by some dependancy. Thanks for the review :-) it doesn't work, though :( It's a problem of the dependency generator. It stops looking for dependencies if a dependency itself is not a real package. A real package is defined by the PACKAGES-$(PTXCONF_PKG) += pkg line. mtd-utils selects libuuid which selects util-linux-ng but the dependency generator stops at libuuid, because it's not a real pacakge. But I think this issue can be solved. Another think that shows up is: rules/host-mtd-utils.in:7:warning: 'select' used by config symbol 'HOST_MTD_UTILS' refers to undefined symbol 'HOST_LIBUUID' I have a fix for this in my public ptxdist repo. http://git.pengutronix.de/?p=mkl/ptxdist.git;a=shortlog;h=refs/heads/dev/libuuid I'll talk to you when I've fixed dependency generator problem. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Carsten Schlote wrote:
From: Carsten Schlote c.schl...@konzeptpark.de
The ipkg-push script doesn't like '-1' or
similiar postfixes at the end of an ipkg version.
Packets like hackbench, mbw or zlib violate this
rule.
Added $(subst) to ptxd_make_install.sh to convert
a version info containing '-' to a ipkg compatible
format.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
scripts/lib/ptxd_make_install.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/lib/ptxd_make_install.sh
b/scripts/lib/ptxd_make_install.sh
index afed5b0..0d60263 100644
--- a/scripts/lib/ptxd_make_install.sh
+++ b/scripts/lib/ptxd_make_install.sh
@@ -158,7 +158,7 @@ EOF
;;
VERSION)
- replace_to=${replace_to}${PTXCONF_PROJECT_BUILD}
+ replace_to=`echo ${replace_to} | sed -e
's/-/./'`${PTXCONF_PROJECT_BUILD}
please use bash magic for this: ${replace_to//-/.}
(this actually is: s/-/./g, what about _ in the version string?
;;
DEPENDS)
return
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 5/6] [image-ipkg] Added IMAGE_BROKEN option for image builds
Carsten Schlote wrote:
From: Carsten Schlote schl...@vahanus.net
Added an IMAGE_BROKEN option to platform kconfig to
enable 'broken' image builds.
is it still broken, after these patches?
I hope it's working, so remove it please.
Marc
Also renamed IMAGE_IPKG_IMAGE_FROM_REPOSITORY to
IMAGE_IPKG_PUSH_TO_REPOSITORY.
Updated help text.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
platforms/Kconfig |5 +
platforms/image_ipkg.in| 15 ---
rules/post/image_ipkg.make |2 +-
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/platforms/Kconfig b/platforms/Kconfig
index e1ee5f8..c92713c 100644
--- a/platforms/Kconfig
+++ b/platforms/Kconfig
@@ -45,6 +45,11 @@ endmenu
source platforms/flash.in
menu image creation options
+config IMAGE_BROKEN
+ bool support image-build methods known to be broken
+ help
+ If this option is checked, install methods are available which
+ are known to be broken.
source generated/image.in
endmenu
diff --git a/platforms/image_ipkg.in b/platforms/image_ipkg.in
index 93b3362..8d9076c 100644
--- a/platforms/image_ipkg.in
+++ b/platforms/image_ipkg.in
@@ -2,15 +2,16 @@
menu ipkg options
-config IMAGE_IPKG_IMAGE_FROM_REPOSITORY
- depends on BROKEN
+config IMAGE_IPKG_PUSH_TO_REPOSITORY
+ depends on IMAGE_BROKEN
bool
- prompt make images: use packets from repository
+ prompt make images: push packets to ipkg-repository
help
- Usually 'make images' packages the files from ${IMAGEDIR}
- into ${IMAGEDIR}/root.[filesystem]. If this option is checked the
- packet files from the IPKG update site (to be specified in
- .ptxdistrc) are taken instead.
+ If this option is checked the packet files are pushed to
+ the ipkg-repository (to be specified in .ptxdistrc).
+
+ Please note, that the ipkg-repository is currently a
+ local directory on your machine.
config IMAGE_IPKG_INDEX
bool generate ipkg.index
diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make
index 4f37aa2..b18d409 100644
--- a/rules/post/image_ipkg.make
+++ b/rules/post/image_ipkg.make
@@ -9,7 +9,7 @@
# see the README file.
#
-SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_IMAGE_FROM_REPOSITORY) +=
$(STATEDIR)/ipkg-push
+SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY) += $(STATEDIR)/ipkg-push
$(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post
@$(call targetinfo)
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 4/6] [image_ipkg] Added $(HOST_ENV) to ipkg-push
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de Required to setup PYTHON paths to call the script ipkg-make-index internally. Suppressed output of make line, so added some progress indicator as well. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/post/image_ipkg.make |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make index 631ca42..4f37aa2 100644 --- a/rules/post/image_ipkg.make +++ b/rules/post/image_ipkg.make @@ -13,12 +13,14 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_IMAGE_FROM_REPOSITORY) += $(STATEDIR)/ipkg-push $(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post @$(call targetinfo) - $(PTXDIST_TOPDIR)/scripts/ipkg-push \ + @echo pushing ipkg pakets to ipkg-repository... nitpick: if you use -n here, the output looks like most of the other image targets. + @$(HOST_ENV) $(PTXDIST_TOPDIR)/scripts/ipkg-push \ --ipkgdir $(call remove_quotes,$(PKGDIR)) \ --repodir $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \ --revision $(call remove_quotes,$(PTXDIST_VERSION_FULL)) \ --project $(call remove_quotes,$(PTXCONF_PROJECT)) \ --dist $(call remove_quotes,$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)) + @echo ipkg-repository updated SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_INDEX) += $(PKGDIR)/Packages after fixing, can add my Acked-by Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Carsten Schlote wrote:
;;
VERSION)
- replace_to=${replace_to}${PTXCONF_PROJECT_BUILD}
+ replace_to=`echo ${replace_to} | sed -e 's/-
/./'`${PTXCONF_PROJECT_BUILD}
please use bash magic for this: ${replace_to//-/.}
(this actually is: s/-/./g, what about _ in the version string?
Not yet covered, because this wasn't an issue yet. But of course '_'
will mess
up the ipkg-push script as well.
Hmmm...after rereading the text, I realized that you said ipkg-push
has problems. The script was written by pengutronix and probably never
in heavy use.
If ipkg is fine with the versions, IMHO we should fix the script. Or
better said: ipkg should limit us here, not the ipkg-push script.
I will add some handling for it as well.
Is the conversion from '-' to '.' ok? Or should it be some other
character?
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 4/6] [image_ipkg] Added $(HOST_ENV) toipkg-push
Carsten Schlote wrote: - $(PTXDIST_TOPDIR)/scripts/ipkg-push \ + @echo pushing ipkg pakets to ipkg-repository... nitpick: if you use -n here, the output looks like most of the other image targets. The called script outputs stuff by itself. So -n can't be used here. okay, then Acked-by: Marc Kleine-Budde m...@pengutronix.de Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/6] [ipkg] Updated ipkg.conf config options
Carsten Schlote wrote:
From: Carsten Schlote c.schl...@konzeptpark.de
Updated default source line for ipkg.conf. It
uses the same sub-directory structure as
ipkg-push would create in the ipkg-repository
for this project.
Added new config option to configure an
ipkg update host. This config can be changed
easily and is used as part of the new default
ipkg.conf entry.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
rules/ipkg.in | 11 ++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/rules/ipkg.in b/rules/ipkg.in
index 0787b41..a62459b 100644
--- a/rules/ipkg.in
+++ b/rules/ipkg.in
@@ -41,11 +41,20 @@ config IPKG_GENERIC_IPKG_CONF
help
Installs a generic /etc/ipkg.conf file.
+ config IPKG_GENERIC_IPKG_CONF_HOST
AFAIS this symbol isn't used in the generic ipkg.conf. At least a grep
didn't show up the symbol, have I missed something?
+ depends on IPKG_GENERIC_IPKG_CONF
+ prompt IPKG Update Site Host
+ default www.example.org
+ string
+ help
+ Enter the hostname of your update site here. You can
+ use it as part of the ipkg.conf URL below.
+
config IPKG_GENERIC_IPKG_CONF_URL
depends on IPKG_GENERIC_IPKG_CONF
string
prompt IPKG Update Site URL
- default src http://some/path;
+ default src ptxdist
http://${PTXCONF_IPKG_GENERIC_IPKG_CONF_HOST}/ptxdist/${PTXCONF_PROJECT}/dists/${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION};
help
This path is put into the /etc/ipkg.conf file and specifies
where to find an IPKG packet feed.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/6] [image_ipkg] Fixed problem with 'Packages.filelist'
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de When generating the 'Packages.*' files in $(PKGDIR) the file 'Packages.filelist' is generated in the project directory. Added a cd $(PKGDIR), so the file is created at some suitable place. I think the -l option can help here. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/post/image_ipkg.make |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make index f6f03ff..631ca42 100644 --- a/rules/post/image_ipkg.make +++ b/rules/post/image_ipkg.make @@ -26,7 +26,7 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_INDEX) += $(PKGDIR)/Packages PHONY += $(PKGDIR)/Packages $(PKGDIR)/Packages: $(STATEDIR)/host-ipkg-utils.install.post @echo -n generating ipkg index '$(notdir $@)'... - @$(HOST_ENV) \ + @cd $(PKGDIR) $(HOST_ENV) \ ipkg-make-index -p $(@) $(PKGDIR) /dev/null 21 @echo done Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Carsten Schlote wrote: If ipkg is fine with the versions, IMHO we should fix the script. Or better said: ipkg should limit us here, not the ipkg-push script. Sorry, the script is in ipkg-utils and is called from ipkg-push. The python scripts is the problem here, it simply expects all ipkg files to follow a given name convention. This convention disallows '-' or '_' for the VERSION tags provided. So it's the job of ptxdist to ensure that all ipkg files follow the name conventions for the python script. Fine, I just wanted to be sure to fix the right thing :) So the bash replacement is the way to go. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/6] [ipkg] Updated ipkg.conf config options
Carsten Schlote wrote:
+ config IPKG_GENERIC_IPKG_CONF_HOST
AFAIS this symbol isn't used in the generic ipkg.conf. At least a
grep didn't show up the symbol, have I missed something?
It's just below part of the new default line for
IPKG_GENERIC_IPKG_CONF_URL :-)
Doh!
You can use this new variable there - it's easier to 'sed' and change
the IPKG_GENERIC_IPKG_CONF_HOST
entry in the ptxconfig file, just in case you need to change the host
for a customer.
It's use is optional.
config IPKG_GENERIC_IPKG_CONF_URL
depends on IPKG_GENERIC_IPKG_CONF
string
prompt IPKG Update Site URL
- default src http://some/path;
+ default src ptxdist
http://${PTXCONF_IPKG_GENERIC_IPKG_CONF_HOST}/ptxdist/${PTXCONF_PROJECT
}/dists/${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}
help
The default URL is generic and reflects the directory structure created
by ipkg-push.
I use the standard ptxdist setup with ipkg-repostory in the project
workdirectory. It is
just a link to /var/www/ptxdist. Works fine.
Carsten
--
ptxdist mailing list
ptxdist@pengutronix.de
cheers,
Acked-by: Marc Kleine-Budde
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Marc Kleine-Budde wrote:
Carsten Schlote wrote:
If ipkg is fine with the versions, IMHO we should fix the script. Or
better said: ipkg should limit us here, not the ipkg-push script.
Sorry, the script is in ipkg-utils and is called from ipkg-push.
The python scripts is the problem here, it simply expects all ipkg files
to follow a given name convention.
This convention disallows '-' or '_' for the VERSION tags provided.
So it's the job of ptxdist to ensure that all ipkg files follow the
name conventions for the python script.
Fine, I just wanted to be sure to fix the right thing :)
So the bash replacement is the way to go.
I think this can be used:
[frog...@hardanger:barebox (dev/pxa270)]$ foo=1-2-3_4-5_6
[frog...@hardanger:barebox (dev/pxa270)]$ echo ${foo//[-_]/.}
1.2.3.4.5.6
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 6/6] [image_ipkg] Added forced ipkg-push option
Carsten Schlote wrote: From: Carsten Schlote c.schl...@konzeptpark.de While testing the ipkg-push stuff again I found it a bit nagging to remove the previous dist directory from the ipkg-repository over and over again. I added an option to force this behaviour by default. I think the script can be fixed, toobut later, so: Acked-by: Marc Kleine-Budde m...@pengutronix.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- platforms/image_ipkg.in| 12 rules/post/image_ipkg.make |3 +++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/platforms/image_ipkg.in b/platforms/image_ipkg.in index 8d9076c..8ba87b0 100644 --- a/platforms/image_ipkg.in +++ b/platforms/image_ipkg.in @@ -13,6 +13,18 @@ config IMAGE_IPKG_PUSH_TO_REPOSITORY Please note, that the ipkg-repository is currently a local directory on your machine. +config IMAGE_IPKG_FORCED_PUSH + depends on IMAGE_IPKG_PUSH_TO_REPOSITORY + bool + prompt force ipkg-push + help + Usually the script checks for some previous ipkg-push to + a 'dist' release and requires you to delete a previous + dist directory + + If this option is checked, this is done by default. This + is most useful for development purposes. + config IMAGE_IPKG_INDEX bool generate ipkg.index default y diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make index b18d409..6829b03 100644 --- a/rules/post/image_ipkg.make +++ b/rules/post/image_ipkg.make @@ -13,6 +13,9 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY) += $(STATEDIR)/ipkg-push $(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post @$(call targetinfo) +ifdef PTXCONF_IMAGE_IPKG_FORCED_PUSH + rm -rf $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION) +endif @echo pushing ipkg pakets to ipkg-repository... @$(HOST_ENV) $(PTXDIST_TOPDIR)/scripts/ipkg-push \ --ipkgdir $(call remove_quotes,$(PKGDIR)) \ -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Carsten Schlote wrote: michael is working on device kit and is using the libuuid/libblkid patches with the virtual packages. at least for now. Yes, the empty .make 'virtual packet' stubs are not more than a hotfix. Ugly but working. It would be better to get rid of the make fragments, or at least get rid of the empty do-nothing rules. yeah, you can delete some rules, but I don't don't which. But Michael knows. I've some customer projects, so this week I think I don't have the time to improve the dependency generator. Cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Macro 'patchin' and fixup of configure /ltmain.sh, autogen.sh without patches.
Carsten Schlote wrote: I got some problem with a packet that stores it libraries in /usr/lib/pkgname/libfoo*. This requires rpath-link options for the Just for curiositywhy does it store its libs in there? linker and autoconf correctly creates the right options. Note: rpath != rpath-link rpath is for runtime linking, rpath-link for compile time. Actually we have rpath-link so that the compile time linker finds implicit shared libs. The patchin macro fixes up the configure and libtool config to not use rpath-links. This helps with relocating libs to /lib or /usr/lib, but also screws up some packets. patchin disables rpath, yes Possible workaround: - use ldconfig to work around this problem on the target. - use a .prepare stage without a call to patchin (my current workaround). does this work? Can you post me a readelf -d of the programs and libs? - add some option to the patchin macro to stop fixups. - set LD_LIBRARY_PATH on the target. I tend to do the last. Any comments? --- BUG: The patchin macro dislikes lonely autogen.sh scripts without any quilt patch. Workaround: Provide an empty dummy patch and series file. Maybe this could be fixed together with the first problem. A stand-alone autogen.sh script without any patches could be useful to do more specific fix-ups after disabling the 'fixup' feature of patchin. Any comments? I've a half finished cleanups of patchin here. But or rather luckily I've a customer project this week. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Proposal: macro 'install_auto'
Carsten Schlote wrote:
Hi,
for all packets, which do install properly into PKGDIR using the
default install rule, it would be desireable to have an 'install_auto'
macro which,
- scans the the PKGDIR and creates appropriate control data for ipkg
to replicate this content.
- by default filters paths like /usr/share/man or similiar
- allows as option to add additional filterpaths
- allows as option to turn off the default filter to install all in
PKDIR
- a ptxdist config option should be available to disable/change the
default exclude pattern, e.g. to get a full installation with man pages.
Nice idea, we definitely need something like this.
IMHO we should take a closer look at debian. There sometimes is a file
containing glob patterns, I think this is used for installation.
However, Michael has done some work cleaning up the install_* macros.
Maybe he can push his branch somewhere.
This should be used as a base for hacking this new feature.
This could look like
@$(call install_auto, pkgname {, extrafilter {, deffilter_disable
}} )
Examples:
# Install all except man and info files
@$(call install_auto, foobar)
# Exclude some more dirs
@$(call install_auto, foobar,
/usr/share/html-docs/*.html:/usr/useless/dir)
# Install all and everything
@$(call install_auto, foobar, , n)
# Install all and everything, except /usr/useless/dir
@$(call install_auto, foobar, /usr/useless/dir, n)
This should work for most packages. For others you could use a
combination and save
some work for targetinstall stage:
# Exclude /usr/bin
@$(call install_auto, foobar, /usr/bin/*:/lib/foobar/testsuite)
# Cherry pick files, leaving other (test) binaries out
@$(call install_copy, foobar, 0, 0, 755, -, /usr/bin/foobar)
Several packets already use similiar code for their install stage, e.g.
our PERL
packet.
Maybe it should be also possible to add some alternate PKGDIR, e.g. to
grab files from the toolchain's sysroot directory.
One of the first things I'd like to see is an improvement of the
install_alternative, e.g. to look into PKGDIR, too.
Any further ideas?
cheers, Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
