Re: [ptxdist] [PATCH] Install /etc/busybox.conf if BUSYBOX_FEATURE_SUID_CONFIG is enabled
Hey Alexander, Alexander Stein wrote: Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com --- rules/busybox.make |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/rules/busybox.make b/rules/busybox.make index 1616ab1..bf2eb2b 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -94,6 +94,9 @@ $(STATEDIR)/busybox.targetinstall: ifdef PTXCONF_BUSYBOX_FEATURE_SUID @$(call install_copy, busybox, 0, 0, 4755, -, /bin/busybox) +ifdef PTXCONF_BUSYBOX_FEATURE_SUID_CONFIG + @$(call install_alternative, busybox, 0, 0, 0644, /etc/busybox.conf) This will probably break several BSPs because they don't have that file, but this config option enabled. Alexander, Michael, what do you think. Should we provide an empty /etc/busybox.conf file in ptxdist/generic? +endif else @$(call install_copy, busybox, 0, 0, 755, -, /bin/busybox) endif 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] rework ubi image generation
$(PTXCONF_IMAGE_UBI_EXTRA_ARGS))
- @export UBI_VOLUME_SIZE=${PTXCONF_IMAGE_UBI_VOLUME_SIZE} \
- ptxd_replace_magic ${PTXDIST_TOPDIR}/config/mtd-utils/ubi.ini
${PTXDIST_TEMPDIR}/ubi.ini
- @cd $(IMAGEDIR);
\
- $(PTXCONF_SYSROOT_HOST)/sbin/ubinize
\
- -s $(PTXCONF_IMAGE_UBI_SUB_PAGE_SIZE)
\
- -O $(PTXCONF_IMAGE_UBI_VID_HEADER_OFFSET)
\
- -p $(PTXCONF_IMAGE_UBI_PEB_SIZE)
\
- -m $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE)
\
- $(PTXCONF_IMAGE_UBI_EXTRA_ARGS)
\
- -o $@
\
- ${PTXDIST_TEMPDIR}/ubi.ini;
\
-
- @echo done.
-
-#
# create the squashfs image
#
IMAGE_SQUASHFS_EXTRA_ARGS := \
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 v2] Install /etc/busybox.conf if BUSYBOX_FEATURE_SUID_CONFIG is enabled
Alexander Stein wrote: looks good now, please add your S-o-b Marc --- generic/etc/busybox.conf |5 + rules/busybox.make |3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) create mode 100644 generic/etc/busybox.conf diff --git a/generic/etc/busybox.conf b/generic/etc/busybox.conf new file mode 100644 index 000..71a5bd5 --- /dev/null +++ b/generic/etc/busybox.conf @@ -0,0 +1,5 @@ +[SUID] +#lines starting with # are comments +#applet = [Ssx-][Ssx-][x-] (username|uid).(groupname|gid) + +#reboot = ssx root.0 # applet reboot can be run by anyone and runs with euid=0/egid=0 diff --git a/rules/busybox.make b/rules/busybox.make index 1616ab1..bf2eb2b 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -94,6 +94,9 @@ $(STATEDIR)/busybox.targetinstall: ifdef PTXCONF_BUSYBOX_FEATURE_SUID @$(call install_copy, busybox, 0, 0, 4755, -, /bin/busybox) +ifdef PTXCONF_BUSYBOX_FEATURE_SUID_CONFIG + @$(call install_alternative, busybox, 0, 0, 0644, /etc/busybox.conf) +endif else @$(call install_copy, busybox, 0, 0, 755, -, /bin/busybox) endif -- 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 01/20] Do not fail if provided kernel-config file is read-only
Remy Bohmer wrote: If the ptxdist project is build from a Source Control Management tool brrr..which one? that makes files read-only, then ptxdist fails when it wants to overwrite the kernel-config after the kernel-old-config step. It is not a real error, the oldconfig has succeed, so just print a warning about the read-only file instead of fail completely. good catch, fix the thing mentioned below and add my Acked-by. Signed-off-by: Remy Bohmer li...@bohmer.net --- rules/kernel.make |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/rules/kernel.make b/rules/kernel.make index 9477502..2bca568 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -125,7 +125,11 @@ ifdef KERNEL_INITRAMFS_SOURCE_y endif @$(call ptx/oldconfig, KERNEL) - @cp $(KERNEL_DIR)/.config $() + @if [ -w $(KERNEL_CONFIG) ]; then \ + cp $(KERNEL_DIR)/.config $(); \ + else \ + echo WARNING: $(KERNEL_CONFIG) is Read-only, not updating it! 12; \ please use $() instead of $(KERNEL_CONFIG) + fi # # Don't keep the expanded path to INITRAMS_SOURCE in $(KERNEL_CONFIG), 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 03/20] Ptxdist fails to build if config files are readonly.
Remy Bohmer wrote:
Ptxdist just makes a copy of the config file, but it actually needs
a writable copy of the config file
Signed-off-by: Remy Bohmer li...@bohmer.net
---
scripts/lib/ptxd_lib_cfgchg.sh |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/scripts/lib/ptxd_lib_cfgchg.sh b/scripts/lib/ptxd_lib_cfgchg.sh
index 8ec0b26..02cffb1 100644
--- a/scripts/lib/ptxd_lib_cfgchg.sh
+++ b/scripts/lib/ptxd_lib_cfgchg.sh
@@ -78,5 +78,6 @@ ptxd_cfgchg()
fi
cp ${cfg_orig} ${cfg_old} || return
+ chmod a+w ${cfg_old} || return
hmmm...what about using install -m644 for this?
done
}
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 04/20] Add parted
Remy Bohmer wrote: From: Bart vdr. Meulen bartvdrmeu...@gmail.com Adds the parted package to ptxdist We add version 1.8.7 instead of the newer 2.2 since 1.8.7 is the last GPLv2 version. Anything newer is GPLv3 Signed-off-by: Bart vdr. Meulen bartvdrmeu...@gmail.com Remy, please add, if your're sending the patches, your S-o-b below. --- rules/parted.in | 13 ++ rules/parted.make | 70 + 2 files changed, 83 insertions(+), 0 deletions(-) create mode 100644 rules/parted.in create mode 100644 rules/parted.make diff --git a/rules/parted.in b/rules/parted.in new file mode 100644 index 000..b5161f4 --- /dev/null +++ b/rules/parted.in @@ -0,0 +1,13 @@ +## SECTION=shell_and_console +config PARTED + tristate + prompt parted + select GETTEXT + select READLINE + select E2FSPROGS + select NCURSES + help + The GNU Parted program allows you to create, destroy, resize, move, + and copy hard disk partitions. Parted can be used for creating space + for new operating systems, reorganizing disk usage, and copying data + to new hard disks. nitpick: for help text the preferred style is one tab + two spaces. diff --git a/rules/parted.make b/rules/parted.make new file mode 100644 index 000..5de39e7 --- /dev/null +++ b/rules/parted.make @@ -0,0 +1,70 @@ +# -*-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 +# +PACKAGES-$(PTXCONF_PARTED) += parted + +# +# Paths and names +# +# versions newer than 1.8.7 are GPLv3 and as such not preferred +PARTED_VERSION := 1.8.7 +PARTED := parted-$(PARTED_VERSION) +PARTED_SUFFIX:= tar.gz +PARTED_URL := http://ftp.gnu.org/gnu/parted/$(PARTED).$(PARTED_SUFFIX) please use: $(PTXCONF_SETUP_GNUMIRROR) +PARTED_SOURCE:= $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX) +PARTED_DIR := $(BUILDDIR)/$(PARTED) +PARTED_LICENSE := GPLv2 + +# +# Get +# + +$(PARTED_SOURCE): + @$(call targetinfo) + @$(call get, PARTED) + +# +# autoconf +# +PARTED_CONF_TOOL := autoconf +PARTED_CONF_OPT := $(CROSS_AUTOCONF_USR) \ + --disable-Werror nitpick please move the $(CROSS_AUTOCONF_USR) in a seperate line + +# +# Target-Install +# + +$(STATEDIR)/parted.targetinstall: + @$(call targetinfo) + + @$(call install_init, parted) + @$(call install_fixup, parted,PACKAGE,parted) + @$(call install_fixup, parted,PRIORITY,optional) + @$(call install_fixup, parted,VERSION,$(PARTED_VERSION)) + @$(call install_fixup, parted,SECTION,base) + @$(call install_fixup, parted,AUTHOR,Bart vdr. Meulen bartvdrmeu...@gmail.com) + @$(call install_fixup, parted,DEPENDS,) + @$(call install_fixup, parted,DESCRIPTION,missing) + + @$(call install_copy, parted, 0, 0, 0755, -, /usr/sbin/parted) + @$(call install_copy, parted, 0, 0, 0755, -, /usr/sbin/partprobe) + + @$(call install_copy, parted, 0, 0, 0644, -, /usr/lib/libparted-1.8.so.7.0.0 ) + @$(call install_link, parted, libparted-1.8.so.7.0.0, /usr/lib/libparted-1.8.so.7) + @$(call install_link, parted, libparted-1.8.so.7.0.0, /usr/lib/libparted.so) + @$(call install_finish, parted) + + @$(call touch) + + +# vim: syntax=make looks quite good. Fix it and add my Acked-by. 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 v3] Install /etc/busybox.conf if BUSYBOX_FEATURE_SUID_CONFIG is enabled
Alexander Stein wrote: Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com applied to master, tnx Marc --- generic/etc/busybox.conf |5 + rules/busybox.make |3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) create mode 100644 generic/etc/busybox.conf diff --git a/generic/etc/busybox.conf b/generic/etc/busybox.conf new file mode 100644 index 000..71a5bd5 --- /dev/null +++ b/generic/etc/busybox.conf @@ -0,0 +1,5 @@ +[SUID] +#lines starting with # are comments +#applet = [Ssx-][Ssx-][x-] (username|uid).(groupname|gid) + +#reboot = ssx root.0 # applet reboot can be run by anyone and runs with euid=0/egid=0 diff --git a/rules/busybox.make b/rules/busybox.make index 1616ab1..bf2eb2b 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -94,6 +94,9 @@ $(STATEDIR)/busybox.targetinstall: ifdef PTXCONF_BUSYBOX_FEATURE_SUID @$(call install_copy, busybox, 0, 0, 4755, -, /bin/busybox) +ifdef PTXCONF_BUSYBOX_FEATURE_SUID_CONFIG + @$(call install_alternative, busybox, 0, 0, 0644, /etc/busybox.conf) +endif else @$(call install_copy, busybox, 0, 0, 755, -, /bin/busybox) endif -- 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 v1-repost 10/20] Update dhclient script
$alias_ip_address != x ]; then
-ifconfig $interface:0- inet 0
+${ifconfig} $interface:0- inet 0
fi
- ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ ${ifconfig} $interface inet $new_ip_address $new_subnet_arg \
$new_broadcast_arg
set $new_routers
if ping -q -c 1 $1; then
if [ x$new_ip_address != x$alias_ip_address ] \
[ x$alias_ip_address != x ]; then
- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
- route add -host $alias_ip_address dev $interface:0
+ ${ifconfig} $interface:0 inet $alias_ip_address $alias_subnet_arg
+ ${route} add -host $alias_ip_address dev $interface:0
fi
if [ $relmajor -lt 2 ] || \
( [ $relmajor -eq 2 ] [ $relminor -eq 0 ] ); then
- route add -net $new_network_number
+ ${route} add -net $new_network_number
fi
for router in $new_routers; do
if [ x$new_subnet_mask = x255.255.255.255 ] ; then
-route add -host $router dev $interface
+${route} add -host $router dev $interface
fi
- route add default gw $router
+ ${route} add default gw $router
done
make_resolv_conf
exit_with_hooks 0
fi
- ifconfig $interface inet 0 down
+ ${ifconfig} $interface inet 0 down
exit_with_hooks 1
fi
--
1.7.0.4
--
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 1/7] libnih: new package needed by upstart
Tim Sander wrote:
Signed-off-by: Tim Sander tim.san...@hbm.com
rules/libnih.in |9 +
rules/libnih.make | 88
+
2 files changed, 97 insertions(+), 0 deletions(-)
create mode 100644 rules/libnih.in
create mode 100644 rules/libnih.make
diff --git a/rules/libnih.in b/rules/libnih.in
new file mode 100644
index 000..0a883e2
--- /dev/null
+++ b/rules/libnih.in
@@ -0,0 +1,9 @@
+## SECTION=system_libraries
+
+config LIBNIH
+ bool
+ prompt libnih
+ select DBUS
+ select HOST_LIBNIH
+ help
+ libnih is a small library for C application development containing
functions that, despite its name, are not implemented elsewhere in the
standard library set.
diff --git a/rules/libnih.make b/rules/libnih.make
new file mode 100644
index 000..f656726
--- /dev/null
+++ b/rules/libnih.make
@@ -0,0 +1,88 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Tim Sander
+#
+# 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_LIBNIH) += libnih
+
+#
+# Paths and names
+#
+LIBNIH_VERSION := 1.0.2
+LIBNIH := libnih-$(LIBNIH_VERSION)
+LIBNIH_SUFFIX := tar.gz
+LIBNIH_URL :=
http://launchpad.net/libnih/1.0/$(LIBNIH_VERSION)/+download/$(LIBNIH).$(LIBNIH_SUFFIX)
+LIBNIH_DIR := $(BUILDDIR)/$(LIBNIH)
+LIBNIH_SOURCE := $(SRCDIR)/$(LIBNIH).$(LIBNIH_SUFFIX)
+
+#
+# Get
+#
+$(LIBNIH_SOURCE):
+ @$(call targetinfo)
+ @$(call get, LIBNIH)
+
+#
+# Prepare
+#
+
+LIBNIH_PATH:= PATH=$(CROSS_PATH)
+LIBNIH_ENV := $(CROSS_ENV)
NIH_DBUS_TOOL=${PTXDIST_PLATFORMDIR}/sysroot-host/bin/nih-dbus-tool
please use $(PTXDIST_SYSROOT_HOST)
+
+#
+# autoconf
+#
+LIBNIH_AUTOCONF := \
+ $(CROSS_AUTOCONF_USR)
+
+#
+# Target-Install
+#
+
+$(STATEDIR)/libnih.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, libnih)
+ @$(call install_fixup, libnih, PACKAGE, libnih)
+ @$(call install_fixup, libnih, PRIORITY, optional)
+ @$(call install_fixup, libnih, VERSION, 1.0.1)
+ @$(call install_fixup, libnih, SECTION, base)
+ @$(call install_fixup, libnih, AUTHOR, Tim Sander)
+ @$(call install_fixup, libnih, DEPENDS,)
+ @$(call install_fixup, libnih, DESCRIPTION, missing)
+ @for i in $(shell cd $(PKGDIR)/$(LIBNIH) find bin sbin usr/bin
usr/sbin -type f); do \
+ $(call install_copy, libnih, 0, 0, 0755, -, /$$i); \
+ done
+ @for i in $(shell cd $(PKGDIR)/$(LIBNIH) find lib usr/lib -name
*.so*); do \
+ $(call install_copy, libnih, 0, 0, 0644, -, /$$i); \
+ done
+ @links=$(shell cd $(PKGDIR)/$(LIBNIH) find lib usr/lib -type l);
\
+ if [ -n $$links ]; then \
+ for i in $$links; do \
+ from=`readlink $(PKGDIR)/$(LIBNIH)/$$i`; \
+ to=/$$i; \
+ $(call install_link, libnih, $$from, $$to); \
+ done; \
+ fi
+ @$(call install_finish, libnih)
+
+ @$(call touch)
+
+#
+# Clean
+#
+
+libnih_clean:
+ rm -rf $(STATEDIR)/libnih.*
+ rm -rf $(PKGDIR)/libnih_*
+ rm -rf $(LIBNIH_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 2/7] host-libnih: new package needed to for libnih
Tim Sander wrote: Signed-off-by: Tim Sander tim.san...@hbm.com please add host-libnih before libnih. --- rules/host-libnih.in |4 rules/host-libnih.make | 33 + 2 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 rules/host-libnih.in create mode 100644 rules/host-libnih.make diff --git a/rules/host-libnih.in b/rules/host-libnih.in new file mode 100644 index 000..53513d5 --- /dev/null +++ b/rules/host-libnih.in @@ -0,0 +1,4 @@ +## SECTION=hosttools_noprompt +config HOST_LIBNIH + tristate + select HOST_DBUS diff --git a/rules/host-libnih.make b/rules/host-libnih.make new file mode 100644 index 000..385f8c5 --- /dev/null +++ b/rules/host-libnih.make @@ -0,0 +1,33 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Tim Sander ti...@iss.tu-darmstadt.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_LIBNIH) += host-libnih + +# +# Paths and names +# +HOST_LIBNIH_DIR= $(HOST_BUILDDIR)/$(LIBNIH) + +# +# Prepare +# + +HOST_LIBNIH_PATH := PATH=$(HOST_PATH) +HOST_LIBNIH_ENV:= $(HOST_ENV) these two lines can be removed + +# +# autoconf +# +HOST_LIBNIH_AUTOCONF := $(HOST_AUTOCONF) + +# 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 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 fix.I usually use debian's description 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 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/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 + --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 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 v2 05/20] Add generation of tags file for u-boot
Remy Bohmer wrote: Signed-off-by: Remy Bohmer li...@bohmer.net --- rules/u-boot.make |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rules/u-boot.make b/rules/u-boot.make index 728a2cc..2caa1c7 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -39,6 +39,7 @@ $(U_BOOT_SOURCE): U_BOOT_PATH := PATH=$(CROSS_PATH) U_BOOT_MAKE_OPT := CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) HOSTCC=$(HOSTCC) U_BOOT_MAKE_PAR := NO +U_BOOT_TAGS_OPT := ctags cscope Please add etag aswell... $(STATEDIR)/u-boot.prepare: @$(call targetinfo) ...and, if it works, 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] Add mpg123 rule/in file.
Juergen Kilb wrote: Signed-off-by: Jürgen Kilb j.k...@phytec.de --- rules/mpg123.in | 13 +++ rules/mpg123.make | 105 + 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 rules/mpg123.in create mode 100644 rules/mpg123.make diff --git a/rules/mpg123.in b/rules/mpg123.in new file mode 100644 index 000..4eff698 --- /dev/null +++ b/rules/mpg123.in @@ -0,0 +1,13 @@ +## SECTION=multimedia_sound + +config MPG123 + tristate + prompt mpg123 + help + mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1,2 and 3 + (MPEG 1.0 layer 3 aka MP3 most commonly tested). Among others working with Linux, + MacOSX, FreeBSD, SunOS4.1.3, Solaris 2.5, HPUX 9.x, SGI Irix and Cygwin or plain + MS Windows. + It is free software licensed under LGPL 2.1 (the officially released sources, + some files in subversion repository may differ). please remove the tailing whitespace. please indent with one tab and two spaces for the help text. + diff --git a/rules/mpg123.make b/rules/mpg123.make new file mode 100644 index 000..5088816 --- /dev/null +++ b/rules/mpg123.make @@ -0,0 +1,105 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Jürgen Kilb +# +# 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_MPG123) += mpg123 + +# +# Paths and names +# +MPG123_VERSION := 1.12.1 +MPG123 := mpg123-$(MPG123_VERSION) +MPG123_SUFFIX:= tar.bz2 +MPG123_URL := http://www.mpg123.org/download/$(MPG123).$(MPG123_SUFFIX) +MPG123_SOURCE:= $(SRCDIR)/$(MPG123).$(MPG123_SUFFIX) +MPG123_DIR := $(BUILDDIR)/$(MPG123) +MPG123_LICENSE := LGPL if it's LGPLv2.1 then add this to LICENSE, too + +# +# Get +# + +$(MPG123_SOURCE): + @$(call targetinfo) + @$(call get, MPG123) + +# +# Prepare +# + +#MPG123_CONF_ENV := $(CROSS_ENV) + +# +# autoconf +# +MPG123_CONF_TOOL := autoconf +#MPG123_CONF_OPT := $(CROSS_AUTOCONF_USR) + +#$(STATEDIR)/mpg123.prepare: +#@$(call targetinfo) +#@$(call clean, $(MPG123_DIR)/config.cache) +#cd $(MPG123_DIR) \ +#$(MPG123_PATH) $(MPG123_ENV) \ +#./configure $(MPG123_CONF_OPT) +#@$(call touch) + +# +# Compile +# + +#$(STATEDIR)/mpg123.compile: +#@$(call targetinfo) +#@$(call world/compile, MPG123) +#@$(call touch) + +# +# Install +# + +#$(STATEDIR)/mpg123.install: +#@$(call targetinfo) +#@$(call world/install, MPG123) +#@$(call touch) please remove the commented out stages and variables. They are just for reference. + +# +# Target-Install +# + +$(STATEDIR)/mpg123.targetinstall: + @$(call targetinfo) + + @$(call install_init, mpg123) + @$(call install_fixup, mpg123,PACKAGE,mpg123) + @$(call install_fixup, mpg123,PRIORITY,optional) + @$(call install_fixup, mpg123,VERSION,$(MPG123_VERSION)) + @$(call install_fixup, mpg123,SECTION,base) + @$(call install_fixup, mpg123,AUTHOR,Jürgen Kilb j.k...@phytec.de) + @$(call install_fixup, mpg123,DEPENDS,) + @$(call install_fixup, mpg123,DESCRIPTION,missing) + + @$(call install_copy, mpg123, 0, 0, 0755, -, /usr/bin/mpg123) + @$(call install_copy, mpg123, 0, 0, 0644, -, /usr/lib/libmpg123.so.0.25.0) + @$(call install_link, mpg123, libmpg123.so.0.25.0, /usr/lib/libmpg123.so) + @$(call install_link, mpg123, libmpg123.so.0.25.0, /usr/lib/libmpg123.so.0) + @$(call install_finish, mpg123) + + @$(call touch) + +# +# Clean +# + +#$(STATEDIR)/mpg123.clean: +#@$(call targetinfo) +#@$(call clean_pkg, MPG123) + dito +# vim: syntax=make cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde
Re: [ptxdist] [PATCH] libnih
Tim Sander wrote:
Hi
This is patch 7290cdbf0d483085f6bacf8be7233406cfb88ce6
from git://gitorious.org/~tstone/oselas/ptxdist-upstart.git.
Should contain all fixes suggested on this list. The commit
order in the git repository has been shuffled to fit the suggestions.
Best regards
Tim
diff --git a/rules/libnih.in b/rules/libnih.in
new file mode 100644
index 000..d29b415
--- /dev/null
+++ b/rules/libnih.in
@@ -0,0 +1,11 @@
+## SECTION=system_libraries
+
+config LIBNIH
+ bool
+ prompt libnih
+ select DBUS
+ select HOST_LIBNIH
+ help
+ libnih is a small library for C application development containing
+ functions that, despite its name, are not implemented elsewhere in
+ the standard library set.
diff --git a/rules/libnih.make b/rules/libnih.make
new file mode 100644
index 000..f40be37
--- /dev/null
+++ b/rules/libnih.make
@@ -0,0 +1,74 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Tim Sander tim.san...@hbm.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
+#
+PACKAGES-$(PTXCONF_LIBNIH) += libnih
+
+#
+# Paths and names
+#
+LIBNIH_VERSION := 1.0.2
+LIBNIH := libnih-$(LIBNIH_VERSION)
+LIBNIH_SUFFIX := tar.gz
+LIBNIH_URL :=
http://launchpad.net/libnih/1.0/$(LIBNIH_VERSION)/+download/$(LIBNIH).$(LIBNIH_SUFFIX)
+LIBNIH_DIR := $(BUILDDIR)/$(LIBNIH)
+LIBNIH_SOURCE := $(SRCDIR)/$(LIBNIH).$(LIBNIH_SUFFIX)
+LIBNIH_LICENSE := GPLv2+
just coding style: please align the := with tabs before them
+
+#
+# Get
+#
+$(LIBNIH_SOURCE):
+ @$(call targetinfo)
+ @$(call get, LIBNIH)
+
+#
+# Prepare
+#
+
+LIBNIH_PATH:= PATH=$(CROSS_PATH)
+LIBNIH_ENV := $(CROSS_ENV)
NIH_DBUS_TOOL=${PTXDIST_SYSROOT_HOST}/bin/nih-dbus-tool
+
+#
+# autoconf
+#
+LIBNIH_AUTOCONF := \
+ $(CROSS_AUTOCONF_USR)
+
+#
+# Target-Install
+#
+
+$(STATEDIR)/libnih.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, libnih)
+ @$(call install_fixup, libnih, PACKAGE, libnih)
+ @$(call install_fixup, libnih, PRIORITY, optional)
+ @$(call install_fixup, libnih, VERSION, 1.0.1)
+ @$(call install_fixup, libnih, SECTION, base)
+ @$(call install_fixup, libnih, AUTHOR, Tim Sandet
tim.san...@hbm.com)
+ @$(call install_fixup, libnih, DEPENDS,)
+ @$(call install_fixup, libnih, DESCRIPTION, missing)
+
+
+ $(call install_copy, libnih, 0, 0, 0644, -,
/usr/lib/libnih-dbus.so.1.0.0);
+ $(call install_copy, libnih, 0, 0, 0644, -,
/usr/lib/libnih.so.1.0.0);
+ $(call install_link, libnih, libnih-dbus.so.1.0.0,
/usr/lib/libnih-dbus.so.1);
+ $(call install_link, libnih, libnih-dbus.so.1.0.0,
/usr/lib/libnih-dbus.so);
+ $(call install_link, libnih, libnih.so.1.0.0, /usr/lib/libnih.so.1);
+ $(call install_link, libnih, libnih.so.1.0.0, /usr/lib/libnih.so);
+ @$(call install_finish, libnih)
+
+ @$(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] libnih
Michael Olbrich wrote:
On Tue, Jun 01, 2010 at 11:59:04AM +0200, Marc Kleine-Budde wrote:
Tim Sander wrote:
Hi
This is patch 7290cdbf0d483085f6bacf8be7233406cfb88ce6
from git://gitorious.org/~tstone/oselas/ptxdist-upstart.git.
Should contain all fixes suggested on this list. The commit
order in the git repository has been shuffled to fit the suggestions.
Best regards
Tim
diff --git a/rules/libnih.in b/rules/libnih.in
new file mode 100644
index 000..d29b415
--- /dev/null
+++ b/rules/libnih.in
@@ -0,0 +1,11 @@
+## SECTION=system_libraries
+
+config LIBNIH
+ bool
+ prompt libnih
+ select DBUS
+ select HOST_LIBNIH
+ help
+ libnih is a small library for C application development
containing
+ functions that, despite its name, are not implemented elsewhere
in
+ the standard library set.
diff --git a/rules/libnih.make b/rules/libnih.make
new file mode 100644
index 000..f40be37
--- /dev/null
+++ b/rules/libnih.make
@@ -0,0 +1,74 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Tim Sander tim.san...@hbm.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
+#
+PACKAGES-$(PTXCONF_LIBNIH) += libnih
+
+#
+# Paths and names
+#
+LIBNIH_VERSION := 1.0.2
+LIBNIH := libnih-$(LIBNIH_VERSION)
+LIBNIH_SUFFIX := tar.gz
+LIBNIH_URL :=
http://launchpad.net/libnih/1.0/$(LIBNIH_VERSION)/+download/$(LIBNIH).$(LIBNIH_SUFFIX)
+LIBNIH_DIR := $(BUILDDIR)/$(LIBNIH)
+LIBNIH_SOURCE := $(SRCDIR)/$(LIBNIH).$(LIBNIH_SUFFIX)
+LIBNIH_LICENSE := GPLv2+
just coding style: please align the := with tabs before them
They are aligned. The patch is broken by his mail program.
nope, I just looked at the tim's git tree.
Marc
+
+#
+# Get
+#
+$(LIBNIH_SOURCE):
+ @$(call targetinfo)
+ @$(call get, LIBNIH)
+
+#
+# Prepare
+#
+
+LIBNIH_PATH:= PATH=$(CROSS_PATH)
+LIBNIH_ENV := $(CROSS_ENV)
NIH_DBUS_TOOL=${PTXDIST_SYSROOT_HOST}/bin/nih-dbus-tool
+
+#
+# autoconf
+#
+LIBNIH_AUTOCONF := \
+ $(CROSS_AUTOCONF_USR)
+
+#
+# Target-Install
+#
+
+$(STATEDIR)/libnih.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, libnih)
+ @$(call install_fixup, libnih, PACKAGE, libnih)
+ @$(call install_fixup, libnih, PRIORITY, optional)
+ @$(call install_fixup, libnih, VERSION, 1.0.1)
+ @$(call install_fixup, libnih, SECTION, base)
+ @$(call install_fixup, libnih, AUTHOR, Tim Sandet
tim.san...@hbm.com)
+ @$(call install_fixup, libnih, DEPENDS,)
+ @$(call install_fixup, libnih, DESCRIPTION, missing)
+
+
+ $(call install_copy, libnih, 0, 0, 0644, -,
/usr/lib/libnih-dbus.so.1.0.0);
+ $(call install_copy, libnih, 0, 0, 0644, -,
/usr/lib/libnih.so.1.0.0);
+ $(call install_link, libnih, libnih-dbus.so.1.0.0,
/usr/lib/libnih-dbus.so.1);
+ $(call install_link, libnih, libnih-dbus.so.1.0.0,
/usr/lib/libnih-dbus.so);
+ $(call install_link, libnih, libnih.so.1.0.0,
/usr/lib/libnih.so.1);
+ $(call install_link, libnih, libnih.so.1.0.0, /usr/lib/libnih.so);
+ @$(call install_finish, libnih)
+
+ @$(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 |
--
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] libnih
Michael Olbrich wrote:
On Tue, Jun 01, 2010 at 12:33:21PM +0200, Marc Kleine-Budde wrote:
Michael Olbrich wrote:
On Tue, Jun 01, 2010 at 11:59:04AM +0200, Marc Kleine-Budde wrote:
Tim Sander wrote:
Hi
This is patch 7290cdbf0d483085f6bacf8be7233406cfb88ce6
from git://gitorious.org/~tstone/oselas/ptxdist-upstart.git.
Should contain all fixes suggested on this list. The commit
order in the git repository has been shuffled to fit the suggestions.
Best regards
Tim
diff --git a/rules/libnih.in b/rules/libnih.in
new file mode 100644
index 000..d29b415
--- /dev/null
+++ b/rules/libnih.in
@@ -0,0 +1,11 @@
+## SECTION=system_libraries
+
+config LIBNIH
+ bool
+ prompt libnih
+ select DBUS
+ select HOST_LIBNIH
+ help
+ libnih is a small library for C application development
containing
+ functions that, despite its name, are not implemented elsewhere
in
+ the standard library set.
diff --git a/rules/libnih.make b/rules/libnih.make
new file mode 100644
index 000..f40be37
--- /dev/null
+++ b/rules/libnih.make
@@ -0,0 +1,74 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Tim Sander tim.san...@hbm.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
+#
+PACKAGES-$(PTXCONF_LIBNIH) += libnih
+
+#
+# Paths and names
+#
+LIBNIH_VERSION := 1.0.2
+LIBNIH := libnih-$(LIBNIH_VERSION)
+LIBNIH_SUFFIX := tar.gz
+LIBNIH_URL :=
http://launchpad.net/libnih/1.0/$(LIBNIH_VERSION)/+download/$(LIBNIH).$(LIBNIH_SUFFIX)
+LIBNIH_DIR := $(BUILDDIR)/$(LIBNIH)
+LIBNIH_SOURCE := $(SRCDIR)/$(LIBNIH).$(LIBNIH_SUFFIX)
+LIBNIH_LICENSE := GPLv2+
just coding style: please align the := with tabs before them
They are aligned. The patch is broken by his mail program.
nope, I just looked at the tim's git tree.
You're right, some lines have spaces.
+
+#
+# Get
+#
+$(LIBNIH_SOURCE):
+ @$(call targetinfo)
+ @$(call get, LIBNIH)
+
+#
+# Prepare
+#
+
+LIBNIH_PATH:= PATH=$(CROSS_PATH)
+LIBNIH_ENV := $(CROSS_ENV)
NIH_DBUS_TOOL=${PTXDIST_SYSROOT_HOST}/bin/nih-dbus-tool
+
+#
+# autoconf
+#
+LIBNIH_AUTOCONF := \
+ $(CROSS_AUTOCONF_USR)
+
+#
+# Target-Install
+#
+
+$(STATEDIR)/libnih.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, libnih)
+ @$(call install_fixup, libnih, PACKAGE, libnih)
+ @$(call install_fixup, libnih, PRIORITY, optional)
+ @$(call install_fixup, libnih, VERSION, 1.0.1)
+ @$(call install_fixup, libnih, SECTION, base)
+ @$(call install_fixup, libnih, AUTHOR, Tim Sandet
tim.san...@hbm.com)
+ @$(call install_fixup, libnih, DEPENDS,)
+ @$(call install_fixup, libnih, DESCRIPTION, missing)
+
+
+ $(call install_copy, libnih, 0, 0, 0644, -,
/usr/lib/libnih-dbus.so.1.0.0);
+ $(call install_copy, libnih, 0, 0, 0644, -,
/usr/lib/libnih.so.1.0.0);
+ $(call install_link, libnih, libnih-dbus.so.1.0.0,
/usr/lib/libnih-dbus.so.1);
+ $(call install_link, libnih, libnih-dbus.so.1.0.0,
/usr/lib/libnih-dbus.so);
+ $(call install_link, libnih, libnih.so.1.0.0,
/usr/lib/libnih.so.1);
+ $(call install_link, libnih, libnih.so.1.0.0,
/usr/lib/libnih.so);
and please remove the trailing white spaces here.
Everything compiled fine here.
Marc: unless you have any other issues I'll merge the tree when these
formating issues are taken care of.
mol
mol if it compiles, push it.
Marc
+ @$(call install_finish, libnih)
+
+ @$(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 |
--
ptxdist mailing list
ptxdist@pengutronix.de
/home/photos/album_boards/20100601-BBU-Guru-Plug_Marvell-Kirkwood_6281-1_1.2GHz
--
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 |
--
ptxdist mailing list
ptxdist
Re: [ptxdist] [PATCH] libnih
Tim Sander wrote: Hi Marc: unless you have any other issues I'll merge the tree when these formating issues are taken care of. mol if it compiles, push it. Are you happy with this package or do you need some formatting fixes? please fix 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/9] [glib25] add glib-2.25
+ prompt experimental version + choice + prompt gettext variant - default GLIB__GETTEXT_NONE + default GLIB_GETTEXT_NONE - config GLIB__GETTEXT_NONE + config GLIB_GETTEXT_NONE bool prompt not needed - config GLIB__GETTEXT_GETTEXT + config GLIB_GETTEXT_GETTEXT bool prompt gnu (gettext) - config GLIB__GETTEXT_DUMMY + config GLIB_GETTEXT_DUMMY bool prompt dummy diff --git a/rules/glib.make b/rules/glib.make index 203fe9f..724bb34 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -17,14 +17,22 @@ PACKAGES-$(PTXCONF_GLIB) += glib # # Paths and names # +ifdef PTXCONF_GLIB_EXPERIMENTAL +GLIB_VERSION := 2.25.7 +else GLIB_VERSION := 2.22.2 +endif GLIB := glib-$(GLIB_VERSION) GLIB_SUFFIX := tar.bz2 GLIB_SOURCE := $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX) GLIB_DIR := $(BUILDDIR)/$(GLIB) +ifdef PTXCONF_GLIB_EXPERIMENTAL +GLIB_URL := http://ftp.gtk.org/pub/glib/2.25/glib-$(GLIB_VERSION).$(GLIB_SUFFIX) +else GLIB_URL := http://ftp.gtk.org/pub/glib/2.22/glib-$(GLIB_VERSION).$(GLIB_SUFFIX) +endif # # Get @@ -52,6 +60,27 @@ GLIB_ENV := \ # is the right choice for no locales and locales-via-libc # +ifdef PTXCONF_GLIB_EXPERIMENTAL +GLIB_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --enable-silent-rules \ + --enable-debug=minimum \ + --disable-gc-friendly \ + --enable-mem-pools \ + --enable-threads \ + --with-threads=posix \ + --disable-rebuilds \ + --disable-included-printf \ + --disable-selinux \ + --disable-fam \ + --disable-xattr \ + --disable-gtk-doc \ + --disable-man \ + --with-pcre=internal \ + --enable-static \ + --enable-shared \ + --with-libiconv=no +else GLIB_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --enable-threads \ @@ -70,28 +99,17 @@ GLIB_AUTOCONF := \ --with-gnu-ld \ --with-pcre=internal \ --with-libiconv=no - -# --enable-debug=[no/minimum/yes] -# turn on debugging [default=minimum] -# --disable-mem-pools disable all glib memory pools -# --disable-rebuilds disable all source autogeneration rules -# --disable-visibilitydon't use ELF visibility attributes -# --disable-largefile omit support for large files -# --enable-iconv-cache=[yes/no/auto] -# cache iconv descriptors [default=auto] -# --disable-regex disable the compilation of GRegex -# -# --with-pic try to use only PIC/non-PIC objects [default=use -# both] -# --with-gio-module-dir=PATH -# Load gio modules from this directory -# [LIBDIR/gio/modules] +endif # # Target-Install # +ifdef PTXCONF_GLIB_EXPERIMENTAL +GLIB_LIB_VERSION := 0.2507.0 +else GLIB_LIB_VERSION := 0.2200.2 +endif $(STATEDIR)/glib.targetinstall: @$(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 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
Re: [ptxdist] [PATCH] [lshw] add new packet
+ +# +# Target-Install +# + +$(STATEDIR)/lshw.targetinstall: +@$(call targetinfo) + +@$(call install_init, lshw) +@$(call install_fixup, lshw,PACKAGE,lshw) +@$(call install_fixup, lshw,PRIORITY,optional) +@$(call install_fixup, lshw,VERSION,$(LSHW_VERSION)) +@$(call install_fixup, lshw,SECTION,base) +@$(call install_fixup, lshw,AUTHOR,Bart vdr. Meulen bartvdrmeu...@gmail.com) +@$(call install_fixup, lshw,DEPENDS,) +@$(call install_fixup, lshw,DESCRIPTION,missing) + +@$(call install_copy, lshw, 0, 0, 0755, -, /usr/sbin/lshw) + +@$(call install_copy, lshw, 0, 0, 0755, /usr/share/lshw) +@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/pci.ids) +@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/usb.ids) +@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/oui.txt) +@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/manuf.txt) + +ifdef PTXCONF_LSHW_GUI +@$(call install_copy, lshw, 0, 0, 0755, -, /usr/sbin/gtk-lshw) + +@$(call install_copy, lshw, 0, 0, 0755, /usr/share/lshw/artwork) +@cd $(LSHW_PKGDIR)/usr/share/lshw/artwork; \ +for file in * ; do \ +$(call install_copy, lshw, 0, 0, 0644, -, \ +/usr/share/lshw/artwork$$file); \ /usr/share/lshw/artwork/$$file); \ missing '/' +done +endif + +@$(call install_finish, lshw) +@$(call touch) + +# vim: syntax=make -- 1.7.0.4 -- 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] [ptxdist-commit] [git:ptxdist-master] in older bash versions read does not support -i
Moin,
Michael Olbrich wrote:
From: Michael Olbrich m.olbr...@pengutronix.de
Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de
[frog...@hardanger:OSELAS.BSP-Pengutronix-AllYes-trunk]$ ./p newpackage file
ptxdist: creating a new 'file' package:
ptxdist: enter package name...: foo
ptxdist: enter version number.: bar
ptxdist: enter package author.: baz
./p: line 1113: read: -i: invalid option
read: usage: read [-ers] [-u fd] [-t timeout] [-p prompt] [-a array] [-n
nchars] [-d delim] [name ...]
That message looks scary :) How can this be fixed.
Marc
---
bin/ptxdist |9 +++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/bin/ptxdist b/bin/ptxdist
index ac6b5ab..49e6556 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1099,10 +1099,15 @@ newpackage() {
;;
esac
+ local iargs
+ if echo | read -i foo -p bar -e /dev/null 21; then
+ iargs=(-i ${PTXCONF_SETUP_USER_NAME}
${PTXCONF_SETUP_USER_EMAIL})
+ else
+ iargs=()
+ fi
local author
read -e -p ${PTXDIST_LOG_PROMPT}enter package author.: \
- -i ${PTXCONF_SETUP_USER_NAME} ${PTXCONF_SETUP_USER_EMAIL} \
- author
+ ${iar...@]} author
local section
read -e -p ${PTXDIST_LOG_PROMPT}enter package section: \
--
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] stable update (was: Re: ptxdist-2010.06.0 and ptxdist-2010.05.3)
Hey, just after releasing 2010.06.0 a bug was noticed in the version check magic. ptxdist should bail out if you use a new version of ptxdist and try to build a BSP which was released with an old version of ptxdist, but it didn't. So here are two stable updates: 2010.06.1 and 2010.05.4 which fix this problem, shortlog: Marc Kleine-Budde (1): [ptxdist] fix version check, bail out if using two incompatible releases cheesrs, 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] fix wrong TABs in rules/pre/kernel.make
Enrik Berkhan wrote: This patch replaces some erroneous TAB characters in rules/pre/kernel.make by SPACEs. The TABs trigger the following error if PTXCONF_COMPILER_PREFIX_KERNEL is selected but no selected_toolchain_kernel link has been created yet: .../rules/pre/kernel.make:18: *** commands commence before first target. Stop. Doh! Thanks for spotting this. Commited to master cheers, Marc From my point of view it breaks as it should, but displays the wrong error message :P -- 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] [SRC_PKG] umkimage-2010.03
Hey Remy, good idea about updating the tool, it was quite rusty :) Remy Bohmer wrote: Hi, A few minutes ago I posted 2 patches that both rely on a source package for u-boot-mkimage-2010.03.tar.gz to be available at: http://www.pengutronix.de/software/ptxdist/temporary-src/ The package is too big for the mailinglist limit of 100kB. So, where can I put it? (I will try reposting it in a separate mail in a few minutes, but I do not expect it to arrive on the list, but maybe a miracle happens ;-) ) IIRC you posted your tool already (maybe an older version) some days ago. I had a short look at it. I suggest to keep the same directory layout as in u-boot itself, so that future update maybe a bit easier. Maybe implement something like this: make import U_BOOT_TREE=/path/to/u-boot I've hacked it together, along with some proper build system. I like autotools :) Have a look at: http://git.pengutronix.de/?p=mkl/u-boot-mkimage.git;a=summary I started with v2010.06-rc1, maybe your patch isn't needed anymore. 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] [SRC_PKG] umkimage-2010.03
Remy Bohmer wrote: A few minutes ago I posted 2 patches that both rely on a source package for u-boot-mkimage-2010.03.tar.gz to be available at: http://www.pengutronix.de/software/ptxdist/temporary-src/ The package is too big for the mailinglist limit of 100kB. So, where can I put it? (I will try reposting it in a separate mail in a few minutes, but I do not expect it to arrive on the list, but maybe a miracle happens ;-) ) IIRC you posted your tool already (maybe an older version) some days ago. Indeed, but it was a bit silent about so I reposted it again good idea. These were the changes to the source package in relation to the first time I posted the sorces: * Added COPYING file, since it is belongs to U-boot code. * Added an install make target to the Makefile. I had a short look at it. I suggest to keep the same directory layout as in u-boot itself, so that future update maybe a bit easier. I followed the same structure as what was now the case of the source package and makefiles. Of course it can be done differently, but this worked as well ;-) okay Maybe implement something like this: make import U_BOOT_TREE=/path/to/u-boot I've hacked it together, along with some proper build system. I like autotools :) It seems ;-) Have a look at: http://git.pengutronix.de/?p=mkl/u-boot-mkimage.git;a=summary I started with v2010.06-rc1, maybe your patch isn't needed anymore. Indeed the patch was integrated between 2010.03 and 2010.06, but since 2010.06 is not released yet I choose 2010.03 as last stable release. The tool has not changed since (except for the compile fix for mingw targets ;-) ) okay, then...can I pull your u-boot-mkimage sources and put it in a git tree at pengutronix? Please make mark your release with tag. Then I'll create a tarball with $(git archive) and upload it to our webserver. 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
[ptxdist] (no subject)
Hey Remy, Here it is: git clone git://gitorious.org/u-boot-mkimage/u-boot-mkimage.git Can we remove stripping. Better let the distribution decide about stripping. Also respect CPP and LDFLAGS. See the following patches. cheers, Marc -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] (no subject)
Remy Bohmer wrote: Hi, 2010/6/16 Marc Kleine-Budde m...@pengutronix.de: Remy Bohmer wrote: Hi, 2010/6/16 Marc Kleine-Budde m...@pengutronix.de: Hey Remy, Here it is: git clone git://gitorious.org/u-boot-mkimage/u-boot-mkimage.git Can we remove stripping. Better let the distribution decide about stripping. OK Also respect CPP and LDFLAGS. See the following patches. For both patches: Acked-by: Remy Bohmer li...@bohmer.net Tnx, can I your a S-o-b under the initial commit? OK Signed-off-by: Remy Bohmer li...@bohmer.net tnx, I've uploaded it to: http://git.pengutronix.de/?p=tools/u-boot-mkimage.git;a=summary I also made a tag v2010.03-1, this means based on u-boot v2010.03 and our first release. I'm going to upload the tarball to temp-src. I can adjust your ptxdist patches (remove STRIP= and care about the -1) and apply them to master. 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] (no subject)
Remy Bohmer wrote: I also made a tag v2010.03-1, this means based on u-boot v2010.03 and our first release. I'm going to upload the tarball to temp-src. I can adjust your ptxdist patches (remove STRIP= and care about the -1) and apply them to master. I've regenerated the rules files, so that the version is specified in the target package and the host packages just uses the target's definitions. Great. Thanks. please pull and test, it's only compile-time tested here :D 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] rework ubi image generation
Luotao Fu wrote: On Thu, May 27, 2010 at 01:07:24PM +0200, Marc Kleine-Budde wrote: Luotao Fu wrote: This one reworks the ubifs image options in ptxdist. The menu structure got a reorganisation. The help text contains now some more hints. Some new options are also added. The ubi image targets are now stripped out from the central images.make file and put in a seperate Makefile. Main feature change is that we are now able to create a addtional data partition either as an further volume in the root.ubi image or as a standalone single-volumed ubiimage. Currently the data partition only contains an empty ubi volume. It's however considerable that we can extend this so that we can generate a data partition with contents defined from ptxdist. please split it in several patches. at least one moving from images.make to image_ubi*.make and another for the enhancements. All right tnx, merged into master 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
[ptxdist] [PATCH 0/3] cleanups and updates of lvm2
Hey, I've cleaned up lvm2 and used the latest version, can you please test it. cheers, Marc -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/3] [lvm2] just cleanups
Signed-off-by: Marc Kleine-Budde m...@pengutronix.de Cc: Bart vdr. Meulen bartvdrmeu...@gmail.com Cc: Remy Bohmer li...@bohmer.net --- rules/lvm2.make | 19 ++- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/rules/lvm2.make b/rules/lvm2.make index 35f93aa..e6f18fe 100644 --- a/rules/lvm2.make +++ b/rules/lvm2.make @@ -37,20 +37,21 @@ $(LVM2_SOURCE): # # Prepare # -LVM2_PATH := PATH=$(CROSS_PATH) -# CLDFLAGS is real name used by the Makefiles, it is not a typo -LVM2_ENV := $(CROSS_ENV) \ - CLDFLAGS=$(CROSS_LDFLAGS) \ - CFLAGS=$(CROSS_CPPFLAGS) + +LVM2_ENV := \ + $(CROSS_ENV) \ + CFLAGS=$(CROSS_CFLAGS) $(CROSS_CPPFLAGS) \ + ac_cv_path_MODPROBE_CMD=/sbin/modprobe # # autoconf # LVM2_CONF_TOOL := autoconf -LVM2_CONF_OPT := $(CROSS_AUTOCONF_USR) \ - --with-device-uid=$(PTXCONF_LVM2_DEVICE_UID) \ - --with-device-gid=$(PTXCONF_LVM2_DEVICE_GID) \ - --with-device-mode=$(PTXCONF_LVM2_DEVICE_MODE) +LVM2_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --with-device-uid=$(PTXCONF_LVM2_DEVICE_UID) \ + --with-device-gid=$(PTXCONF_LVM2_DEVICE_GID) \ + --with-device-mode=$(PTXCONF_LVM2_DEVICE_MODE) # # Target-Install -- 1.7.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] [lvm2] install lib 0644
Signed-off-by: Marc Kleine-Budde m...@pengutronix.de Cc: Bart vdr. Meulen bartvdrmeu...@gmail.com Cc: Remy Bohmer li...@bohmer.net --- rules/lvm2.make |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/lvm2.make b/rules/lvm2.make index e6f18fe..88378e8 100644 --- a/rules/lvm2.make +++ b/rules/lvm2.make @@ -120,7 +120,7 @@ $(STATEDIR)/lvm2.targetinstall: @$(call install_alternative, lvm2, 0, 0, 0644, /etc/lvm/lvm.conf) - @$(call install_copy, lvm2, 0, 0, 0755, -, /usr/lib/libdevmapper.so.1.02) + @$(call install_copy, lvm2, 0, 0, 0644, -, /usr/lib/libdevmapper.so.1.02) @$(call install_link, lvm2, libdevmapper.so.1.02, /usr/lib/libdevmapper.so) ifdef PTXCONF_LVM2_STARTSCRIPT -- 1.7.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/3] [lvm2] version bump to 2.02.66
Signed-off-by: Marc Kleine-Budde m...@pengutronix.de Cc: Bart vdr. Meulen bartvdrmeu...@gmail.com Cc: Remy Bohmer li...@bohmer.net --- rules/lvm2.make |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/lvm2.make b/rules/lvm2.make index 88378e8..8f661c6 100644 --- a/rules/lvm2.make +++ b/rules/lvm2.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_LVM2) += lvm2 # # Paths and names # -LVM2_VERSION := 2.02.53 +LVM2_VERSION := 2.02.66 LVM2 := LVM2.$(LVM2_VERSION) LVM2_SUFFIX:= tgz LVM2_URL := \ -- 1.7.1 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] menu indentation patches
Remy Bohmer wrote: Hi, I noticed at the git log these patches: * [quota-tools] fix menu entry * [xfsprogs] fix menu indentation * [lshw] fix menu indentation * [lvm2] fix menu indention These patches all seem to do this: - prompt lvm2 + prompt lvm2 True, those extra spaces in the title looks nicer in the menu, but it looks just ugly in the '*.in' files. Why not fix this in Kconfig itself ? Any interest for a patch? sure. 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 0/3] cleanups and updates of lvm2
Remy Bohmer wrote: Hi, 2010/6/17 Marc Kleine-Budde m...@pengutronix.de: Hey, I've cleaned up lvm2 and used the latest version, can you please test it. We have tested all these 3 patches, so: Acked-by: Remy Bohmer li...@bohmer.net Thanks a lot, 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] menu indentation patches
Robert Schwebel wrote: On Thu, Jun 17, 2010 at 08:04:34PM +0200, Remy Bohmer wrote: True, those extra spaces in the title looks nicer in the menu, but it looks just ugly in the '*.in' files. Why not fix this in Kconfig itself ? Any interest for a patch? We try to follow upstream-Kconfig closely, so I assume it won't be worth the work. The rest of ptxdist does it per convention as well so far. I don't think so... We already patch Kconfig and a %50s instead of a %s print string won't hurt. Another thing is obviously to organize our kconfig patches. But that's a different story and our problem :) The trailing whitespace in the menuc may look fine in the text based menuconfig but look pretty stupid in k/x/g/whaterver config. (Just in case we want to resurrect support for 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] [PATCH] [coreutils] Remove unused library libstdbuf.so
Alexander Stein wrote: Is the libstdbuf.so from coreutils really used in some applets? The first install_copy in coreutils.targetinstall is to install this library to /usr/lib/coreutils/libstdbuf.so It seems to me, that no coreutils applet link itself to libstdbuf.so. I ran the following command from the packages/coreutils-8.2 directory where all applets should be installed. # find . -type f -perm -1 | xargs readelf -a | grep NEEDED | sort | uniq 0x0001 (NEEDED) Shared library: [libc.so.6] 0x0001 (NEEDED) Shared library: [libgcc_s.so.1] 0x0001 (NEEDED) Shared library: [libm.so.6] 0x0001 (NEEDED) Shared library: [librt.so.1] In my opinion, this should be removed at all. what about dynamic loading via dlopen()? 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] pull-request; package additions, package updates
Carsten Schlote wrote:
Hi,
these patches provide new or updated packages.
As usual the package patches provide fixes for cross-compilation and
compiler issues.
I've revied about the first half of the patches...
cheers, Marc
Carsten
---
The following changes since commit
dee596b721d29d45d721866b38cba693a72eab3d:
Marc Kleine-Budde (1):
[lmbench] cleanups: remove unneeded prepare stage
are available in the git repository at:
git://git.vahanus.net/csc/ptxdist-kp.git/ for-upstream
Carsten Schlote (22):
[gdb] Updated default value to 7.1
what about the patch from 7.0.1?
[lshw] Fixed GCC 4.5.0 warning which causes build break (-Werror)
Please add a Subject: and From: line to the patch
[6tunnel] Added package for 6tunnel, version 0.11rc2
Please add a Subject: and From: line to the patches.
The strip can stay in, we've a dummy-strip now.
Regading the get stage: what about downloading the tarball from here:
http://toxygen.net/6tunnel/6tunnel-0.11rc2.tar.gz, or have a look at
rules/miidiag.make how to handle debian's/ubuntu's orig filenames.
prepare: please don't call autogen.sh in the prepare stage, create a
link to ../autogen.sh in the patches dir or supply a private autogen.sh
there.
[statserial] Added statserial 1.1 with Ubuntu patches
Please add a Subject: and From: line to the patch
please modify the CFLAGS line to:
CFLAGS+= -Wall -O3 -fomit-frame-pointer $(CPPFLAGS)
it won't overwrite external provided CFLAGS
Please remove the LDFALGS = -s this is stripping and we don't want
this. I think our fake strip tool won't help here.
Please unzip that file: .../statserial-1.1.orig/statserial_1.1-22.diff.gz
Comment for the debian-orig-filename applies here, too.
Please use - as source in @$(call install_copy)
[zsync] Added version 0.6.1 as package to ptxdist
looks good, cherry-picked :)
[midnight commander] Updated version to 4.7.0, adding more install
options
can you please use the proposed debian filename handling
[udev] Updated to udev version 151
[ptxdist][v2] Updated ptxdist usage text for bash, make, removed
autobuild
[vpnc][v4] Added vpnc 0.5.3 package, a VPN client for Cisco
concentrators
[miredo][v5] Added miredo 1.2.2, a teredo IPV6 client
[ppp] Added plog and pppoe-discovery options and install
[ppp] Updated generic/{pon|poff} to maintainer version
[mtd-utils] Fixes LZO Compression and crashes
[nfsutils] Added dependancies when compiling NFSv4 support
[mtd-utils] Added config options and install
[mtd-utils] Workaround the -Werror problems
[dbench] Added dependency for libattr.so
[sysvinit] Added comments for busybox builtins used.
[acpid] Removed -Werror to allow compilation with GCC 4.4.1
[dhcp] Fixed GCC 4.4.1 compile error
[dhcp] Fixed problem with -Werror and GCC 4.5.0-snapshot
please squash these patches
[perl] Added version 5.10.1
bin/ptxdist| 19 +-
generic/etc/init.d/miredo-server | 89 +
generic/etc/miredo/client-hook | 70 +
generic/etc/miredo/miredo-server.conf | 22 +
generic/etc/miredo/miredo.conf | 35 +
generic/etc/vpnc/default.conf |6 +
generic/etc/vpnc/vpnc-script | 529 ++
generic/usr/bin/poff | 102 +-
generic/usr/bin/pon| 38 +-
patches/6tunnel-0.11rc2/crosscompile-fixes.patch | 55 +
patches/6tunnel-0.11rc2/fix-compile-warnings.patch | 22 +
patches/6tunnel-0.11rc2/series |2 +
.../fix-gcc-4.4.1-error-warnings.patch | 25 +
patches/acpid-1.0.10/series|1 +
patches/{udev-150 = dhcp-4.1.1}/autogen.sh|0
.../dhcp-4.1.1/gcc4.4-fixup-error-warning.patch| 39 +
patches/dhcp-4.1.1/series |1 +
patches/lshw-B.02.14/0003-fix-gcc450-issues.patch | 22 +
patches/lshw-B.02.14/series|1 +
patches/{udev-150 = mc-4.7.0}/autogen.sh |0
.../debian/02_use_correct_smb_conf_path.patch | 19 +
patches/mc-4.7.0/debian/03_use_awk.patch | 19 +
.../11_unzip_needs_regex_update_lp397505.patch | 30 +
patches/mc-4.7.0/mc-install-fixes.patch| 57 +
patches/mc-4.7.0/series|4 +
patches/{udev-150 = miredo-1.2.2}/autogen.sh |0
patches/miredo-1.2.2/series|3 +
patches/mtd-utils-1.3.1/lzo-compr-fixes.patch | 59 +
patches/mtd-utils-1.3.1/series |2 +
patches/perl-5.10.0/100-static_uudmap.patch| 50 +
patches/perl-5.10.0/perl-cross-fixes.patch |
+++
patches/perl
Re: [ptxdist] [PATCH] The '-q' option breaks 'ptxdist -q allyesconfig collection'
Remy Bohmer wrote: The result is an almost empty collection config file with no options selected, like this: === PTXCONF__collectionconfig_MAGIC__=y PTXCONF_COLLECTION_ALL=y === good catch. I moved the fix to scripts/lib/ptxd_lib_colgen.sh because the ptxd_make_log is affected by the PTXDIST_QUIET. 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
[ptxdist] 2010.07.0
Hello,
[...@himalia:~]$ /opt/bin/ptxdist --version
2010.07.0
can be downloaded at the usual places.
NOTE: ptxdist-2010.07.0 contains of just a single tar.bz2 file.
The former -patches tarball is now included.
shortlog follows:
Carsten Schlote (1):
[zsync] Added version 0.6.1 as package to ptxdist
Enrik Berkhan (1):
fix wrong TABs in rules/pre/kernel.make
Luotao Fu (4):
[ptxdist] split out ubi image stuffs in a separate rule
[ptxdist] enhance ubi image creation
[ptxdist] add data partition to UBI Image
[kbd] added keyboard utilities to ptxdist
Marc Kleine-Budde (31):
[make dist] build a single tarball containing ptxdist and patches
[ptxdist] fix version check, bail out if using two incompatible releases
[platforms/flash.in] remove all but FLASH_BLOCKSIZE
Merge branch 'ubi-stuff' of
ssh://git-private.pengutronix.de/git-private/lfu/ptxdist-lfu
[strace] just cleanups
[strace] version bump to 4.5.20
[lvm2] fix menu indention
[xfsprogs] select LIBUUID rather than E2FSPROGS_LIBUUID
[e2fsprogs] remove E2FSPROGS_LIB* completly
[host-pkg-config] version bump to 0.25
[lvm2] just cleanups
[lvm2] install lib 0644
[lvm2] version bump to 2.02.66
[kbd] fix menu indention
[smartmontools] make menuconfig, fix indention
[smartmontools] version bump to 5.39.1
[lshw] improve cross compilation fixes
[lshw] clean up makefile
[lshw] remove default n, n is default by default
[gitignore] don't ignore .orig directories in patches/
[setmixer] update patches: don't overwrite LDFLAGS
[canutils] bump default version to 4.0.6
[host-glib] select HOST_ZLIB
[host-glib] zlib is only needed for experimental glib
[lmbench] cleanups: remove unneeded prepare stage
{PROJECT,PLATFORM}_VERSION: add note about - usage
[libcurl] version bump to 7.21.0
[libcurl] remove typo in tfp option
[ptxdist] bash-feature: set PATH in init-file
[kernel] add @ to make output quiet
[libpng] version bump to 1.2.44
Michael Grzeschik (1):
[gst-plugins-base] patches for avidemux and gstv4l2sink
Michael Olbrich (10):
[lshw] fix parallel building
[qt4] version bump 4.5.3 - 4.6.3
[qt4-examples] regenerated for 4.6.3
[qt4] add X11 support
[qt4] OpenGL support
[xorg-fonts] add option to create links in Qt4 fontdir
[qt4] disable broken examples
[setmixer] fix series file
[udev] cleanup targetinstall
[host-mkelfImage] add get stage and alternative URL
Remy Bohmer (3):
[umkimage] Build mkimage tool for target
[host-umkimage] Bump u-boot mkimage version 1.1.6-2010.03-1
[collection] the '-q' option breaks 'ptxdist -q allyesconfig collection'
Robert Schwebel (8):
[quota-tools] fix menu entry
[xfsprogs] fix menu indentation
[lshw] fix menu indentation
[module-init-tools] version bump 3.11 - 3.12
[glib] version bump 2.25.7 - 2.25.10
[util-linux-ng] version bump 2.17.2 - 2.18
[dconf] version bump 0.3 - 0.4.1
[dconf] add missing dependencies
Thanks to all contributors and bugfixers,
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] [qt] Rename menu entry to just 'Qt'
Alexander Stein wrote: The new version supports both Qt and Qt Embedded simultaneously. Also Qt is released from Nokia now applied to master, tnx Marc Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com --- rules/qt4.in |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/qt4.in b/rules/qt4.in index 027de09..548ab17 100644 --- a/rules/qt4.in +++ b/rules/qt4.in @@ -34,9 +34,9 @@ menuconfig QT4 select XORG_PROTO_INPUT if QT4_X11_XINPUT select XORG_LIB_XI if QT4_X11_XINPUT - prompt Qt Embedded + prompt Qt help - Qt Embedded is Trolltech's Widget Library for Embedded Linux. + Qt is Nokia's Widget Library for Linux. if QT4 @@ -46,7 +46,7 @@ config QT4_SHARED bool prompt build shared libraries help - If selected the shared Qt Embedded Libraries are built + If selected the shared Qt Libraries are built and installed. choice -- 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] need help
Hello Nicolas, ORMANCEY Nicolas wrote: First thank you for your help. Please use the mailinglist! Don't top-post! After have a look in the logfile it seems to be a configure error. I tried with others targets (like kernel ...) and they work properly... Witch versions of autotools are you using? I use Autoconf 2.61 Automake 1.10 M41.4.12 autoconf (GNU Autoconf) 2.65 automake (GNU automake) 1.11.1 m4 (GNU M4) 1.4.14 What about your ptxdist/toolchain version? btw: which toolchain and ptxdist version are you running? do you have a rules/udev.make in your BSP? 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] need help
Marc Kleine-Budde wrote: Hello Nicolas, ORMANCEY Nicolas wrote: First thank you for your help. from your logfile: target: udev.prepare pkg_deprecated_autoconf=--prefix= --host=i586-unknown-linux-gnu- ^^ --build=i686-host-linux-gnu --libexecdir=/lib/udev --with-kernel-headers-dir=/opt/OSELAS.Toolchain-1.99.3/i586-unknown-linux-gnu/gcc-4.3.2-glibc-2.8-binutils-2.18-kernel-2.6.27-sanitized/sysroot-i586-unknown-linux-gnu/usr/include --disable-introspection --enable-shared --with-pci-ids-path=/usr/share/pci.ids --enable-debug --disable-gudev --disable-bluetooth --disable-keymap --disable-acl --disable-usbdb --disable-pcidb --disable-modem-modeswitch --without-selinux --enable-logging --host=i586-unknown-linux-gnu- this looks wrong. Have you made some modifications to ptxdist? 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] trivial: fix typos concerning voodoo
Uwe Kleine-König wrote: It's either vodou or (more common) voodoo. tnx, pushed. Marc Signed-off-by: Uwe Kleine-König u.kleine-koe...@pengutronix.de --- rules/ptrtd.in |2 +- rules/totd.in |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/ptrtd.in b/rules/ptrtd.in index ba72589..a0fb002 100644 --- a/rules/ptrtd.in +++ b/rules/ptrtd.in @@ -7,7 +7,7 @@ config PTRTD This is a Portable Transport Relay Translator Daemon (pTRTd) as specified by RFC 3142 (tcp, udp) - Beware: This is rather old vodoo, last upstream update was + Beware: This is rather old voodoo, last upstream update was in 2002. This ptxdist package ist provided primarily for test environments, ipv6 transition planing, etc. diff --git a/rules/totd.in b/rules/totd.in index f56af05..783b141 100644 --- a/rules/totd.in +++ b/rules/totd.in @@ -11,7 +11,7 @@ menuconfig TOTD and can be used as a DNS-ALG for NAT-PT or pTRTd based setups. - Beware: This is rather old vodoo, last upstream update was + Beware: This is rather old voodoo, last upstream update was in 2005. This ptxdist package ist provided primarily for test environments, ipv6 transition planing, etc. -- 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] need help
noy38 wrote: Marc Kleine-Budde m...@... writes: target: udev.prepare pkg_deprecated_autoconf=--prefix= --host=i586-unknown-linux-gnu- ^^ --host=i586-unknown-linux-gnu- this looks wrong. Have you made some modifications to ptxdist? which ptxdist version are you running? do you have a rules/udev.make in your BSP? sorry, i use ptxdist-2010.05.2.tgz and ptxdist-2010.05.2-patches.tgz and i haven't any udev.make in my BSP should also be fine. can you send me the output I requested in the other mail. 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] need help
Hello Nicolas, PLEASE use the mailinglist!!! ORMANCEY Nicolas wrote: I jointed you the file asked. thanks. from your selected_platformconfig: PTXCONF_GNU_TARGET=i586-unknown-linux-gnu- ^ as you see, a - that doesn't belong there. Fix it this way: try: ptxdist menuconfig platform - architecture - toolchain - gnu target - enter i586-unknown-linux-gnu (without the ) 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] need help
noy38 wrote: Marc Kleine-Budde m...@... writes: okay, please send me the output of: ptxdist print CROSS_AUTOCONF_ARCH ptxdist print CROSS_AUTOCONF_ROOT ptxdist print UDEV_AUTOCONF can you please send me your selected_platformconfig, and rules/udev.make. cheers, Marc Hi Marc, i juste sent you a file containning the outputs of ptxdist print CROSS_AUTOCONF_ARCH ptxdist print CROSS_AUTOCONF_ROOT ptxdist print UDEV_AUTOCONF and the selected_platformconfig file and i have no udev.make in the rules folder. tnx, got it, found the error. see the other mail for the fix. 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] glibc Install
Hey Nicolas, please don't reply to a mail in order to start a new thread! ORMANCEY Nicolas wrote: Hi everybody, A new question... When I install glibc the glibc.targetinstall tries to copy (or link?) the libfreebl3 from the toolchain to the right place. I don't know where this lib comes from. But this lib is not available from this place!! Is this lib missing (I use the OSELAS.Toolchain-1.99.3 toolchain)? Is it a config problem...? Can you send us the output to see the problem. Which version of ptxdist and Toolchain are you using? 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] glibc Install
Hey Nicolas, no top posting, please. ORMANCEY Nicolas wrote: Ok here is the output tnx, have you made any modifications to ptxdist? Especially to a file called glibc.make? lib - /opt/OSELAS.Toolchain-1.99.3/i586-unknown-linux-gnu/gcc-4.3.2-glibc-2.8-binutils-2.18-kernel-2.6.27-sanitized/sysroot-i586-unknown-linux-gnu/lib/libcrypt-2.8.so install_copy_toolchain_lib: libfreebl3.so not found make: *** [/home/normance/Daniela/base_lionel/daniela_ptx/platform-Daniela/state/glibc.targetinstall] Error 1 please change into the folder where you have ptxdist installed to. By default it's /usr/local. In that folder send me the output of: grep freebl . -R BTW: which distribution are you using? 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] glibc Install
Hey Nicolas, please don't top post! ORMANCEY Nicolas wrote: I made no modification in the glibc.make file In /usr/local the output of grep freebl . -R is empty... do you have installed ptxdist to /usr/local? Please send me your selected_ptxconfig. My distro is centos 5 with 2.6.18-92.el5 kernel Do you have a libfreebl on your host system? Try: find / -name libfreebl* 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] creating ipkg index
Hey Nicolas, ORMANCEY Nicolas wrote: Have a look to the attached file, IPKG is not selected in my configuration what’s happen?!! I don't know, maybe it's a python-2.4 problem. However you can turn off the ipkg index generation with: ptxdist platformconfig - image creation options - ipkg options - generate ipkg.index un-select generate ipkg.index hope that helps, 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] Busybox-1.17.1
Hey Ladis, Ladislav Michl wrote: Update Busybox to 1.17.1 0002-silence-errors-on-BE-platforms.patch was dropped as it no longer applies. I'll try to fix it upstream first and backport accepted solution. Thanks for the patch! How did you import the new busybox Kconfig? The current importer has problems with comments. I fixed it in the meantime :) I'm going to re-run with the fixed importer and squash it into your patch. I'll talk with Michael tomorrow if we're going to take the new busybox version into the upcoming release. 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
[ptxdist] 2010.08.0
Moin,
a new freh ptxdist release is ready for download. The highlights:
- update to gnupg version 2.x (thx to Alexander)
- the get stage is obsolete by now
- xorg updates
- global options for lage file and ipv6 support
- /etc/rc.d links moved to the individual packages
- ptxdist image cleanups
cheers, Marc
shortlog:
Alexander Stein (6):
[qt] Rename menu entry to just 'qt'
Only install library libstdbuf.so is stdbuf is enabled
Allow a different key directory than /etc/dropbear
[libassuan] add new package
[libksba] Add new package
[gnupg] upgrade to version 2.0.15
Marc Kleine-Budde (81):
[newpacket] remove deprecated feature
[check_path] fix removal of . from the PATH
[cppunit] use correct package name for install_fixup
[libnih] use $(LIBNIH_VERSION) in install_fixup VERSION
[libnih] remove obsolete _PATH definition
[libnih] convert bool to tristate
[libnih] make targetinstall stage quiet by adding @
[dosfstools] fix menu
[templates] explicitly define PKG_VERSION
[ipkg.conf] beautify config file
[image_ubi] use $(..) instead of ${..} to access make variables
[rules/post/*-permissions] add missing header
[libptxdist] remove obsolete DOPERMISSIONS definition
[libptxdist] ptxd_replace_magic: don't replace unset MAGICs
[libptxdist] rename ptxd_get_dirs - ptxd_get_path
[ptxd_get_path] return with error if first argument is empty
[ptxd_make_world_common] replace ${..} by $(..)
[ptxd_make_world_common] seperate pkg specific from non pkg specific
environment
[ptxd_make_world_common] move ptx_nfsroot{,_debug} to ptx/env
[ptxd_make_00-init] introduce PTXDIST_PATH_RULES
[install_init] move to ptxd_make_xpkg_prepare.make
[ptxd_make_install_init] move into ptxd_make_xpkg_prepare.sh
[ptxd_make_xpkg_prepare] ged rid of cmd line options -p and -t
[ptxd_make_xpkg_prepare] clean up shell implementation
[ptxd_make_xpkg_prepare] move default.ipkg to config/xpkg/ipkg.control
[install_finish] move to ptxd_make_xpkg_finish.make
[ptxd_make_xpkg_finish] use ptx_nfsroot instead of ROOTDIR
[install_fixup] move to ptxd_make_xpkg_fixup.make
[ptxd_make_xpkg_fixup] move ptxd_make_xpkg_fixup.sh
[ptxd_make_xpkg_fixup] remove PTXCONF_PROJECT_BUILD
[ptxd_make_xpkg_fixup] remove obsolete sourcing of ptxdist_vars.sh
[ptxd_make_xpkg_fixup] ged rid of cmd line options -p and -s
[ptxd_make_xpkg_fixup] ged rid of cmd line options -f and -t
[ptxd_make_xpkg_fixup] rename ptxd_make_install_fixup to
ptxd_make_xpkg_fixup
[targetinstall] refacture PACKET into XPKG
[targetinstall] sanitize xpkg variable
[ptxd_make_xpkg_fixup] use pkg_xpkg for ipkg control file
[ptxd_make_world_common] introduce pkg_version
[ptxd_make_xpkg_prepare] provide a sanitized pkg_xpkg_version
[ptxd_make_xpkg_prepare] use pkg_xpkg_version for ipkg control file
[image_tgz] move tgz generation into seperate file
[image_jffs2] move jffs2 generation into seperate file
[image_ext2] move ext2 generation into seperate file
[image_squashfs] move squashfs generation into seperate file
[image_hd] move hd generation into seperate file
[image_hd] beautify output
[ptxd_make_image_common] move DOPERMISSIONS into seperate file
[000_ptxd_make_image_definitions] move WORKDIR into seperate file
[image] rename WORKDIR into image/work_dir
[image] introduce variable $(image/permissions) for
$(IMAGEDIR)/permissions
[ptxd_make_image_common] provide image/env
[ptxd_make_xpkg_common] introduce ptxd_do_xpkg_map
[ptxd_make_image_common] provide function to get selected ipkg files
[fix_permissions] rename fix-permissions.make -
ptxd_make_image_fix_permissions.make
[fix permissions] rename ptxd_make_fixpermissions.sh -
ptxd_make_image_fix_permissions.sh
[ptxd_make_image_fix_permissions] refactore function names to match file
name
[ptxd_make_image_fix_permissions] get rid of cmd line option -r
[ptxd_make_image_fix_permissions] get rid of cmd line option -p
[ptxd_make_image_fix_permissions] clean up implementation
[000-permissions.make] remove, obsolete
[ptxd_make_image_prepare_work_dir] provide function to prepare the image
work dir
[images] renamed images.make - ptxd_make_image_prepare_work_dir.make
[ptxd_make_image_prepare_work_dir] switch to shell based implementation
[ptxdist] world before images isn't needed anymore
[pkg-config-wrapper] add bit of documentation to the code
Merge branch 'next/image_cleanups' of
git://git.pengutronix.de/git/mkl/ptxdist
[ptxd_make_image_common] do proper quoting of PTXCONF_IPKG_IPKG_CONF_URL
Merge branch 'next/image_cleanups' of
git://git.pengutronix.de/git/mkl/ptxdist
[ptxdist] clean: remove everything even
Re: [ptxdist] [PATCH] mtd-utils: make mkubifs optional
Ladislav Michl wrote: Compile libuuid only when needed - mkfs.ubifs selected. tnx, commited to master Marc Signed-off-by: Ladislav Michl la...@linux-mips.org --- .../mtd-utils-1.3.1/make-mkubifs-optional.patch| 24 patches/mtd-utils-1.3.1/series |1 + rules/mtd-utils.in |2 +- rules/mtd-utils.make |4 +++ 4 files changed, 30 insertions(+), 1 deletions(-) create mode 100644 patches/mtd-utils-1.3.1/make-mkubifs-optional.patch diff --git a/patches/mtd-utils-1.3.1/make-mkubifs-optional.patch b/patches/mtd-utils-1.3.1/make-mkubifs-optional.patch new file mode 100644 index 000..ec99f13 --- /dev/null +++ b/patches/mtd-utils-1.3.1/make-mkubifs-optional.patch @@ -0,0 +1,24 @@ +From: Ladislav Michl la...@linux-mips.org +Date: Tue, 3 Aug 2010 13:00:00 +0200 +Subject: [PATCH] make mkubifs optional + +Signed-off-by: Ladislav Michl la...@linux-mips.org +--- + Makefile |6 +- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/Makefile 2010-08-03 14:55:20.0 +0200 b/Makefile 2010-08-03 14:24:39.0 +0200 +@@ -11,7 +11,11 @@ + CPPFLAGS += -DWITHOUT_LZO + endif + +-SUBDIRS = ubi-utils mkfs.ubifs ++SUBDIRS = ubi-utils ++ ++ifneq ($(WITHOUT_MKUBIFS), 1) ++ SUBDIRS += mkfs.ubifs ++endif + + TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ + ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info \ diff --git a/patches/mtd-utils-1.3.1/series b/patches/mtd-utils-1.3.1/series index 32f7cf1..44806a8 100644 --- a/patches/mtd-utils-1.3.1/series +++ b/patches/mtd-utils-1.3.1/series @@ -1 +1,2 @@ make-liblzo-optional.patch +make-mkubifs-optional.patch diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in index 4d33954..ad550e1 100644 --- a/rules/mtd-utils.in +++ b/rules/mtd-utils.in @@ -4,7 +4,7 @@ menuconfig MTD_UTILS tristate prompt mtd-utils select ZLIB - select LIBUUID + select LIBUUID if MTD_UTILS_MKFS_UBIFS select LIBLZO if MTD_UTILS_USE_LIBLZO help Memory Technology Device Utilities diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index 1bb471e..1797f41 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -47,6 +47,10 @@ ifndef PTXCONF_MTD_UTILS_USE_LIBLZO MTD_UTILS_COMPILE_ENV += WITHOUT_LZO=1 endif +ifndef PTXCONF_MTD_UTILS_MKFS_UBIFS +MTD_UTILS_COMPILE_ENV += WITHOUT_MKUBIFS=1 +endif + MTD_UTILS_MAKEVARS := BUILDDIR=$(MTD_UTILS_DIR) MTD_UTILS_MAKE_PAR := NO -- 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] add new packet x-load
+ +$(STATEDIR)/x-load.prepare: + @$(call targetinfo) + cd $(X_LOAD_DIR) \ + $(X_LOAD_PATH) \ + $(MAKE) $(X_LOAD_MAKE_OPT) $(PTXCONF_X_LOAD_CONFIG) ^^ hmmm...does a make ift compile anything? in the prepare stage nothing should be compiled. + @$(call touch) + +# +# Install +# + +$(STATEDIR)/x-load.install: + @$(call targetinfo) + @$(call touch) + +# +# Target-Install +# + +$(STATEDIR)/x-load.targetinstall: + @$(call targetinfo) + @install -D -m644 $(X_LOAD_DIR)/x-load.bin $(IMAGEDIR)/x-load.bin +ifdef PTXCONF_X_LOAD_MAKE_IFT + @install -D -m644 $(X_LOAD_DIR)/x-load.bin.ift $(IMAGEDIR)/x-load.bin.ift + @install -D -m644 $(X_LOAD_DIR)/x-load.bin.ift $(IMAGEDIR)/MLO +endif + @$(call touch) + +# +# Clean +# + +x-load_clean: call this target please: $(STATEDIR)/x-load.clean: + @$(call targetinfo) + @$(call clean_pkg, X_LOAD) + @rm -rf $(IMAGEDIR)/x-load.bin +ifdef PTXCONF_X_LOAD_MAKE_IFT + @rm -rf $(IMAGEDIR)/x-load.bin.ift + @rm -rf $(IMAGEDIR)/MLO +endif just put all three in one line, the ifdef can be removed. rm -f will not complain it a file doesn't exist. + +# 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 3/3] [u-boot] install srec and/or elf images
Stephan Linz wrote: Signed-off-by: Stephan Linz l...@li-pro.net --- platforms/u-boot.in | 16 rules/u-boot.make | 12 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/platforms/u-boot.in b/platforms/u-boot.in index 64d4d03..38552a9 100644 --- a/platforms/u-boot.in +++ b/platforms/u-boot.in @@ -42,5 +42,21 @@ config U_BOOT_CONFIG yourbox_config. See Uboot's main Makefile for possible configuration targets. +comment target install + +config U_BOOT_INSTALL_SREC + prompt install u-boot.srec + bool + default n default n is the default, please remove it + help + Installing the U-Boot srec hexfile into platform image directory. + +config U_BOOT_INSTALL_ELF + prompt install u-boot.elf + bool + default n dito + help + Installing the U-Boot ELF binary into platform image directory. + endif diff --git a/rules/u-boot.make b/rules/u-boot.make index 8931946..cc3220c 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -63,6 +63,12 @@ $(STATEDIR)/u-boot.install: $(STATEDIR)/u-boot.targetinstall: @$(call targetinfo) @install -D -m644 $(U_BOOT_DIR)/u-boot.bin $(IMAGEDIR)/u-boot.bin +#ifdef PTXCONF_U_BOOT_INSTALL_SREC + @install -D -m644 $(U_BOOT_DIR)/u-boot.srec $(IMAGEDIR)/u-boot.srec +#endif +#ifdef PTXCONF_U_BOOT_INSTALL_ELF + @install -D -m644 $(U_BOOT_DIR)/u-boot $(IMAGEDIR)/u-boot.elf +#endif are these files generated by default? @$(call touch) # @@ -73,5 +79,11 @@ $(STATEDIR)/u-boot.clean: @$(call targetinfo) @$(call clean_pkg, U_BOOT) @rm -rf $(IMAGEDIR)/u-boot.bin +#ifdef PTXCONF_U_BOOT_INSTALL_SREC + @rm -rf $(IMAGEDIR)/u-boot.srec +#endif +#ifdef PTXCONF_U_BOOT_INSTALL_ELF + @rm -rf $(IMAGEDIR)/u-boot.elf +#endif please remove then ifdefs, then just one line for the rm -rf # 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 2/3] [inetd] handle ftpd service
Stephan Linz wrote:
Signed-off-by: Stephan Linz l...@li-pro.net
---
generic/etc/inetd.conf.d/ftpd |1 +
rules/busybox.in | 11 +++
rules/busybox.make|4
3 files changed, 16 insertions(+), 0 deletions(-)
create mode 100644 generic/etc/inetd.conf.d/ftpd
diff --git a/generic/etc/inetd.conf.d/ftpd b/generic/etc/inetd.conf.d/ftpd
new file mode 100644
index 000..d80c851
--- /dev/null
+++ b/generic/etc/inetd.conf.d/ftpd
@@ -0,0 +1 @@
+ftp stream tcp nowait root /usr/sbin/ftpd ftpd -w -S /tmp
diff --git a/rules/busybox.in b/rules/busybox.in
index 001d4fc..cc1a410 100644
--- a/rules/busybox.in
+++ b/rules/busybox.in
@@ -22,6 +22,17 @@ config BUSYBOX_INETD_STARTSCRIPT
prompt install /etc/init.d/inetd
choice
You don't really have a choice here, do you :)
+ prompt ftpd startup type
+ depends on BUSYBOX_FTPD
+
+ config BUSYBOX_FTPD_INETD
+ bool
+ prompt inetd
+ help
+ start busybox ftpd server from inetd
+endchoice
can the busybox ftpd only be started from inetd or does is support stand
alone via startscript?
+
+choice
prompt telnetd startup type
depends on BUSYBOX_TELNETD
diff --git a/rules/busybox.make b/rules/busybox.make
index 4c0a56e..75af30e 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -99,6 +99,10 @@ endif
$(call install_link, busybox, $${to}, $${link});\
done
+ifdef PTXCONF_BUSYBOX_FTPD_INETD
+ @$(call install_alternative, busybox, 0, 0, 0644,
/etc/inetd.conf.d/ftpd)
please provice a file for generic/etc/inetd.conf.d/ftpd
+endif
+
ifdef PTXCONF_BUSYBOX_TELNETD_INETD
@$(call install_alternative, busybox, 0, 0, 0644,
/etc/inetd.conf.d/telnetd)
endif
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] add new packet x-load
Robert Schwebel wrote: On Tue, Aug 03, 2010 at 11:52:50PM +0200, Marc Kleine-Budde wrote: thanks for the patch. Please explain how to get the source, maybe we can figure out a nice way to automate things. git://gitorious.org/x-load-omap3/mainline.git does gitorious support snapshots via http? 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/1] [inetd] handle ftpd service
Stephan Linz wrote:
Signed-off-by: Stephan Linz l...@li-pro.net
applied to master
tnx, Marc
---
generic/etc/inetd.conf.d/ftpd |1 +
rules/busybox.in |7 +++
rules/busybox.make|4
3 files changed, 12 insertions(+), 0 deletions(-)
create mode 100644 generic/etc/inetd.conf.d/ftpd
diff --git a/generic/etc/inetd.conf.d/ftpd b/generic/etc/inetd.conf.d/ftpd
new file mode 100644
index 000..d80c851
--- /dev/null
+++ b/generic/etc/inetd.conf.d/ftpd
@@ -0,0 +1 @@
+ftp stream tcp nowait root /usr/sbin/ftpd ftpd -w -S /tmp
^^
btw what's the meaning of this options?
diff --git a/rules/busybox.in b/rules/busybox.in
index 001d4fc..0b56f56 100644
--- a/rules/busybox.in
+++ b/rules/busybox.in
@@ -21,6 +21,13 @@ config BUSYBOX_INETD_STARTSCRIPT
default y
prompt install /etc/init.d/inetd
+config BUSYBOX_FTPD_INETD
+ depends on BUSYBOX_FTPD
+ bool
+ prompt ftpd startup type (inetd)
+ help
+ start busybox ftpd server from inetd
+
choice
prompt telnetd startup type
depends on BUSYBOX_TELNETD
diff --git a/rules/busybox.make b/rules/busybox.make
index d06e693..38a83bf 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -99,6 +99,10 @@ endif
$(call install_link, busybox, $${to}, $${link});\
done
+ifdef PTXCONF_BUSYBOX_FTPD_INETD
+ @$(call install_alternative, busybox, 0, 0, 0644,
/etc/inetd.conf.d/ftpd)
+endif
+
ifdef PTXCONF_BUSYBOX_TELNETD_INETD
@$(call install_alternative, busybox, 0, 0, 0644,
/etc/inetd.conf.d/telnetd)
endif
--
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/1] add new packet x-load
) + +# +# Target-Install +# + +$(STATEDIR)/x-load.targetinstall: + @$(call targetinfo) + @install -D -m644 $(X_LOAD_DIR)/x-load.bin $(IMAGEDIR)/x-load.bin +ifdef PTXCONF_X_LOAD_MAKE_IFT + @install -D -m644 $(X_LOAD_DIR)/x-load.bin.ift $(IMAGEDIR)/x-load.bin.ift + @install -D -m644 $(X_LOAD_DIR)/x-load.bin.ift $(IMAGEDIR)/MLO +endif + @$(call touch) + +# +# Clean +# + +$(STATEDIR)/x-load.clean: + @$(call targetinfo) + @$(call clean_pkg, X_LOAD) + @rm -f $(IMAGEDIR)/x-load.bin $(IMAGEDIR)/x-load.bin.ift $(IMAGEDIR)/MLO + +# 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] V2 This adds preliminary support for the Enlightenment Foundation Libraries.
+# + +$(STATEDIR)/eina.compile: $(eina_compile_deps_default) + @$(call targetinfo, $@) + cd $(EINA_DIR) $(EINA_PATH) make + @$(call touch, $@) + +# +# Install +# + +$(STATEDIR)/eina.install: $(eina_install_deps_default) + @$(call targetinfo, $@) + @$(call install, EINA) + @$(call touch, $@) + +# +# Target-Install +# + +$(STATEDIR)/eina.targetinstall: + @$(call targetinfo, $@) + + @$(call install_init, eina) + @$(call install_fixup, eina, PACKAGE, eina) + @$(call install_fixup, eina, PRIORITY, optional) + @$(call install_fixup, eina, VERSION, $(EINA_VERSION)) + @$(call install_fixup, eina, SECTION, base) + @$(call install_fixup, eina, AUTHOR, Lars Munch l...@segv.dk) + @$(call install_fixup, eina, AUTHOR, Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, eina, DEPENDS,) + @$(call install_fixup, eina, DESCRIPTION, missing) + + @$(call install_lib, eina, 0, 0, 0644, libeina-ver-svn-06) + + @$(call install_finish,eina) + + @$(call touch, $@) + +# +# Clean +# + +$(STATEDIR)/eina_clean: + @$(call targetinfo) + @$(call clean_pkg, EINA) + +# vim: syntax=make diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in index d41c8a8..81a3ffc 100644 --- a/rules/graphics_and_multimedia.in +++ b/rules/graphics_and_multimedia.in @@ -61,6 +61,10 @@ menu sdl source generated/multimedia_sdl.in endmenu +menu efl +source generated/multimedia_efl.in +endmenu + Modell it after menuconfig XORG pleae. menu sound source generated/multimedia_sound.in endmenu 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] V3 This adds preliminary support for the Enlightenment Foundation Libraries
+ of problems and act as a venerable alternative to the currently popular + GTK and QT library sets. + +if EFL +source generated/multimedia_efl.in +endif + menu sound source generated/multimedia_sound.in endmenu -- 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] [e_dbus] Separated e_dbus modules for configuration.
Ryan M. Raasch wrote: Bluez, ofono communication modules over dbus were disabled by default. These features of e_dbus can now be selected or deselected. Looks good, some minor comments inline cheers, Marc Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com --- rules/e_dbus.in | 37 +++ rules/e_dbus.make | 63 ++-- 2 files changed, 92 insertions(+), 8 deletions(-) diff --git a/rules/e_dbus.in b/rules/e_dbus.in index fcb7d2e..b517ab1 100644 --- a/rules/e_dbus.in +++ b/rules/e_dbus.in @@ -10,3 +10,40 @@ config E_DBUS This is the start of some basic convenience wrappers around dbus to ease integrating dbus with EFL based applications. If you add sub-options to a pacakge, please convert if from config to menuconfig. +if E_DBUS nitpick: blank line here +config E_DBUS_ECONNMAN + bool + prompt econnman + help + Efl Dbus communication wrappers to Connman. + +config E_DBUS_EHAL + bool + prompt ehal + help + Efl Dbus communication wrappers to HAL. + +config E_DBUS_ENOTIFY + bool + prompt enotify + help + Efl Dbus communication wrappers to org.freedesktop.Notifications. + +config E_DBUS_EBLUEZ + bool + prompt ebluez + help + Efl Dbus communication wrappers to Bluez. + +config E_DBUS_EOFONO + bool + prompt eofono + help + Efl Dbus communication wrappers to Ofono. + +config E_DBUS_EUKIT + bool + prompt eukit + help + Efl Dbus communication wrappers to Ukit. nitpick: a blank line here, too +endif diff --git a/rules/e_dbus.make b/rules/e_dbus.make index 87e8b82..387d309 100644 --- a/rules/e_dbus.make +++ b/rules/e_dbus.make @@ -26,15 +26,37 @@ E_DBUS_DIR := $(BUILDDIR)/$(E_DBUS) # E_DBUS_CONF_TOOL := autoconf +E_DBUS_CONF_OPT := $(CROSS_AUTOCONF_USR) -E_DBUS_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --disable-econnman \ - --disable-ehal \ - --disable-enotify \ - --disable-ebluez \ - --disable-eofono \ - --disable-eukit +# Connman IMHO the ifdefs are self explaining. +ifdef PTXCONF_E_DBUS_ECONNMAN +E_DBUS_CONF_OPT += --enable-econnman please add an else branch else E_DBUS_CONF_OPT += --disable-econnman +endif same goes for the other optons. + +#Ehal +ifndef PTXCONF_E_DBUS_EHAL +E_DBUS_CONF_OPT += --disable-ehal +endif + +#ENotify +ifndef PTXCONF_E_DBUS_ENOTIFY +E_DBUS_CONF_OPT += --disable-enotify +endif + +#EBluez +ifdef PTXCONF_E_DBUS_EBLUEZ +E_DBUS_CONF_OPT += --enable-ebluez +endif + +#EOfono +ifdef PTXCONF_E_DBUS_EOFONO +E_DBUS_CONF_OPT += --enable-eofono +endif + +#EUkit +ifndef PTXCONF_E_DBUS_EUKIT +E_DBUS_CONF_OPT += --disable-eukit +endif # # Target-Install @@ -50,6 +72,31 @@ $(STATEDIR)/e_dbus.targetinstall: @$(call install_lib, e_dbus, 0, 0, 0644, libedbus-ver-svn-06) +ifdef PTXCONF_E_DBUS_CONNMAN + @$(call install_lib, e_dbus, 0, 0, 0644, libeconnman-ver-svn-06) +endif + +ifdef PTXCONF_E_DBUS_EHAL + @$(call install_lib, e_dbus, 0, 0, 0644, libehal-ver-svn-06) +endif + +# enotify not a loadable .so IMHO the comment is enough, remove the commented out install_lib +#ifdef PTXCONF_E_DBUS_ENOTIFY +#@$(call install_lib, e_dbus, 0, 0, 0644, libenotify-ver-svn-06) +#endif + +ifdef PTXCONF_E_DBUS_BLUEZ + @$(call install_lib, e_dbus, 0, 0, 0644, libebluez-ver-svn-06) +endif + +ifdef PTXCONF_E_DBUS_EOFONO + @$(call install_lib, e_dbus, 0, 0, 0644, libeofono-ver-svn-06) +endif + +ifdef PTXCONF_E_DBUS_EUKIT + @$(call install_lib, e_dbus, 0, 0, 0644, libeukit-ver-svn-06) +endif + @$(call install_finish,e_dbus) @$(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] [e_dbus] Fixed up default switches.
Ryan M. Raasch wrote: Added the enable/disable switches for e_dbus. Syntax fixes in .in file. Fine! Squash into the previous e_dbus patch and repost. So that I have a single e_dbus patch that applies intop if my next/efl branch. Marc Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com --- rules/e_dbus.in |6 -- rules/e_dbus.make | 25 +++-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/rules/e_dbus.in b/rules/e_dbus.in index b517ab1..e984025 100644 --- a/rules/e_dbus.in +++ b/rules/e_dbus.in @@ -1,16 +1,17 @@ ## SECTION=multimedia_efl -config E_DBUS +menuconfig E_DBUS tristate select DBUS select EINA select ECORE - prompt e_dbus + prompt e_dbus help This is the start of some basic convenience wrappers around dbus to ease integrating dbus with EFL based applications. if E_DBUS + config E_DBUS_ECONNMAN bool prompt econnman @@ -46,4 +47,5 @@ config E_DBUS_EUKIT prompt eukit help Efl Dbus communication wrappers to Ukit. + endif diff --git a/rules/e_dbus.make b/rules/e_dbus.make index 387d309..b87b437 100644 --- a/rules/e_dbus.make +++ b/rules/e_dbus.make @@ -28,33 +28,39 @@ E_DBUS_DIR := $(BUILDDIR)/$(E_DBUS) E_DBUS_CONF_TOOL := autoconf E_DBUS_CONF_OPT := $(CROSS_AUTOCONF_USR) -# Connman ifdef PTXCONF_E_DBUS_ECONNMAN E_DBUS_CONF_OPT += --enable-econnman +else +E_DBUS_CONF_OPT += --disable-econnman endif -#Ehal -ifndef PTXCONF_E_DBUS_EHAL +ifdef PTXCONF_E_DBUS_EHAL +E_DBUS_CONF_OPT += --enable-ehal +else E_DBUS_CONF_OPT += --disable-ehal endif -#ENotify -ifndef PTXCONF_E_DBUS_ENOTIFY +ifdef PTXCONF_E_DBUS_ENOTIFY +E_DBUS_CONF_OPT += --enable-enotify +else E_DBUS_CONF_OPT += --disable-enotify endif -#EBluez ifdef PTXCONF_E_DBUS_EBLUEZ E_DBUS_CONF_OPT += --enable-ebluez +else +E_DBUS_CONF_OPT += --disable-ebluez endif -#EOfono ifdef PTXCONF_E_DBUS_EOFONO E_DBUS_CONF_OPT += --enable-eofono +else +E_DBUS_CONF_OPT += --disable-eofono endif -#EUkit -ifndef PTXCONF_E_DBUS_EUKIT +ifdef PTXCONF_E_DBUS_EUKIT +E_DBUS_CONF_OPT += --enable-eukit +else E_DBUS_CONF_OPT += --disable-eukit endif @@ -80,7 +86,6 @@ ifdef PTXCONF_E_DBUS_EHAL @$(call install_lib, e_dbus, 0, 0, 0644, libehal-ver-svn-06) endif -# enotify not a loadable .so #ifdef PTXCONF_E_DBUS_ENOTIFY #@$(call install_lib, e_dbus, 0, 0, 0644, libenotify-ver-svn-06) #endif -- 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] libXdmcp compile error
Ryan Raasch wrote: Hello, I am getting some compile errors /in/ the build environment. However, when i change into the directory, natively, and compile, it works. can you send me (mkl@) and Michale (mol@) your ptxconfig and platformconfig. CC A8Eq.lo CC AA16.lo CC AA32.lo CC AA8.lo AA16.c:35:21: error: X11/Xos.h: No such file or directory AA16.c:36:19: error: X11/X.h: No such file or directory AA16.c:37:21: error: X11/Xmd.h: No such file or directory In file included from AA16.c:38: ./include/X11/Xdmcp.h:24:28: error: X11/Xfuncproto.h: No such file or directory Hmmmaybe here's a xorg-*-proto* package missing In file included from AA16.c:38: ./include/X11/Xdmcp.h:49: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'typedef' ./include/X11/Xdmcp.h:79: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token 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] [edje] Added support for the efl library edje.
Ryan M. Raasch wrote: Edje is a library that attempts to separate the user interface from the application and is part of the Enlightenment Foundation libraries. Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com --- rules/edje.in | 20 ++ rules/edje.make | 61 +++ 2 files changed, 81 insertions(+), 0 deletions(-) create mode 100644 rules/edje.in create mode 100644 rules/edje.make diff --git a/rules/edje.in b/rules/edje.in new file mode 100644 index 000..5ecb2b7 --- /dev/null +++ b/rules/edje.in @@ -0,0 +1,20 @@ +## SECTION=multimedia_efl + +menuconfig EDJE + tristate + prompt edje + select LUA + select EINA + select EET + select ECORE + select ECORE_FILE + select EMBRYO if it needs embyo, you have to provide the embro patch first. + help + Edje is a library that attempts to separate + the user interface from the application. It + allows applications to be skinnable, so that + it is possible to change the GUI of an application + without changing the application itself. + Edje-based applications use files which contain the + specifications for the GUI layout that is to be used. + Edje themes are contained using EET generated files. diff --git a/rules/edje.make b/rules/edje.make new file mode 100644 index 000..b539114 --- /dev/null +++ b/rules/edje.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Ryan Raasch ryan.raa...@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 +# +PACKAGES-$(PTXCONF_EDJE) += edje + +# +# Paths and names +# +EDJE_VERSION := 0.9.99.49898 +EDJE := edje-$(EDJE_VERSION) +EDJE_SUFFIX := tar.bz2 +EDJE_URL := http://download.enlightenment.org/snapshots/2010-06-27/$(EDJE).$(EDJE_SUFFIX) +EDJE_SOURCE := $(SRCDIR)/$(EDJE).$(EDJE_SUFFIX) +EDJE_DIR := $(BUILDDIR)/$(EDJE) +EDJE_LICENSE := LGPL + +# +# Prepare +# + +EDJE_CONF_ENV:= $(CROSS_ENV) please remove env, it's obsolete + +# +# autoconf +# +EDJE_CONF_TOOL := autoconf +EDJE_CONF_OPT:= \ + $(CROSS_AUTOCONF_USR) \ + --disable-doc nitpick: just one tab + +# +# Target-Install +# + +$(STATEDIR)/edje.targetinstall: + @$(call targetinfo) + + @$(call install_init, edje) + @$(call install_fixup, edje,PRIORITY,optional) + @$(call install_fixup, edje,SECTION,base) + @$(call install_fixup, edje,AUTHOR,Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, edje,DESCRIPTION,missing) + + @$(call install_lib, edje, 0, 0, 0644, libedje-ver-svn-06) + @$(call install_copy, edje, 0, 0, 0755, $(PTXDIST_SYSROOT_TARGET)/usr/bin/edje_cc, /usr/bin/edje_cc) ^ please use -, ptxdist will take /usr/bin/edje_cc from the PKGDIR + + @$(call install_finish, edje) + + @$(call touch) + +# 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 1/2] [eet] Added support for eet library.
Ryan M. Raasch wrote: Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com Remove _ENV, otherwise it's good Marc --- rules/eet.in | 17 rules/eet.make | 59 2 files changed, 76 insertions(+), 0 deletions(-) create mode 100644 rules/eet.in create mode 100644 rules/eet.make diff --git a/rules/eet.in b/rules/eet.in new file mode 100644 index 000..292cb67 --- /dev/null +++ b/rules/eet.in @@ -0,0 +1,17 @@ +## SECTION=multimedia_efl + +config EET + tristate + select ZLIB + select LIBJPEG + prompt eet + help + EET is a library that is designed to store and load + all type of data, locally or through a network stream. + It is designed to be light-weight, efficient and quick. + EET forms the basis of theme files in the EFL, i.e. + if you want to install a theme for Enlightenment or + another themable EFL app, you would be installing + an EET-format file, which contains all of the theme graphics + and configuration and do not need to be extracted onto the + filesystem in order to be used. diff --git a/rules/eet.make b/rules/eet.make new file mode 100644 index 000..26eebf7 --- /dev/null +++ b/rules/eet.make @@ -0,0 +1,59 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Ryan Raasch ryan.raa...@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 +# +PACKAGES-$(PTXCONF_EET) += eet + +# +# Paths and names +# +EET_VERSION := 1.3.2 +EET := eet-$(EET_VERSION) +EET_SUFFIX := tar.bz2 +EET_URL := http://download.enlightenment.org/releases/$(EET).$(EET_SUFFIX) +EET_SOURCE := $(SRCDIR)/$(EET).$(EET_SUFFIX) +EET_DIR := $(BUILDDIR)/$(EET) + +# +# Prepare +# + +EET_CONF_ENV := $(CROSS_ENV) please remove, it's obsolete + +# +# autoconf +# +EET_CONF_TOOL:= autoconf +EET_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-doc + +# +# Target-Install +# + +$(STATEDIR)/eet.targetinstall: + @$(call targetinfo) + + @$(call install_init, eet) + @$(call install_fixup, eet,PRIORITY,optional) + @$(call install_fixup, eet,SECTION,base) + @$(call install_fixup, eet,AUTHOR,Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, eet,DESCRIPTION,missing) + + @$(call install_lib, eet, 0, 0, 0644, libeet) + + @$(call install_finish, eet) + + @$(call touch) + +# vim: syntax=make 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/2] [evas] Added support for evas library.
disable switch +else +EVAS_CONF_OPT += --disable-image-loader-eet +endif + +ifdef PTXCONF_EVAS_LOADER_FONT +EVAS_CONF_OPT += --enable-font-loader-eet +else +EVAS_CONF_OPT += --disable-font-loader-eet +endif + +ifdef PTXCONF_EVAS_LOADER_GIF +EVAS_CONF_OPT += --enable-image-loader-gif +else +EVAS_CONF_OPT += --disable-image-loader-gif +endif + +ifdef PTXCONF_EVAS_LOADER_JPEG +EVAS_CONF_OPT += --enable-image-loader-jpeg +else +EVAS_CONF_OPT += --disable-image-loader-jpeg +endif + +ifdef PTXCONF_EVAS_LOADER_PMAPS +EVAS_CONF_OPT += --enable-image-loader-pmaps +else +EVAS_CONF_OPT += --disable-image-loader-pmaps +endif + +ifdef PTXCONF_EVAS_LOADER_PNG +EVAS_CONF_OPT += --enable-image-loader-png +else +EVAS_CONF_OPT += --disable-image-loader-png +endif + +ifdef PTXCONF_EVAS_LOADER_SVG +EVAS_CONF_OPT += --enable-image-loader-svg +else +EVAS_CONF_OPT += --disable-image-loader-svg +endif + +ifdef PTXCONF_EVAS_LOADER_TIFF +EVAS_CONF_OPT += --enable-image-loader-tiff +else +EVAS_CONF_OPT += --disable-image-loader-tiff +endif + +ifdef PTXCONF_EVAS_LOADER_XPM +EVAS_CONF_OPT += --enable-image-loader-xpm +else +EVAS_CONF_OPT += --disable-image-loader-xpm +endif + +ifdef PTXCONF_EVAS_LOADER_BMP +EVAS_CONF_OPT += --enable-image-loader-bmp +else +EVAS_CONF_OPT += --disable-image-loader-bmp +endif + +# +# Target-Install +# + +$(STATEDIR)/evas.targetinstall: + @$(call targetinfo) + + @$(call install_init, evas) + @$(call install_fixup, evas,PRIORITY,optional) + @$(call install_fixup, evas,SECTION,base) + @$(call install_fixup, evas,AUTHOR,Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, evas,DESCRIPTION,missing) + + @cd $(EVAS_PKGDIR)/usr/lib/evas/modules \ + for file in `find . -name '*.so'`; do \ + $(call install_copy, evas, 0, 0, 0644, -, /usr/lib/evas/modules/$$file); \ + done; + + @$(call install_lib, evas, 0, 0, 0644, libevas-ver-svn-06) + + @$(call install_finish, evas) + + @$(call touch) + +# 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 2/3] [efreet] Added support for the efl library efreet.
Ryan M. Raasch wrote: An implementation of several specifications from freedesktop.org intended for use in Enlightenment DR17. Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com --- rules/efreet.in | 21 ++ rules/efreet.make | 60 + 2 files changed, 81 insertions(+), 0 deletions(-) create mode 100644 rules/efreet.in create mode 100644 rules/efreet.make diff --git a/rules/efreet.in b/rules/efreet.in new file mode 100644 index 000..bcedb28 --- /dev/null +++ b/rules/efreet.in @@ -0,0 +1,21 @@ +## SECTION=multimedia_efl + +config EFREET + tristate + select EINA + select ECORE + select ECORE_FILE + select EET + prompt efreet + help + An implementation of several specifications from + freedesktop.org intended for use in Enlightenment + DR17 (e17) and other applications using the Enlightenment + Foundation Libraries (EFL). Currently, the following + specifications are included: + * Base Directory + * Desktop Entry + * Icon Theme + * Menu + * Trash + * Mime diff --git a/rules/efreet.make b/rules/efreet.make new file mode 100644 index 000..80c2bb7 --- /dev/null +++ b/rules/efreet.make @@ -0,0 +1,60 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Ryan Raasch ryan.raa...@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 +# +PACKAGES-$(PTXCONF_EFREET) += efreet + +# +# Paths and names +# +EFREET_VERSION := 0.5.0.49898 +EFREET := efreet-$(EFREET_VERSION) +EFREET_SUFFIX:= tar.bz2 +EFREET_URL := http://download.enlightenment.org/snapshots/2010-06-27/$(EFREET).$(EFREET_SUFFIX) +EFREET_SOURCE:= $(SRCDIR)/$(EFREET).$(EFREET_SUFFIX) +EFREET_DIR := $(BUILDDIR)/$(EFREET) +EFREET_LICENSE := LGPL + +# +# Prepare +# + +EFREET_CONF_ENV := $(CROSS_ENV) please remove + +# +# autoconf +# +EFREET_CONF_TOOL := autoconf +EFREET_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-doc + +# +# Target-Install +# + +$(STATEDIR)/efreet.targetinstall: + @$(call targetinfo) + + @$(call install_init, efreet) + @$(call install_fixup, efreet,PRIORITY,optional) + @$(call install_fixup, efreet,SECTION,base) + @$(call install_fixup, efreet,AUTHOR,Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, efreet,DESCRIPTION,missing) + + @$(call install_lib, efreet, 0, 0, 0644, libefreet-ver-svn-06) + + @$(call install_finish, efreet) + + @$(call touch) + +# vim: syntax=make fine, otherwise 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] [embryo] Added support for the efl library embryo.
Ryan M. Raasch wrote: Embryo implements a scripting language used by other parts of the EFL, such as Edje. Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com --- rules/embryo.in |8 +++ rules/embryo.make | 60 + 2 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 rules/embryo.in create mode 100644 rules/embryo.make diff --git a/rules/embryo.in b/rules/embryo.in new file mode 100644 index 000..6d90c8e --- /dev/null +++ b/rules/embryo.in @@ -0,0 +1,8 @@ +## SECTION=multimedia_efl + +config EMBRYO + tristate + prompt embryo + help + Embryo implements a scripting language + used by other parts of the EFL, such as Edje. diff --git a/rules/embryo.make b/rules/embryo.make new file mode 100644 index 000..ca5b0ad --- /dev/null +++ b/rules/embryo.make @@ -0,0 +1,60 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Ryan Raasch ryan.raa...@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 +# +PACKAGES-$(PTXCONF_EMBRYO) += embryo + +# +# Paths and names +# +EMBRYO_VERSION := 0.9.9.49898 +EMBRYO := embryo-$(EMBRYO_VERSION) +EMBRYO_SUFFIX:= tar.bz2 +EMBRYO_URL := http://download.enlightenment.org/snapshots/2010-06-27/$(EMBRYO).$(EMBRYO_SUFFIX) +EMBRYO_SOURCE:= $(SRCDIR)/$(EMBRYO).$(EMBRYO_SUFFIX) +EMBRYO_DIR := $(BUILDDIR)/$(EMBRYO) +EMBRYO_LICENSE := LGPL + +# +# Prepare +# + +EMBRYO_CONF_ENV := $(CROSS_ENV) please remove + +# +# autoconf +# +EMBRYO_CONF_TOOL:= autoconf +EMBRYO_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-doc + +# +# Target-Install +# + +$(STATEDIR)/embryo.targetinstall: + @$(call targetinfo) + + @$(call install_init, embryo) + @$(call install_fixup, embryo,PRIORITY,optional) + @$(call install_fixup, embryo,SECTION,base) + @$(call install_fixup, embryo,AUTHOR,Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, embryo,DESCRIPTION,missing) + + @$(call install_lib, embryo, 0, 0, 0644, libembryo-ver-svn-06) + + @$(call install_finish, embryo) + + @$(call touch) + +# vim: syntax=make 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] [lua] Removed phased out get phase.
Ryan M. Raasch wrote: Replaces install/copy with install_lib macro. Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com Thanks, applied to master Marc BTW: If you post a second version of your patch, please add a [PATCH V2] or similar to the subject. --- rules/lua.make | 12 +--- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/rules/lua.make b/rules/lua.make index c54075d..879430e 100644 --- a/rules/lua.make +++ b/rules/lua.make @@ -25,14 +25,6 @@ LUA_SOURCE := $(SRCDIR)/$(LUA).$(LUA_SUFFIX) LUA_DIR := $(BUILDDIR)/$(LUA) # -# Get -# - -$(LUA_SOURCE): - @$(call targetinfo) - @$(call get, LUA) - -# # Prepare # @@ -70,9 +62,7 @@ ifdef PTXCONF_LUA_INSTALL_LUAC @$(call install_copy, lua, 0, 0, 0755, -, /usr/bin/luac) endif ifdef PTXCONF_LUA_INSTALL_LIBLUA - @$(call install_copy, lua, 0, 0, 0644, -, \ - /usr/lib/liblua-5.1.3.so) - @$(call install_link, lua, liblua-5.1.3.so, /usr/lib/liblua.so) + @$(call install_lib, lua, 0, 0, 0644, liblua-5.1.3) endif @$(call install_finish, lua) -- 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/5] [edje] Added support for the efl library edje.
Ryan M. Raasch wrote: Edje is a library that attempts to separate the user interface from the application and is part of the Enlightenment Foundation libraries. Looks good, however, you select the 'ECORE_FILE' symbol. which is missing in my next/efl after applying this series of patches. Marc Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com --- rules/edje.in | 20 ++ rules/edje.make | 59 +++ 2 files changed, 79 insertions(+), 0 deletions(-) create mode 100644 rules/edje.in create mode 100644 rules/edje.make diff --git a/rules/edje.in b/rules/edje.in new file mode 100644 index 000..ec45d99 --- /dev/null +++ b/rules/edje.in @@ -0,0 +1,20 @@ +## SECTION=multimedia_efl + +menuconfig EDJE + tristate + prompt edje + select LUA + select EINA + select EET + select ECORE + select ECORE_FILE /home/frogger/pengutronix/ptxdist/ptxdist/rules/edje.in:10:warning: 'select' used by config symbol 'EDJE' refers to undefined symbol 'ECORE_FILE' + select EMBRYO + help + Edje is a library that attempts to separate + the user interface from the application. It + allows applications to be skinnable, so that + it is possible to change the GUI of an application + without changing the application itself. + Edje-based applications use files which contain the + specifications for the GUI layout that is to be used. + Edje themes are contained using EET generated files. diff --git a/rules/edje.make b/rules/edje.make new file mode 100644 index 000..5660154 --- /dev/null +++ b/rules/edje.make @@ -0,0 +1,59 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Ryan Raasch ryan.raa...@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 +# +PACKAGES-$(PTXCONF_EDJE) += edje + +# +# Paths and names +# +EDJE_VERSION := 0.9.99.49898 +EDJE := edje-$(EDJE_VERSION) +EDJE_SUFFIX := tar.bz2 +EDJE_URL := http://download.enlightenment.org/snapshots/2010-06-27/$(EDJE).$(EDJE_SUFFIX) +EDJE_SOURCE := $(SRCDIR)/$(EDJE).$(EDJE_SUFFIX) +EDJE_DIR := $(BUILDDIR)/$(EDJE) +EDJE_LICENSE := LGPL + +# +# Prepare +# + +# +# autoconf +# +EDJE_CONF_TOOL := autoconf +EDJE_CONF_OPT:= \ + $(CROSS_AUTOCONF_USR) \ + --disable-doc + +# +# Target-Install +# + +$(STATEDIR)/edje.targetinstall: + @$(call targetinfo) + + @$(call install_init, edje) + @$(call install_fixup, edje,PRIORITY,optional) + @$(call install_fixup, edje,SECTION,base) + @$(call install_fixup, edje,AUTHOR,Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, edje,DESCRIPTION,missing) + + @$(call install_lib, edje, 0, 0, 0644, libedje-ver-svn-06) + @$(call install_copy, edje, 0, 0, 0755, -, /usr/bin/edje_cc) + + @$(call install_finish, edje) + + @$(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 1/5] [eet] Added support for eet library.
Ryan M. Raasch wrote: Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com there seems to miss eina in the deps. checking for EINA... configure: error: Package requirements (eina-0) were not met: No package 'eina-0' found Marc --- rules/eet.in | 17 rules/eet.make | 57 2 files changed, 74 insertions(+), 0 deletions(-) create mode 100644 rules/eet.in create mode 100644 rules/eet.make diff --git a/rules/eet.in b/rules/eet.in new file mode 100644 index 000..6849899 --- /dev/null +++ b/rules/eet.in @@ -0,0 +1,17 @@ +## SECTION=multimedia_efl + +menuconfig EET + tristate + select ZLIB + select LIBJPEG + prompt eet + help + EET is a library that is designed to store and load + all type of data, locally or through a network stream. + It is designed to be light-weight, efficient and quick. + EET forms the basis of theme files in the EFL, i.e. + if you want to install a theme for Enlightenment or + another themable EFL app, you would be installing + an EET-format file, which contains all of the theme graphics + and configuration and do not need to be extracted onto the + filesystem in order to be used. diff --git a/rules/eet.make b/rules/eet.make new file mode 100644 index 000..d354bae --- /dev/null +++ b/rules/eet.make @@ -0,0 +1,57 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Ryan Raasch ryan.raa...@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 +# +PACKAGES-$(PTXCONF_EET) += eet + +# +# Paths and names +# +EET_VERSION := 1.3.2 +EET := eet-$(EET_VERSION) +EET_SUFFIX := tar.bz2 +EET_URL := http://download.enlightenment.org/releases/$(EET).$(EET_SUFFIX) +EET_SOURCE := $(SRCDIR)/$(EET).$(EET_SUFFIX) +EET_DIR := $(BUILDDIR)/$(EET) + +# +# Prepare +# + +# +# autoconf +# +EET_CONF_TOOL:= autoconf +EET_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-doc + +# +# Target-Install +# + +$(STATEDIR)/eet.targetinstall: + @$(call targetinfo) + + @$(call install_init, eet) + @$(call install_fixup, eet,PRIORITY,optional) + @$(call install_fixup, eet,SECTION,base) + @$(call install_fixup, eet,AUTHOR,Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, eet,DESCRIPTION,missing) + + @$(call install_lib, eet, 0, 0, 0644, libeet) + + @$(call install_finish, eet) + + @$(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 1/5] [eet] Added support for eet library.
Ryan M. Raasch wrote: Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com --- rules/eet.in | 17 rules/eet.make | 57 2 files changed, 74 insertions(+), 0 deletions(-) create mode 100644 rules/eet.in create mode 100644 rules/eet.make diff --git a/rules/eet.in b/rules/eet.in new file mode 100644 index 000..6849899 --- /dev/null +++ b/rules/eet.in @@ -0,0 +1,17 @@ +## SECTION=multimedia_efl + +menuconfig EET + tristate + select ZLIB + select LIBJPEG + prompt eet + help + EET is a library that is designed to store and load + all type of data, locally or through a network stream. + It is designed to be light-weight, efficient and quick. + EET forms the basis of theme files in the EFL, i.e. + if you want to install a theme for Enlightenment or + another themable EFL app, you would be installing + an EET-format file, which contains all of the theme graphics + and configuration and do not need to be extracted onto the + filesystem in order to be used. diff --git a/rules/eet.make b/rules/eet.make new file mode 100644 index 000..d354bae --- /dev/null +++ b/rules/eet.make @@ -0,0 +1,57 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Ryan Raasch ryan.raa...@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 +# +PACKAGES-$(PTXCONF_EET) += eet + +# +# Paths and names +# +EET_VERSION := 1.3.2 +EET := eet-$(EET_VERSION) +EET_SUFFIX := tar.bz2 +EET_URL := http://download.enlightenment.org/releases/$(EET).$(EET_SUFFIX) +EET_SOURCE := $(SRCDIR)/$(EET).$(EET_SUFFIX) +EET_DIR := $(BUILDDIR)/$(EET) + +# +# Prepare +# + +# +# autoconf +# +EET_CONF_TOOL:= autoconf +EET_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-doc I'd like to see (at least) default options openssl and gnutls. Marc + +# +# Target-Install +# + +$(STATEDIR)/eet.targetinstall: + @$(call targetinfo) + + @$(call install_init, eet) + @$(call install_fixup, eet,PRIORITY,optional) + @$(call install_fixup, eet,SECTION,base) + @$(call install_fixup, eet,AUTHOR,Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, eet,DESCRIPTION,missing) + + @$(call install_lib, eet, 0, 0, 0644, libeet) + + @$(call install_finish, eet) + + @$(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 5/5] [edje] Added support for the efl library edje.
Ryan M. Raasch wrote: Edje is a library that attempts to separate the user interface from the application and is part of the Enlightenment Foundation libraries. Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com --- rules/edje.in | 20 ++ rules/edje.make | 59 +++ 2 files changed, 79 insertions(+), 0 deletions(-) create mode 100644 rules/edje.in create mode 100644 rules/edje.make diff --git a/rules/edje.in b/rules/edje.in new file mode 100644 index 000..ec45d99 --- /dev/null +++ b/rules/edje.in @@ -0,0 +1,20 @@ +## SECTION=multimedia_efl + +menuconfig EDJE It has no suboptions, so please just config + tristate + prompt edje + select LUA + select EINA + select EET + select ECORE + select ECORE_FILE + select EMBRYO it seems an evas dependency is missing: No package 'evas' found Marc + help + Edje is a library that attempts to separate + the user interface from the application. It + allows applications to be skinnable, so that + it is possible to change the GUI of an application + without changing the application itself. + Edje-based applications use files which contain the + specifications for the GUI layout that is to be used. + Edje themes are contained using EET generated files. diff --git a/rules/edje.make b/rules/edje.make new file mode 100644 index 000..5660154 --- /dev/null +++ b/rules/edje.make @@ -0,0 +1,59 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Ryan Raasch ryan.raa...@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 +# +PACKAGES-$(PTXCONF_EDJE) += edje + +# +# Paths and names +# +EDJE_VERSION := 0.9.99.49898 +EDJE := edje-$(EDJE_VERSION) +EDJE_SUFFIX := tar.bz2 +EDJE_URL := http://download.enlightenment.org/snapshots/2010-06-27/$(EDJE).$(EDJE_SUFFIX) +EDJE_SOURCE := $(SRCDIR)/$(EDJE).$(EDJE_SUFFIX) +EDJE_DIR := $(BUILDDIR)/$(EDJE) +EDJE_LICENSE := LGPL + +# +# Prepare +# + +# +# autoconf +# +EDJE_CONF_TOOL := autoconf +EDJE_CONF_OPT:= \ + $(CROSS_AUTOCONF_USR) \ + --disable-doc + +# +# Target-Install +# + +$(STATEDIR)/edje.targetinstall: + @$(call targetinfo) + + @$(call install_init, edje) + @$(call install_fixup, edje,PRIORITY,optional) + @$(call install_fixup, edje,SECTION,base) + @$(call install_fixup, edje,AUTHOR,Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, edje,DESCRIPTION,missing) + + @$(call install_lib, edje, 0, 0, 0644, libedje-ver-svn-06) + @$(call install_copy, edje, 0, 0, 0755, -, /usr/bin/edje_cc) + + @$(call install_finish, edje) + + @$(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] [efl] Corrected alphabetical order for menu entry.
Ryan M. Raasch wrote: Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com applied to next/elf Marc --- rules/graphics_and_multimedia.in | 32 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in index ac96a43..0d3da1a 100644 --- a/rules/graphics_and_multimedia.in +++ b/rules/graphics_and_multimedia.in @@ -4,6 +4,22 @@ menu directfb friends source generated/multimedia_directfb.in endmenu +menuconfig EFL + bool + prompt efl + help + Enlightenment Foundation Libraries is a collection of libraries + origionally written for use by the Enlightenment DR17 Window Manager. + However, as these libraries grew and were tested and deployed more + and more, general functionality was added bringing us to enjoy a rich + and powerful set of libraries that can be used to help solve all sorts + of problems and act as a venerable alternative to the currently popular + GTK and QT library sets. + +if EFL +source generated/multimedia_efl.in +endif + menuconfig MENU_XORG_FONTS bool prompt fonts @@ -61,22 +77,6 @@ menu sdl source generated/multimedia_sdl.in endmenu -menuconfig EFL - bool - prompt efl - help - Enlightenment Foundation Libraries is a collection of libraries - origionally written for use by the Enlightenment DR17 Window Manager. - However, as these libraries grew and were tested and deployed more - and more, general functionality was added bringing us to enjoy a rich - and powerful set of libraries that can be used to help solve all sorts - of problems and act as a venerable alternative to the currently popular - GTK and QT library sets. - -if EFL -source generated/multimedia_efl.in -endif - menu sound source generated/multimedia_sound.in endmenu -- 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] How to apply the kernel patch
Suresh Kumar wrote: Hi, I am using ptxdist for my target (ARM - AT91RM2000). I am able to build the kernel image root fs and able to boot the target via nfs. I have two kernel patches received from the vendor. I dont know where to specify the patch location filename in the configuration menu(ptxdist menuconfig) Put your patches to your workspace subdir: patches/linux-$LINUX_VERSION Create a file in that dir called series. It should list the name of the patches, with one patch per line. You can create it with: ls *.patch series. (or whatever your patches are called) can you please help me to apply the patch. Do we have directFB,miniXML application (predefined) in the ptxdist? ptxdist comes with directfb. minixml has to be ported. 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] How to apply the kernel patch
Suresh Kumar wrote: Hi, Put your patches to your workspace subdir: patches/linux-$LINUX_VERSION Create a file in that dir called series. It should list the name of the patches, with one patch per line. You can create it with: ls *.patch series. (or whatever your patches are called) Do we need to mention the patches in the config file or just above step is enough? Is it require the clean build? just pleace the patches in the mentioned directory. They're automatically applied during the extract stage. To force a extract, do: ptxdist clean kernel ptxdist compile kernel 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] How to apply the kernel patch
Suresh Kumar wrote: just pleace the patches in the mentioned directory. They're automatically applied during the extract stage. To force a extract, do: ptxdist clean kernel ptxdist compile kernel I'm not sure if I understand what you mean, but I'm trying to answer your questions. What are all the other clean/compile options available. where should i clean and compile are available for all pacakges. Have a look at the help output: get package get package sources extract package extract package prepare package run configure stages for package compile package compile the sources install package install host side components into sysroot/ targetinstall package install files for target into root/ clean package cleanup package refer this build command helps. All the times, i am doing, ptxdist clean, ptxdist go its killing my time. Its really helpful for me to clean the filesystem/kernel/busybox or packages( other components) alone and rebuild. 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] [libmxml] Added Mini-XML library support.
Ryan M. Raasch wrote: Lightweight XML Library: Mini-XML is a small XML library that you can use to read and write XML and XML-like data files. I cleaned up the patch and make it work even if cross compiling. Shame on every project using autoconf but not automake (ptxdist excluded). I wonder how long it would take to autotoolize the libmxml properly. however, commited to master Marc Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com --- rules/libmxml.in | 10 + rules/libmxml.make | 57 2 files changed, 67 insertions(+), 0 deletions(-) create mode 100644 rules/libmxml.in create mode 100644 rules/libmxml.make diff --git a/rules/libmxml.in b/rules/libmxml.in new file mode 100644 index 000..c96644a --- /dev/null +++ b/rules/libmxml.in @@ -0,0 +1,10 @@ +## SECTION=system_libraries + +config LIBMXML + bool + prompt libmxml + help + Mini-XML is a small XML parsing library + that you can use to read XML and XML-like + data files in your application without + requiring large non-standard libraries. diff --git a/rules/libmxml.make b/rules/libmxml.make new file mode 100644 index 000..464e1f5 --- /dev/null +++ b/rules/libmxml.make @@ -0,0 +1,57 @@ +# -*-makefile-*- +# +# Copyright (C) 2007 by Lars Munch l...@segv.dk +# 2010 by Ryan Raasch ryan.raa...@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. +# + +PACKAGES-$(PTXCONF_LIBMXML) += libmxml + +# +# Paths and names +# +LIBMXML_VERSION := 2.6 +LIBMXML := mxml-$(LIBMXML_VERSION) +LIBMXML_SUFFIX := tar.gz +LIBMXML_URL := http://ftp.easysw.com/pub/libmxml/$(LIBMXML).$(LIBMXML_SUFFIX) +LIBMXML_SOURCE := $(SRCDIR)/$(LIBMXML).$(LIBMXML_SUFFIX) +LIBMXML_DIR := $(BUILDDIR)/mxml-$(LIBMXML_VERSION) +LIBMXML_LICENSE := LGPL + +# +# Prepare +# +LIBMXML_ENV := $(CROSS_ENV) \ + DSTROOT=$(LIBMXML_PKGDIR) +# +# autoconf +# +LIBMXML_CONF_TOOL:= autoconf +LIBMXML_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --enable-shared + +# +# Target-Install +# + +$(STATEDIR)/libmxml.targetinstall: + @$(call targetinfo) + + @$(call install_init, libmxml) + @$(call install_fixup, libmxml,PRIORITY,optional) + @$(call install_fixup, libmxml,SECTION,base) + @$(call install_fixup, libmxml,AUTHOR,Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, libmxml,DESCRIPTION,missing) + + @$(call install_lib, libmxml, 0, 0, 0644, libmxml) + + @$(call install_finish, libmxml) + + @$(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] [libmxml] Added Mini-XML library support.
Suresh Kumar wrote: when i try to install libmxml i am getting the following error. install link: src=libmxml.so.1.4 dst=/usr/lib/libmxml.so install link: src=libmxml.so.1.4 dst=/usr/lib/libmxml.so.1 @PACKAGE@ *** Error: Package name contains illegal characters, (other than [a-z0-9.+-]) ipkg-build: Please fix the above errors and try again. failed what could be wrong? You're ptxdist is too old. You have to add these lines to libmxml.make in the targetinstall section. @$(call install_fixup,libmxml,PACKAGE,libmxml) @$(call install_fixup,libmxml,VERSION,$(LIBMXML_VERSION)) 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/6] [eet] Added support for eet library.
Hey, Ryan M. Raasch wrote: TODO: Add gnutls library support to ptxdist. finally I've found some time to test and review this patch. I've added it to next/efl. Some nitpicks inline. cheers, Marc Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com --- rules/eet.in | 37 ++ rules/eet.make | 69 2 files changed, 106 insertions(+), 0 deletions(-) create mode 100644 rules/eet.in create mode 100644 rules/eet.make diff --git a/rules/eet.in b/rules/eet.in new file mode 100644 index 000..780842a --- /dev/null +++ b/rules/eet.in @@ -0,0 +1,37 @@ +## SECTION=multimedia_efl + +menuconfig EET + tristate + select ZLIB + select LIBJPEG + select EINA + select OPENSSL if EET_OPENSSL + prompt eet + help + EET is a library that is designed to store and load + all type of data, locally or through a network stream. + It is designed to be light-weight, efficient and quick. + EET forms the basis of theme files in the EFL, i.e. + if you want to install a theme for Enlightenment or + another themable EFL app, you would be installing + an EET-format file, which contains all of the theme graphics + and configuration and do not need to be extracted onto the + filesystem in order to be used. + +if EET + +config EET_GNUTLS + bool + depends on BROKEN + prompt gnutls support + help + Enable gnutls support. + +config EET_OPENSSL + bool + prompt openssl support + help + Enable openssl support. + +endif + ^^^ trailing blank line, can be removed diff --git a/rules/eet.make b/rules/eet.make new file mode 100644 index 000..24a5c31 --- /dev/null +++ b/rules/eet.make @@ -0,0 +1,69 @@ +# -*-makefile-*- +# +# Copyright (C) 2010 by Ryan Raasch ryan.raa...@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 +# +PACKAGES-$(PTXCONF_EET) += eet + +# +# Paths and names +# +EET_VERSION := 1.3.2 +EET := eet-$(EET_VERSION) +EET_SUFFIX := tar.bz2 +EET_URL := http://download.enlightenment.org/releases/$(EET).$(EET_SUFFIX) +EET_SOURCE := $(SRCDIR)/$(EET).$(EET_SUFFIX) +EET_DIR := $(BUILDDIR)/$(EET) + +# +# Prepare +# + +# +# autoconf +# +EET_CONF_TOOL:= autoconf +EET_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-doc + +ifdef PTXCONF_EET_GNUTLS +EET_CONF_OPT += --enable-gnutls +else +EET_CONF_OPT += --disable-gnutls +endif + +ifdef PTXCONF_EET_OPENSSL +EET_CONF_OPT += --enable-openssl +else +EET_CONF_OPT += --disable-openssl +endif + +# +# Target-Install +# + +$(STATEDIR)/eet.targetinstall: + @$(call targetinfo) + + @$(call install_init, eet) + @$(call install_fixup, eet,PRIORITY,optional) + @$(call install_fixup, eet,SECTION,base) + @$(call install_fixup, eet,AUTHOR,Ryan Raasch ryan.raa...@gmail.com) + @$(call install_fixup, eet,DESCRIPTION,missing) + + @$(call install_lib, eet, 0, 0, 0644, libeet) ^^^ one space should be enought :) + + @$(call install_finish, eet) + + @$(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] importing patches into git
Hey Enrico, please don't drop the mailinglist from CC! Enrico Weigelt wrote: Is there any inherent mapping between upstream version and patch directories ? Or could we maybe introduce some kind of normalization ? The patch dir corresponds to the name of the directory a pacakge extracts to. uhm, that's bad. requires the import system to know all these directories before patching. naturally it knows some canonical package name and works upon the an git tree coming from the upstream's vcs, which of course does not contain such an prefix directory (as found in tarballs). what about just taking the name of the tarball then and see where it breaks. Any suggestion on how to handle patch updates ? We use our git to track the change of the patches in ptxdist. However if you want to keep the patches together with the upstream I suggest to use something like http://git-dpm.alioth.debian.org/ I doubt that will help me in importing ptxdist patches ontop upstream release tags ;-o You asked about handling of patch updates :P 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] importing patches into git
Marc Kleine-Budde wrote: Hey Enrico, please don't drop the mailinglist from CC! I'm sorry! Finally the came to the ML, maybe our mailserver had an hickup. 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] Force the 'ssh client' to be installed if the 'scp' command should be used at target's side
Juergen Beisert wrote: commit 05fcf0093c4fc2e2fdad38f4f1c6d2d1ffca86a0 Author: Juergen Beisert j...@pengutronix.de Date: Thu Sep 9 13:22:50 2010 +0200 Force the 'ssh client' to be installed if the 'scp' command should be used at target's side Using the 'scp' command on the target without an installed 'ssh client' results into a /usr/bin/ssh not found message. please add your S-o-b cheers, Marc diff --git a/rules/openssh.in b/rules/openssh.in index a5b37f6..c318e8e 100644 --- a/rules/openssh.in +++ b/rules/openssh.in @@ -47,6 +47,14 @@ config OPENSSH_SCP help Install the secure copy program (scp) on the target +config OPENSSH_SCP_TARGET_USE + bool to be used at target's side + depends on OPENSSH_SCP + select OPENSSH_SSH + help + Enable this entry if the 'scp' command is intended to be used at + target's side + config OPENSSH_SFTP bool sftp (client) help -- 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] Force the 'ssh client' to be installed if the 'scp' command should be used at target's side
Juergen Beisert wrote: commit 05fcf0093c4fc2e2fdad38f4f1c6d2d1ffca86a0 Author: Juergen Beisert j...@pengutronix.de Date: Thu Sep 9 13:22:50 2010 +0200 Force the 'ssh client' to be installed if the 'scp' command should be used at target's side Using the 'scp' command on the target without an installed 'ssh client' results into a /usr/bin/ssh not found message. Signed-off-by: Juergen Beisert j...@pengutronix.de tnx, pushed to master. please try to use git send-email, the next time. Marc diff --git a/rules/openssh.in b/rules/openssh.in index a5b37f6..c318e8e 100644 --- a/rules/openssh.in +++ b/rules/openssh.in @@ -47,6 +47,14 @@ config OPENSSH_SCP help Install the secure copy program (scp) on the target +config OPENSSH_SCP_TARGET_USE + bool to be used at target's side + depends on OPENSSH_SCP + select OPENSSH_SSH + help + Enable this entry if the 'scp' command is intended to be used at + target's side + config OPENSSH_SFTP bool sftp (client) help -- 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/5] trivial: fix typos concerning access
On 09/13/2010 02:08 PM, Uwe Kleine-König wrote: Hi Marc, On Mon, Sep 13, 2010 at 01:10:53PM +0200, Marc Kleine-Budde wrote: diff --git a/patches/screen-4.0.2/remove-configure-run-tests.diff b/patches/screen-4.0.2/remove-configure-run-tests.diff index a74762f..9ae8c5a 100644 --- a/patches/screen-4.0.2/remove-configure-run-tests.diff +++ b/patches/screen-4.0.2/remove-configure-run-tests.diff @@ -456,7 +456,7 @@ Index: configure.in -AC_DEFINE_UNQUOTED(PTYMODE, $ptymode) -AC_DEFINE_UNQUOTED(PTYGROUP,$ptygrp) -else -- AC_NOTE(- ptys are world accessable) +- AC_NOTE(- ptys are world accessible) if you modify this patch it will probably not apply any longer obviously, yes. Should I resend with the files touching remove-configure-run-tests.diff removed? yes 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 | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/5 v2] trivial: fix typos concerning access
On 09/13/2010 02:24 PM, Uwe Kleine-König wrote: Signed-off-by: Uwe Kleine-König u.kleine-koe...@pengutronix.de tnx, pushed to master Marc --- changes since (implicit) v1: - skipped patches/screen-4.0.2/remove-configure-run-tests.diff ChangeLog|2 +- config/setup/Kconfig |2 +- rules/graphics_and_multimedia.in |2 +- rules/util-linux-ng.in |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fdd8e5b..adcddea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2862,7 +2862,7 @@ * general: support for OMAP added (Ladislav Michl) * fakeroot: update to 1.2.4 (Robert Schwebel) * openssh: update to 3.9p1 (patch by Ladislav Michl) - * rootfs: make /tmp accessable for all and make it + * rootfs: make /tmp accessible for all and make it sticky (patch by Ladislav Michl) 2005-02-08 Robert Schwebel r.schwe...@pengutronix.de diff --git a/config/setup/Kconfig b/config/setup/Kconfig index 931cf80..f5ed9c9 100644 --- a/config/setup/Kconfig +++ b/config/setup/Kconfig @@ -176,7 +176,7 @@ config SETUP_IPKG_REPOSITORY prompt Path to IPKG Repository help PTXdist can be used to update an IPKG server which is - accessable via a mounted path. Run 'make ipkg-push' + accessible via a mounted path. Run 'make ipkg-push' to push the packets from $IMAGEDIR to the server dir which is specified here. diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in index d41c8a8..64346b5 100644 --- a/rules/graphics_and_multimedia.in +++ b/rules/graphics_and_multimedia.in @@ -28,7 +28,7 @@ config XORG_FONTS config XORG_FONTS_QT4_LINKS depends on QT4_PLATFORM_EMBEDDED bool - prompt Make fonts accessable for QtEmbedded + prompt Make fonts accessible for QtEmbedded help QtEmbedded only looks in one directory for fonts. This will create links to all fonts int the Qt Font directory to allow QtEmbedded diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index cbbffc5..28d701c 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -101,7 +101,7 @@ config UTIL_LINUX_NG_IPCS depends on !BUSYBOX_IPCS || ALLYES help ipcs provides information on the ipc facilities - for which the calling process has read acccess. + for which the calling process has read access. comment BusyBox' ipcs is selected! depends on BUSYBOX_IPCS -- 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/22] [mono] added new package
/resgen2) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/secutil) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/setreg) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/sgen) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/signcode) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/sn) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/soapsuds) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/sqlmetal) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/sqlsharp) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/svcutil) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/wsdl) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/wsdl1) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/wsdl2) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/xbuild) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/xsd) + @$(call install_copy, mono, 0, 0, 0755, -, /usr/bin/xsd2) + + @$(call install_lib, mono, 0, 0, 0644, libikvm-native) + @$(call install_lib, mono, 0, 0, 0644, libmono-profiler-aot) + @$(call install_lib, mono, 0, 0, 0644, libMonoPosixHelper) + @$(call install_lib, mono, 0, 0, 0644, libmono-profiler-cov) + @$(call install_lib, mono, 0, 0, 0644, libmono-profiler-logging) + @$(call install_lib, mono, 0, 0, 0644, libmono) + @$(call install_lib, mono, 0, 0, 0644, libMonoSupportW) + + @$(call install_copy, mono, 0, 0, 0644, -, /usr/share/mono-1.0/mono/cil/cil-opcodes.xml) + + # looks like we have to install this, otherwhise not even helloworld.cs does work + @$(call install_copy, mono, 0, 0, 0755, \ + $(MONO_DIR)/mcs/class/lib/monolite/mscorlib.dll, \ + /usr/lib/mono/1.0/mscorlib.dll) + + @$(call install_finish, mono) + + @$(call touch) + 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 03/22] [libcap] added new packet
On 09/10/2010 10:47 PM, Robert Schwebel wrote: Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- rules/libcap.in |7 + rules/libcap.make | 69 + there's aleady a host-libcap.make, please regenerate host-libcap.make. 2 files changed, 76 insertions(+), 0 deletions(-) create mode 100644 rules/libcap.in create mode 100644 rules/libcap.make diff --git a/rules/libcap.in b/rules/libcap.in new file mode 100644 index 000..c820658 --- /dev/null +++ b/rules/libcap.in @@ -0,0 +1,7 @@ +## SECTION=system_libraries + +config LIBCAP + tristate + prompt libcap + help + A library for getting and setting POSIX.1e capabilities. diff --git a/rules/libcap.make b/rules/libcap.make new file mode 100644 index 000..82ee108 --- /dev/null +++ b/rules/libcap.make @@ -0,0 +1,69 @@ +# -*-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_LIBCAP) += libcap + +# +# Paths and names +# +LIBCAP_VERSION := 2.19 +LIBCAP := libcap-$(LIBCAP_VERSION) +LIBCAP_SUFFIX:= tar.bz2 +LIBCAP_URL := http://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$(LIBCAP).$(LIBCAP_SUFFIX) +LIBCAP_SOURCE:= $(SRCDIR)/$(LIBCAP).$(LIBCAP_SUFFIX) +LIBCAP_DIR := $(BUILDDIR)/$(LIBCAP) +LIBCAP_LICENSE := unknown + +# +# Get +# + +$(LIBCAP_SOURCE): + @$(call targetinfo) + @$(call get, LIBCAP) please remove get stage + +# +# Prepare +# + +LIBCAP_CONF_ENV := $(CROSS_ENV) please remove obsolete env +LIBCAP_MAKE_OPT := \ + prefix= PAM_CAP=no LIBATTR=no lib=lib \ + CC=$(CROSS_CC) \ + BUILD_CC=gcc use $(HOSTCC) instead of hardcoding gcc + +LIBCAP_INSTALL_OPT := $(LIBCAP_MAKE_OPT) install + +# +# Target-Install +# + +$(STATEDIR)/libcap.targetinstall: + @$(call targetinfo) + + @$(call install_init, libcap) + @$(call install_fixup, libcap,PRIORITY,optional) + @$(call install_fixup, libcap,SECTION,base) + @$(call install_fixup, libcap,AUTHOR,Robert Schwebel r.schwe...@pengutronix.de) + @$(call install_fixup, libcap,DESCRIPTION,missing) + + @$(call install_copy, libcap, 0, 0, 0755, -, /sbin/getpcaps) + @$(call install_copy, libcap, 0, 0, 0755, -, /sbin/capsh) + @$(call install_lib, libcap, 0, 0, 0644, libcap) + + @$(call install_finish, libcap) + + @$(call touch) + +# vim: syntax=make 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 cross-toolchain building problem
On 09/17/2010 01:20 PM, Gradimir Ljubibratic wrote: Hi, I have a problem when I try to build cross-toolchain using ptxdist application. I installed ptxdist-2010.08.0 package on Ubuntu10.4. Ubuntu have been installed on the VMWare WorkStation 7.1.1. I also use OSELAS.Toolchain-1.99.3.7 and I have trying to build cross-toolchain for arm926 core. After typing ptxdist go I get this massage bash: arm-v5te-linux-gnueabi-gcc: command not found. Does the build process of the toolchain stop? If yes, send some more console output. If not, it's not fatal. 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] Error durning filesystem build for arm
On 09/21/2010 12:00 PM, evolution test wrote: Hello, I am using ptxdist to build file system for armv6k architecture. I am using my own toolchain for building. I am facing below error during build. checking build system type... i686-host-linux-gnu checking host system type... i686-host-linux-gnu ^^^ This looks fishy. If you're cross compiling to arm the output should look like this: checking build system type... x86_64-host-linux-gnu checking host system type... arm-iwmmx-linux-gnueabi checking for gcc... arm-none-linux-gnueabi-gcc checking for C compiler default output file name... a.out checking whether the C compiler works... configure: error: cannot run C compiled programs. If you meant to cross compile, use `--host'. See `config.log' for more details. make: *** [/home/tmp/ptxdist_pjt/platform-mrs-test/state/zlib.prepare] Error 1 Can anybody help me where is the problem. Please check your platform configuration: ptxdist platformconfig - architecture It should say arm in this submenu. 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] Error durning filesystem build for arm
Moin Vij,
please don't top-post.
On 09/22/2010 04:38 AM, evolution test wrote:
Hi,
It is showing arch arm only.
I have attached platform config ptxconfig for your reference.
Please check let me know what can be problem.
From your platformconfig:
#
# toolchain
#
PTXCONF_CROSSCHAIN_VENDOR=
PTXCONF_CROSSCHAIN_CHECK=4.4.3
PTXCONF_LIBC_GLIBC=y
# PTXCONF_LIBC_UCLIBC is not set
PTXCONF_GLIBC_VERSION=2.8
PTXCONF_GNU_TARGET=
^^
PTXCONF_COMPILER_PREFIX=${PTXCONF_GNU_TARGET}arm-mrs-linux-gnueabi-
^^^
PTXCONF_COMPILER_PREFIX_KERNEL=${PTXCONF_COMPILER_PREFIX}
PTXCONF_COMPILER_PREFIX_BOOTLOADER=${PTXCONF_COMPILER_PREFIX}
Please make it look this way:
PTXCONF_GNU_TARGET=arm-mrs-linux-gnueabi
PTXCONF_COMPILER_PREFIX=${PTXCONF_GNU_TARGET}-
that should 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] Error durning filesystem build for arm
On 09/22/2010 11:54 AM, evolution test wrote: Yes, It helps me.now i am able to use ptxdist. Thanks a lot... \o/ But i am facing some other problem: --- target: host-ipkg-utils.install --- fakeroot: preload library `libfakeroot.so' not found, aborting. Please let me know what i can do. Have you started a clean build after fixing your config files? Are you using a 32bit toolchain on a 64 bit host? Is this a fatal problem? 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] Error durning filesystem build for arm
On 09/22/2010 03:27 PM, evolution test wrote: Are you using a 32bit toolchain on a 64 bit host? I am not sure how can i check about toolchain but host is 32 bit. Then the toolchain will be 32 bit, too. However send me the output of uname -a Linux mmdemo.srv 2.6.31-22-generic #63-Ubuntu SMP Wed Aug 18 22:54:26 UTC 2010 i686 GNU/Linux file $PATH_TO_YOUR_TOOLCHAIN/arm-whatever-gnueabi-gcc arm-none-linux-gnueabi-gcc: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 2.2.5, stripped Then it's not a 32/64 bit issue. Is this a fatal problem? Not sure. Does it stop building or not? :) Yes. Then it's fatal :) I am facing a problem in fetching so many other package (Currently with font package) .it will be helpful if i will get the exact reason why i am facing the problem in fetching package. The xorg gwdg mirror is not updated, so first change this...: Do a ptxdist setup - Source Download - x.org Mirror change it to http://ftp.sunet.se/pub/X11/ftp.x.org; I changed it but still i could able to see problem. (See below log) Changing the mirror is not related to your DNS-problem. But gwgd is known not to have the latest xorg packages. target: font-alias-1.0.2.tar.bz2 --2010-09-22 18:50:55-- http://ftp.sunet.se/pub/X11/ftp.x.org/individual/font/font-alias-1.0.2.tar.bz2 Resolving ftp.sunet.se... failed: Name or service not known. wget: unable to resolve host address `ftp.sunet.se' --2010-09-22 18:50:55-- http://www.pengutronix.de/software/ptxdist/temporary-src/font-alias-1.0.2.tar.bz2 Resolving www.pengutronix.de... failed: Name or service not known. wget: unable to resolve host address `www.pengutronix.de' Then your name resolution is broken. How do you download the packages by hand? please send me the output of host www.heise.de ping www.heise.de cat /etc/resolv.conf cat /etc/nsswitch.conf Your linux box needs internet connectivity. Do you need a proxy to connect to the internet? You can enter a Proxy in: ptxdist setup - Proxies I am connected with dorect network so i don't need any proxy setting. But name resulition is broken. 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/1] [libjpeg] use install_lib.
Hey Ryan, On 09/24/2010 02:43 PM, Ryan M. Raasch wrote: Robert hat a bg tree doing conversions to install_lib, so no need to to do it Signed-off-by: Ryan M. Raasch ryan.raa...@gmail.com --- rules/libjpeg.make | 19 +-- 1 files changed, 1 insertions(+), 18 deletions(-) diff --git a/rules/libjpeg.make b/rules/libjpeg.make index f6ae938..8df3080 100644 --- a/rules/libjpeg.make +++ b/rules/libjpeg.make @@ -27,20 +27,6 @@ LIBJPEG_DIR:= $(BUILDDIR)/$(LIBJPEG) LIBJPEG_LICENSE := jpeg # -# Get -# - -$(LIBJPEG_SOURCE): - @$(call targetinfo) - @$(call get, LIBJPEG) - -# -# Prepare -# - -LIBJPEG_CONF_TOOL := autoconf it works without that line, but I'd like to see it, just for documentation purpose. - -# # Target-Install # @@ -53,10 +39,7 @@ $(STATEDIR)/libjpeg.targetinstall: @$(call install_fixup, libjpeg,AUTHOR,Robert Schwebel r.schwe...@pengutronix.de) @$(call install_fixup, libjpeg,DESCRIPTION,missing) - @$(call install_copy, libjpeg, 0, 0, 0644, -, \ - /usr/lib/libjpeg.so.8.0.1) - @$(call install_link, libjpeg, libjpeg.so.8.0.1, /usr/lib/libjpeg.so.8) - @$(call install_link, libjpeg, libjpeg.so.8.0.1, /usr/lib/libjpeg.so) + @$(call install_lib, libjpeg, 0, 0, 0644, libjpeg) @$(call install_finish, libjpeg) 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] kernel modules (src-linux-driver) regression in 2010-08-0
On 10/07/2010 01:38 PM, Tim Sander wrote: Hi I just switched to ptxdist-2010-08-0 yesterday and i found that all the modules created with the template (even with 2010-08-0) are not included in the kernel anymore? Steps to reproduce: ptxdist newpackage src-linux-driver ptxdist menuconfig #and select the new driver ptxdist images The modules will be build normally but not installed under /lib/modules/*/extra and are thus not found when calling modprobe name. Can you test if this patch helps? 76e73ab090656d83463af7000f32628b43292d6b 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] kernel modules (src-linux-driver) regression in 2010-08-0
On 10/08/2010 10:47 AM, Tim Sander wrote: Hi Marc Can you test if this patch helps? 76e73ab090656d83463af7000f32628b43292d6b This patch helps. But somehow i have an error that expat uses bz2 instead of the correct gz? At least i cant download the tar.bz2 package from here? The expat tar.gz cannot be uncompressed on some i386/ubuntu-10.04 systems. So we recompressed it as bz2 and put it on the pengutronix's website. SO it should be downloaded from there. 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
