Re: [ptxdist] [PATCH 8/9] [gst-plugins-bad] version bump 0.10.17 - 0.10.19
On Tue, Jun 01, 2010 at 10:44:46PM +0200, Michael Olbrich wrote: -config GST_PLUGINS_BAD_MPEGTSMUX - bool - prompt mpegtsmux not removed in gst-plugins-bad.make - -config GST_PLUGINS_BAD_MPEGPSMUX - bool - prompt mpegpsmux - dito. config GST_PLUGINS_BAD_MPEG4VIDEOPARSE bool prompt mpeg4videoparse -config GST_PLUGINS_BAD_MPEGVIDEOPARSE - bool - prompt mpegvideoparse - dito. These got lost during the mass-changes; did I mention that gst-plugins is a monster? :-) Fixed, thanks. rsc -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Install /etc/mdev.conf if PTXCONF_BUSYBOX_FEATURE_MDEV_CONF is enabled
Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com --- generic/etc/mdev.conf |6 ++ rules/busybox.make|4 2 files changed, 10 insertions(+), 0 deletions(-) create mode 100755 generic/etc/mdev.conf diff --git a/generic/etc/mdev.conf b/generic/etc/mdev.conf new file mode 100755 index 000..197c774 --- /dev/null +++ b/generic/etc/mdev.conf @@ -0,0 +1,6 @@ +# Devices: +# Syntax: %s %d:%d %s +# devices user:group mode + +null 0:0 777 +zero 0:0 666 diff --git a/rules/busybox.make b/rules/busybox.make index bf2eb2b..d1f1cf0 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -144,6 +144,10 @@ endif # PTXCONF_INITMETHOD_BBINIT # # config files # # +ifdef PTXCONF_BUSYBOX_FEATURE_MDEV_CONF + @$(call install_alternative, busybox, 0, 0, 0644, /etc/mdev.conf) +endif + ifdef PTXCONF_BUSYBOX_UDHCPC @$(call install_alternative, busybox, 0, 0, 0754, /etc/udhcpc.script) @$(call install_link, busybox, ../../../etc/udhcpc.script, /usr/share/udhcpc/default.script) -- 1.6.4.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/9] [glib25] add glib-2.25
On Tue, Jun 01, 2010 at 08:52:19AM +0200, Marc Kleine-Budde wrote: Robert Schwebel wrote: Add glib-2.25.x rules to ptxdist. While being there, remove the now obsolete __ marks in the .in file. hmmm...if you remove all __, make it a seperate patch and add a migration helper to scripts/migrate/migrate_ptx' Done. rsc -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/9] [dconf] add new packet
On Tue, Jun 01, 2010 at 08:53:20AM +0200, Marc Kleine-Budde wrote: +config DCONF + tristate + select GLIB + prompt dconf + help + FIXME please fix.I usually use debian's description Done, thanks. rsc -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/9] [glib25] add glib-2.25
Robert Schwebel wrote: Add glib-2.25.x rules to ptxdist. While being there, remove the now obsolete __ marks in the .in file. If you want to replace the __ by _ make it a separate patch please. Provide a migration helper with that patch. cheers, Marc Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- patches/glib-2.25.7/autogen.sh |1 + .../overwrite-glib-compile-schemas.diff| 63 patches/glib-2.25.7/series |1 + rules/glib.in | 18 -- rules/glib.make| 50 +++- 5 files changed, 111 insertions(+), 22 deletions(-) create mode 12 patches/glib-2.25.7/autogen.sh create mode 100644 patches/glib-2.25.7/overwrite-glib-compile-schemas.diff create mode 100644 patches/glib-2.25.7/series diff --git a/patches/glib-2.25.7/autogen.sh b/patches/glib-2.25.7/autogen.sh new file mode 12 index 000..9f8a4cb --- /dev/null +++ b/patches/glib-2.25.7/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/glib-2.25.7/overwrite-glib-compile-schemas.diff b/patches/glib-2.25.7/overwrite-glib-compile-schemas.diff new file mode 100644 index 000..b5976f2 --- /dev/null +++ b/patches/glib-2.25.7/overwrite-glib-compile-schemas.diff @@ -0,0 +1,63 @@ +From: Robert Schwebel r.schwe...@pengutronix.de +Subject: [patch] fix cross compilation in glib-2.25.7 + +When we try to cross compile, the build system compiles +glib-compile-schemas for the host system, but tries to run it later on +the build machine. + +We make it possible to overwrite the call to the binary during +configure, similar to what GLIB_GENMARSHAL does. + +Signed-of-by: Robert Schwebel r.schwe...@pengutronix.de + +--- +# rsc: https://bugzilla.gnome.org/show_bug.cgi?id=620174 + + configure.in | 13 ++--- + gio/tests/Makefile.am |2 +- + 2 files changed, 11 insertions(+), 4 deletions(-) + +Index: glib-2.25.7/configure.in +=== +--- glib-2.25.7.orig/configure.in glib-2.25.7/configure.in +@@ -2731,9 +2731,10 @@ int error = EILSEQ; + ], have_eilseq=yes, have_eilseq=no); + AC_MSG_RESULT($have_eilseq) + +-dnl ** +-dnl *** Look for glib-genmarshal in PATH if we are cross-compiling *** +-dnl ** ++dnl ++dnl *** Look for glib-genmarshal and glib-compile-schemas in PATH ** ++dnl *** if we are cross-compiling ** ++dnl + + AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) + +@@ -2742,6 +2743,12 @@ if test $cross_compiling = yes; then + if test x$GLIB_GENMARSHAL = xno; then + AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH) + fi ++ AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no) ++ if test x$GLIB_COMPILE_SCHEMAS = xno; then ++AC_MSG_ERROR(Could not find a glib-compile-schemas in your PATH) ++ fi ++else ++ AC_SUBST(GLIB_COMPILE_SCHEMAS,\$(top_builddir)/gio/glib-compile-schemas) + fi + + dnl ** +Index: glib-2.25.7/gio/tests/Makefile.am +=== +--- glib-2.25.7.orig/gio/tests/Makefile.am glib-2.25.7/gio/tests/Makefile.am +@@ -288,7 +288,7 @@ test.mo: de.po + cp -f test.mo de/LC_MESSAGES + + gschemas.compiled: +-$(top_builddir)/gio/glib-compile-schemas --targetdir=$(abs_builddir) $(srcdir) ++$(GLIB_COMPILE_SCHEMAS) --targetdir=$(abs_builddir) $(srcdir) + + DISTCLEANFILES =\ + applications/mimeinfo.cache \ diff --git a/patches/glib-2.25.7/series b/patches/glib-2.25.7/series new file mode 100644 index 000..abda33b --- /dev/null +++ b/patches/glib-2.25.7/series @@ -0,0 +1 @@ +overwrite-glib-compile-schemas.diff diff --git a/rules/glib.in b/rules/glib.in index 91dc7dd..60264b6 100644 --- a/rules/glib.in +++ b/rules/glib.in @@ -3,10 +3,11 @@ menuconfig GLIB tristate prompt glib - select GETTEXT if GLIB__GETTEXT_GETTEXT - select GETTEXT_DUMMYif GLIB__GETTEXT_DUMMY + select GETTEXT if GLIB_GETTEXT_GETTEXT + select GETTEXT_DUMMYif GLIB_GETTEXT_DUMMY select HOST_GLIB select ICONV + select ZLIB if GLIB_EXPERIMENTAL help GLib is a library containing many useful C routines for things such as trees, hashes, lists, and strings. It is a useful @@ -15,19 +16,24 @@ menuconfig GLIB if GLIB +config GLIB_EXPERIMENTAL + bool +
Re: [ptxdist] [PATCH 2/9] [dconf] add new packet
Robert Schwebel wrote: To be used with glib-2.25.x. Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- rules/dconf.in |8 ++ rules/dconf.make | 73 ++ 2 files changed, 81 insertions(+), 0 deletions(-) create mode 100644 rules/dconf.in create mode 100644 rules/dconf.make diff --git a/rules/dconf.in b/rules/dconf.in new file mode 100644 index 000..42a41ab --- /dev/null +++ b/rules/dconf.in @@ -0,0 +1,8 @@ +## SECTION=system_libraries + +config DCONF + tristate + select GLIB + prompt dconf + help + FIXME please add a decsription diff --git a/rules/dconf.make b/rules/dconf.make new file mode 100644 index 000..602d3c9 --- /dev/null +++ b/rules/dconf.make @@ -0,0 +1,73 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Robert Schwebel r.schwe...@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 +# +PACKAGES-$(PTXCONF_DCONF) += dconf + +# +# Paths and names +# +DCONF_VERSION:= 0.3.1 +DCONF:= dconf-$(DCONF_VERSION) +DCONF_SUFFIX := tar.bz2 +DCONF_URL:= http://download.gnome.org/sources/dconf/0.3/$(DCONF).$(DCONF_SUFFIX) +DCONF_SOURCE := $(SRCDIR)/$(DCONF).$(DCONF_SUFFIX) +DCONF_DIR:= $(BUILDDIR)/$(DCONF) +DCONF_LICENSE:= LGPLv2.1 + +# +# Get +# + +$(DCONF_SOURCE): + @$(call targetinfo) + @$(call get, DCONF) + +# +# Prepare +# + +# +# autoconf +# +DCONF_CONF_TOOL := autoconf + +# +# Target-Install +# + +$(STATEDIR)/dconf.targetinstall: + @$(call targetinfo) + + @$(call install_init, dconf) + @$(call install_fixup, dconf,PACKAGE,dconf) + @$(call install_fixup, dconf,PRIORITY,optional) + @$(call install_fixup, dconf,VERSION,$(DCONF_VERSION)) + @$(call install_fixup, dconf,SECTION,base) + @$(call install_fixup, dconf,AUTHOR,Robert Schwebel r.schwe...@pengutronix.de) + @$(call install_fixup, dconf,DEPENDS,) + @$(call install_fixup, dconf,DESCRIPTION,missing) + + @$(call install_copy, dconf, 0, 0, 0644, -, /usr/lib/gio/modules/libdconfsettings.so) + @$(call install_lib, dconf, 0, 0, 0644, libdconf) + + @$(call install_copy, dconf, 0, 0, 0755, -, /usr/libexec/dconf-service) + @$(call install_copy, dconf, 0, 0, 0755, -, /usr/bin/dconf) + + @$(call install_copy, dconf, 0, 0, 0644, -, /usr/share/dbus-1/services/ca.desrt.dconf.service) + @$(call install_copy, dconf, 0, 0, 0644, -, /usr/share/dbus-1/system-services/ca.desrt.dconf.service) + + @$(call install_finish, dconf) + + @$(call touch) + +# 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 3/9] [iptables] version bump 1.4.5 - 1.4.8
Robert Schwebel wrote: Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- rules/iptables.make | 20 +++- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/rules/iptables.make b/rules/iptables.make index 5e536be..ae77ca5 100644 --- a/rules/iptables.make +++ b/rules/iptables.make @@ -19,7 +19,7 @@ PACKAGES-$(PTXCONF_IPTABLES) += iptables # # Paths and names # -IPTABLES_VERSION := 1.4.5 +IPTABLES_VERSION := 1.4.8 IPTABLES := iptables-$(IPTABLES_VERSION) IPTABLES_SUFFIX := tar.bz2 IPTABLES_URL := http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SUFFIX) @@ -47,7 +47,17 @@ IPTABLES_ENV := $(CROSS_ENV) IPTABLES_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --with-kernel=$(KERNEL_HEADERS_DIR) \ - --with-xtlibdir=/usr/lib + --with-xtlibdir=/usr/lib \ + --enable-ipv4 \ according to the .in file ipv4 is optional. Any reasons to hard-wire it here? Marc + --enable-large-file \ + --disable-devel \ + --disable-libipq + +ifdef PTXCONF_IPTABLES_INSTALL_IPV6_TOOLS +IPTABLES_AUTOCONF += --enable-ipv6 +else +IPTABLES_AUTOCONF += --disable-ipv6 +endif # # Install @@ -83,9 +93,9 @@ $(STATEDIR)/iptables.targetinstall: @$(call install_link, iptables, libiptc.so.0.0.0, /usr/lib/libiptc.so.0) @$(call install_copy, iptables, 0, 0, 0644, -, \ - /usr/lib/libxtables.so.2.1.0) - @$(call install_link, iptables, libxtables.so.2.1.0, /usr/lib/libxtables.so) - @$(call install_link, iptables, libxtables.so.2.1.0, /usr/lib/libxtables.so.2) + /usr/lib/libxtables.so.4.0.0) + @$(call install_link, iptables, libxtables.so.4.0.0, /usr/lib/libxtables.so) + @$(call install_link, iptables, libxtables.so.4.0.0, /usr/lib/libxtables.so.4) # IPv6 part ifdef PTXCONF_IPTABLES_INSTALL_IP6TABLES_MULTI -- 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
[ptxdist] [PATCH v4 07/16] [dhclient] Configure path in dhclient-script
If the dhclient-script is executed by the init.d scripts the PATH is not
yet set and the path of, for example, 'ip' differs if iproute2 (/sbin) or
busybox (/bin) is being used. so set the path of the possible locations of
the tools to make sure the tools can be found
Signed-off-by: Bart vdr. Meulen bartvdrmeu...@gmail.com
Signed-off-by: Remy Bohmer li...@bohmer.net
---
generic/etc/dhclient-script | 16 +---
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/generic/etc/dhclient-script b/generic/etc/dhclient-script
index 8b4d7a4..5554371 100644
--- a/generic/etc/dhclient-script
+++ b/generic/etc/dhclient-script
@@ -22,8 +22,10 @@
# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious
# of the $1 in its args.
-# 'ip' just looks too weird. /sbin/ip looks less weird.
-ip=/sbin/ip
+# busybox installs /bin/ip but iproute2 installs /sbin/ip, so put all the
+# possible locations of ip, ifconfig and route in the PATH to make sure
+# these tools can be found.
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
make_resolv_conf() {
if [ x$new_domain_name_servers != x ]; then
@@ -235,10 +237,10 @@ fi
if [ ${reason} = PREINIT6 ] ; then
# Ensure interface is up.
- ${ip} link set ${interface} up
+ ip link set ${interface} up
# Remove any stale addresses from aborted clients.
- ${ip} -f inet6 addr flush dev ${interface} scope global permanent
+ ip -f inet6 addr flush dev ${interface} scope global permanent
exit_with_hooks 0
fi
@@ -254,7 +256,7 @@ if [ ${reason} = BOUND6 ] ; then
exit_with_hooks 2;
fi
- ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+ ip -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
dev ${interface} scope global
# Check for nameserver options.
@@ -280,7 +282,7 @@ if [ ${reason} = DEPREF6 ] ; then
exit_with_hooks 2;
fi
- ${ip} -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
+ ip -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
dev ${interface} scope global preferred_lft 0
exit_with_hooks 0
@@ -291,7 +293,7 @@ if [ ${reason} = EXPIRE6 -o ${reason} = RELEASE6 -o
${reason} = STOP6 ] ; then
exit_with_hooks 2;
fi
- ${ip} -f inet6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
+ ip -f inet6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
dev ${interface}
exit_with_hooks 0
--
1.7.0.4
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH v4 13/16] [timezone] add new packet
From: Bart vdr. Meulen bartvdrmeu...@gmail.com Add an alternative source for the timezone info. This option can be used when using toolchains in which the timezone info is incorrect/does not work or is not available at all The option build's the timezone database from the tzdata source files on the host and installs the selected zoneinfos to the target. Signed-off-by: Bart vdr. Meulen bartvdrmeu...@gmail.com Signed-off-by: Remy Bohmer li...@bohmer.net --- rules/host-tz-database.in |4 ++ rules/host-tz-database.make | 100 +++ rules/pre/Rules.make|4 +- rules/timezone.in | 15 +- rules/timezone.make | 10 +++- scripts/make_zoneinfo.sh| 15 --- 6 files changed, 136 insertions(+), 12 deletions(-) create mode 100644 rules/host-tz-database.in create mode 100644 rules/host-tz-database.make diff --git a/rules/host-tz-database.in b/rules/host-tz-database.in new file mode 100644 index 000..c1e0252 --- /dev/null +++ b/rules/host-tz-database.in @@ -0,0 +1,4 @@ +## SECTION=hosttools_noprompt + +config HOST_TZDATABASE + tristate diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make new file mode 100644 index 000..dc12fe6 --- /dev/null +++ b/rules/host-tz-database.make @@ -0,0 +1,100 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Bart vdr. Meulen bartvdrmeu...@gmail.com +# +# 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_TZDATABASE) += host-tz-database + +# +# Paths and names +# +TZCODE_VERSION := 2010f +TZCODE := tzcode$(TZCODE_VERSION) +TZCODE_SUFFIX := tar.gz +TZCODE_URL := \ +ftp://elsie.nci.nih.gov/pub/$(TZCODE).$(TZCODE_SUFFIX) \ +ftp://munnari.oz.au/pub/oldtz/$(TZCODE).$(TZCODE_SUFFIX) +TZCODE_SOURCE := $(SRCDIR)/$(TZCODE).$(TZCODE_SUFFIX) + +TZDATA_VERSION := 2010h +TZDATA := tzdata$(TZDATA_VERSION) +TZDATA_SUFFIX := tar.gz +TZDATA_URL := \ +ftp://elsie.nci.nih.gov/pub/$(TZDATA).$(TZDATA_SUFFIX) \ +ftp://munnari.oz.au/pub/oldtz/$(TZDATA).$(TZDATA_SUFFIX) +TZDATA_SOURCE := $(SRCDIR)/$(TZDATA).$(TZDATA_SUFFIX) + + +HOST_TZDATABASE:= tz-database +HOST_TZDATABASE_DIR:= $(HOST_BUILDDIR)/$(HOST_TZDATABASE) + +# +# Get +# +$(TZCODE_SOURCE): + @$(call get, TZCODE) + +$(TZDATA_SOURCE): + @$(call get, TZDATA) + +$(STATEDIR)/host-tz-database.get: $(TZCODE_SOURCE) $(TZDATA_SOURCE) + @$(call targetinfo) + @$(call touch) + +# +# Extract +# + +$(STATEDIR)/host-tz-database.extract: + @$(call targetinfo) + @$(call clean, $(HOST_TZDATABASE_DIR)) + @$(call extract, TZCODE, $(HOST_TZDATABASE_DIR)) + @$(call extract, TZDATA, $(HOST_TZDATABASE_DIR)) + @$(call touch) + +# +# Prepare +# + +HOST_TZDATABASE_PATH := PATH=$(HOST_PATH) +HOST_TZDATABASE_ENV:= $(HOST_ENV) + +$(STATEDIR)/host-tz-database.prepare: + @$(call targetinfo, $@) + @$(call touch, $@) + +# +# Compile +# + +$(STATEDIR)/host-tz-database.compile: + @$(call targetinfo) + cd $(HOST_TZDATABASE_DIR) $(HOST_TZDATABASE_PATH) \ + $(MAKE) posix_only TZDIR=$(PTXDIST_SYSROOT_HOST)/usr/share/zoneinfo + @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-tz-database.install: + $(call targetinfo) + $(call touch) + +# +# Clean +# + +#$(STATEDIR)/host-tz-database.clean: +# @$(call targetinfo) +# @$(call clean_pkg, HOST_TZDATABASE) + +# vim: syntax=make diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index 8ffc6fd..1fd3707 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -386,10 +386,12 @@ add_locale = \ add_zoneinfo = \ ZONEINFO_NAME=$(strip $(1));\ PREF=$(strip $(2)); \ +
Re: [ptxdist] [PATCH 3] Add mpg123 rule/in file.
Hi Michael, On Tue, Jun 01, 2010 at 21:42 PM +0200 Michael Olbrich wrote: +## SECTION=multimedia_sound + +config MPG123 + tristate + prompt mpg123 select ALSA_LIB I don't think this needs to be optional. What do you mean ? How can I mark the alsa-lib as non optional ? Greetings, Jürgen -- ptxdist mailing list ptxdist@pengutronix.de
