[ptxdist] [PATCH] python3-pyusb: new package
Signed-off-by: Jan Luebbe --- rules/python3-pyusb.in | 10 rules/python3-pyusb.make | 54 2 files changed, 64 insertions(+) create mode 100644 rules/python3-pyusb.in create mode 100644 rules/python3-pyusb.make diff --git a/rules/python3-pyusb.in b/rules/python3-pyusb.in new file mode 100644 index ..c20b081f3494 --- /dev/null +++ b/rules/python3-pyusb.in @@ -0,0 +1,10 @@ +## SECTION=python3 + +config PYTHON3_PYUSB + tristate + select HOST_PYTHON3_SETUPTOOLS_SCM + select PYTHON3 + select LIBUSB + prompt "pyusb" + help + Easy USB access for Python diff --git a/rules/python3-pyusb.make b/rules/python3-pyusb.make new file mode 100644 index ..a717e7883e74 --- /dev/null +++ b/rules/python3-pyusb.make @@ -0,0 +1,54 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Jan Luebbe +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_PYUSB) += python3-pyusb + +# +# Paths and names +# +PYTHON3_PYUSB_VERSION := 1.2.1 +PYTHON3_PYUSB_MD5 := 880008dff32dac8f58076b4e534492d9 +PYTHON3_PYUSB := pyusb-$(PYTHON3_PYUSB_VERSION) +PYTHON3_PYUSB_SUFFIX := tar.gz +PYTHON3_PYUSB_URL := $(call ptx/mirror-pypi, pyusb, $(PYTHON3_PYUSB).$(PYTHON3_PYUSB_SUFFIX)) +PYTHON3_PYUSB_SOURCE := $(SRCDIR)/$(PYTHON3_PYUSB).$(PYTHON3_PYUSB_SUFFIX) +PYTHON3_PYUSB_DIR := $(BUILDDIR)/$(PYTHON3_PYUSB) +PYTHON3_PYUSB_LICENSE := BSD-3-Clause +PYTHON3_PYUSB_LICENSE_FILES:= \ + file://LICENSE;md5=e64a29fcd3c3dd356a24e235dfcb3905 + +# +# Prepare +# + +PYTHON3_PYUSB_CONF_TOOL:= python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-pyusb.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-pyusb) + @$(call install_fixup, python3-pyusb,PRIORITY,optional) + @$(call install_fixup, python3-pyusb,SECTION,base) + @$(call install_fixup, python3-pyusb,AUTHOR,"Jan Luebbe ") + @$(call install_fixup, python3-pyusb,DESCRIPTION,missing) + + @$(call install_glob, python3-pyusb, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES),, *.py) + + @$(call install_finish, python3-pyusb) + + @$(call touch) + +# vim: syntax=make -- 2.39.2
[ptxdist] [PATCH v2] blktrace: add new package
Signed-off-by: Jan Luebbe --- Changes since v1: Use 'prefix=/usr ALL="blktrace blkparse"' in BLKTRACE_MAKE_OPT to build only the relevant binaries. This also allows using the upsteam install target. rules/blktrace.in | 8 ++ rules/blktrace.make | 63 + 2 files changed, 71 insertions(+) create mode 100644 rules/blktrace.in create mode 100644 rules/blktrace.make diff --git a/rules/blktrace.in b/rules/blktrace.in new file mode 100644 index ..69335e2e4288 --- /dev/null +++ b/rules/blktrace.in @@ -0,0 +1,8 @@ +## SECTION=disk_and_file + +config BLKTRACE + tristate + prompt "blktrace" + help + Collects and parses block IO traces using the CONFIG_BLK_DEV_IO_TRACE + kernel feature. diff --git a/rules/blktrace.make b/rules/blktrace.make new file mode 100644 index ..c39107a9814d --- /dev/null +++ b/rules/blktrace.make @@ -0,0 +1,63 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Jan Luebbe +# +# 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_BLKTRACE) += blktrace + +# +# Paths and names +# +BLKTRACE_VERSION := 1.2.0 +BLKTRACE_MD5 := b9a80b7cc0a50f7a96d34c570ab8224d +BLKTRACE := blktrace-$(BLKTRACE_VERSION) +BLKTRACE_SUFFIX:= tar.bz2 +BLKTRACE_URL := http://brick.kernel.dk/snaps/$(BLKTRACE).$(BLKTRACE_SUFFIX) +BLKTRACE_SOURCE:= $(SRCDIR)/$(BLKTRACE).$(BLKTRACE_SUFFIX) +BLKTRACE_DIR := $(BUILDDIR)/$(BLKTRACE) +BLKTRACE_LICENSE := GPL-2.0-only + +# +# Prepare +# + +BLKTRACE_CONF_TOOL := NO +BLKTRACE_MAKE_PAR := NO +BLKTRACE_MAKE_OPT := \ + $(CROSS_ENV) \ + prefix=/usr \ + ALL="blktrace blkparse" + +BLKTRACE_INSTALL_OPT := \ + $(BLKTRACE_MAKE_OPT) \ + install + +# +# Target-Install +# + +$(STATEDIR)/blktrace.targetinstall: + @$(call targetinfo) + + @$(call install_init, blktrace) + @$(call install_fixup, blktrace,PRIORITY,optional) + @$(call install_fixup, blktrace,SECTION,base) + @$(call install_fixup, blktrace,AUTHOR,"Jan Luebbe ") + @$(call install_fixup, blktrace,DESCRIPTION,missing) + + @$(call install_copy, blktrace, 0, 0, 0755, -, /usr/bin/blkparse) + @$(call install_copy, blktrace, 0, 0, 0755, -, /usr/bin/blktrace) + + @$(call install_finish, blktrace) + + @$(call touch) + +# vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] blktrace: add new package
Signed-off-by: Jan Luebbe --- rules/blktrace.in | 8 +++ rules/blktrace.make | 66 + 2 files changed, 74 insertions(+) create mode 100644 rules/blktrace.in create mode 100644 rules/blktrace.make diff --git a/rules/blktrace.in b/rules/blktrace.in new file mode 100644 index ..69335e2e4288 --- /dev/null +++ b/rules/blktrace.in @@ -0,0 +1,8 @@ +## SECTION=disk_and_file + +config BLKTRACE + tristate + prompt "blktrace" + help + Collects and parses block IO traces using the CONFIG_BLK_DEV_IO_TRACE + kernel feature. diff --git a/rules/blktrace.make b/rules/blktrace.make new file mode 100644 index ..2b41afdf2c7c --- /dev/null +++ b/rules/blktrace.make @@ -0,0 +1,66 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Jan Luebbe +# +# 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_BLKTRACE) += blktrace + +# +# Paths and names +# +BLKTRACE_VERSION := 1.2.0 +BLKTRACE_MD5 := b9a80b7cc0a50f7a96d34c570ab8224d +BLKTRACE := blktrace-$(BLKTRACE_VERSION) +BLKTRACE_SUFFIX:= tar.bz2 +BLKTRACE_URL := http://brick.kernel.dk/snaps/$(BLKTRACE).$(BLKTRACE_SUFFIX) +BLKTRACE_SOURCE:= $(SRCDIR)/$(BLKTRACE).$(BLKTRACE_SUFFIX) +BLKTRACE_DIR := $(BUILDDIR)/$(BLKTRACE) +BLKTRACE_LICENSE := GPL-2.0-only + +# +# Prepare +# + +BLKTRACE_CONF_TOOL := NO +BLKTRACE_MAKE_PAR := NO +BLKTRACE_MAKE_OPT := $(CROSS_ENV) blktrace blkparse + +# +# Install +# + +$(STATEDIR)/blktrace.install: + @$(call targetinfo) + @$(call touch) + +# +# Target-Install +# + +$(STATEDIR)/blktrace.targetinstall: + @$(call targetinfo) + + @$(call install_init, blktrace) + @$(call install_fixup, blktrace,PRIORITY,optional) + @$(call install_fixup, blktrace,SECTION,base) + @$(call install_fixup, blktrace,AUTHOR,"Jan Luebbe ") + @$(call install_fixup, blktrace,DESCRIPTION,missing) + + @$(call install_copy, blktrace, 0, 0, 0755, $(BLKTRACE_DIR)/blkparse, \ + /usr/bin/blkparse) + @$(call install_copy, blktrace, 0, 0, 0755, $(BLKTRACE_DIR)/blktrace, \ + /usr/sbin/blktrace) + + @$(call install_finish, blktrace) + + @$(call touch) + +# vim: syntax=make -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] host-libp11: update engines directory for the host package as well
The target package was updated in commit da22b723bfa2d0ec0c2b61c696d06b05849bb818. Signed-off-by: Jan Luebbe --- rules/host-libp11.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/host-libp11.make b/rules/host-libp11.make index da3b961cadee..2257aea9ba31 100644 --- a/rules/host-libp11.make +++ b/rules/host-libp11.make @@ -30,7 +30,7 @@ HOST_LIBP11_CONF_OPT := \ --disable-strict \ --disable-pedantic \ --disable-api-doc \ - --with-enginesdir=/lib/engines \ + --with-enginesdir=/lib/engines-1.1 \ --with-pkcs11-module= HOST_LIBP11_MAKE_PAR := NO -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] systemd: add missing dependency on HOST_GETTEXT
Otherwise compilation fails with: po/meson.build:4:5: ERROR: Can not do gettext because xgettext is not installed. Signed-off-by: Jan Luebbe --- rules/systemd.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/systemd.in b/rules/systemd.in index bff9d2aa2594..c6b8848f44d4 100644 --- a/rules/systemd.in +++ b/rules/systemd.in @@ -4,6 +4,7 @@ menuconfig SYSTEMD tristate depends on INITMETHOD_SYSTEMD select HOST_MESON + select HOST_GETTEXT select HOST_GPERF select ROOTFS_RUN select LIBC_PTHREAD -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] linux-serial-test: add new package
linux-serial-test is a small utility to test whether the serial port and its driver are working correctly. Signed-off-by: Jan Luebbe --- rules/linux-serial-test.in | 10 rules/linux-serial-test.make | 56 2 files changed, 66 insertions(+) create mode 100644 rules/linux-serial-test.in create mode 100644 rules/linux-serial-test.make diff --git a/rules/linux-serial-test.in b/rules/linux-serial-test.in new file mode 100644 index ..3f44343340d3 --- /dev/null +++ b/rules/linux-serial-test.in @@ -0,0 +1,10 @@ +## SECTION=test_suites + +config LINUX_SERIAL_TEST + tristate + select HOST_CMAKE + prompt "linux-serial-test" + help + Test application for serial ports under Linux. + +# vim: syntax=kconfig diff --git a/rules/linux-serial-test.make b/rules/linux-serial-test.make new file mode 100644 index ..255bc05aa4d1 --- /dev/null +++ b/rules/linux-serial-test.make @@ -0,0 +1,56 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Jan Luebbe +# +# 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_LINUX_SERIAL_TEST) += linux-serial-test + +# +# Paths and names +# +LINUX_SERIAL_TEST_VERSION := 2018-09-13-gaed2a6e78160 +LINUX_SERIAL_TEST_MD5 := 6aa8351c219b585a8cccecfe74dd964e +LINUX_SERIAL_TEST := linux-serial-test-$(LINUX_SERIAL_TEST_VERSION) +LINUX_SERIAL_TEST_SUFFIX := tar.gz +LINUX_SERIAL_TEST_URL := https://github.com/cbrake/linux-serial-test/archive/$(LINUX_SERIAL_TEST_VERSION).tar.gz +LINUX_SERIAL_TEST_SOURCE := $(SRCDIR)/$(LINUX_SERIAL_TEST).$(LINUX_SERIAL_TEST_SUFFIX) +LINUX_SERIAL_TEST_DIR := $(BUILDDIR)/$(LINUX_SERIAL_TEST) +LINUX_SERIAL_TEST_LICENSE := MIT + +# +# Prepare +# + +# +# cmake +# +LINUX_SERIAL_TEST_CONF_TOOL:= cmake + +# +# Target-Install +# + +$(STATEDIR)/linux-serial-test.targetinstall: + @$(call targetinfo) + + @$(call install_init, linux-serial-test) + @$(call install_fixup, linux-serial-test,PRIORITY,optional) + @$(call install_fixup, linux-serial-test,SECTION,base) + @$(call install_fixup, linux-serial-test,AUTHOR,"Jan Luebbe ") + @$(call install_fixup, linux-serial-test,DESCRIPTION,missing) + + @$(call install_copy, linux-serial-test, 0, 0, 0755, -, /usr/bin/linux-serial-test) + + @$(call install_finish, linux-serial-test) + + @$(call touch) + +# vim: syntax=make -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] wpa_supplicant: fix typo in prompt for wpa_passphrase
Signed-off-by: Jan Luebbe --- rules/wpa_supplicant.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/wpa_supplicant.in b/rules/wpa_supplicant.in index a5d42faa1d01..0f55c158364b 100644 --- a/rules/wpa_supplicant.in +++ b/rules/wpa_supplicant.in @@ -19,7 +19,7 @@ config WPA_SUPPLICANT_CTRL_IFACE_DBUS config WPA_SUPPLICANT_PASSPHRASE bool - prompt "installl wpa_passphrase" + prompt "install wpa_passphrase" help Install wpa_passphrase tool (Generate a WPA PSK from an ASCII passphrase for a SSID) -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] stress-ng: add new package
Signed-off-by: Jan Luebbe <j...@pengutronix.de> --- rules/stress-ng.in | 12 +++ rules/stress-ng.make | 57 2 files changed, 69 insertions(+) create mode 100644 rules/stress-ng.in create mode 100644 rules/stress-ng.make diff --git a/rules/stress-ng.in b/rules/stress-ng.in new file mode 100644 index ..1397ef24f053 --- /dev/null +++ b/rules/stress-ng.in @@ -0,0 +1,12 @@ +## SECTION=test_suites + +config STRESS_NG + tristate + prompt "stress-ng" + select LIBAIO + select LIBBSD + select ZLIB + help + stress-ng will stress test a computer system in various selectable + ways. It was designed to exercise various physical subsystems of a + computer as well as the various operating system kernel interfaces. diff --git a/rules/stress-ng.make b/rules/stress-ng.make new file mode 100644 index ..15969d2a1436 --- /dev/null +++ b/rules/stress-ng.make @@ -0,0 +1,57 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Jan Luebbe <j...@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_STRESS_NG) += stress-ng + +# +# Paths and names +# +STRESS_NG_VERSION := 0.09.13 +STRESS_NG_MD5 := 37eaef85fb352760c9f92c09c2c992dc +STRESS_NG := stress-ng-$(STRESS_NG_VERSION) +STRESS_NG_SUFFIX := tar.xz +STRESS_NG_URL := http://kernel.ubuntu.com/~cking/tarballs/stress-ng/$(STRESS_NG).$(STRESS_NG_SUFFIX) +STRESS_NG_SOURCE := $(SRCDIR)/$(STRESS_NG).$(STRESS_NG_SUFFIX) +STRESS_NG_DIR := $(BUILDDIR)/$(STRESS_NG) +STRESS_NG_LICENSE := GPL-2.0+ + +# +# Prepare +# + +STRESS_NG_CONF_TOOL:= NO + +# +# Compile +# + +STRESS_NG_MAKE_ENV := $(CROSS_ENV) + +# +# Target-Install +# + +$(STATEDIR)/stress-ng.targetinstall: + @$(call targetinfo) + + @$(call install_init, stress-ng) + @$(call install_fixup, stress-ng,PRIORITY,optional) + @$(call install_fixup, stress-ng,SECTION,base) + @$(call install_fixup, stress-ng,AUTHOR,"Jan Luebbe <j...@pengutronix.de>") + @$(call install_fixup, stress-ng,DESCRIPTION,missing) + + @$(call install_copy, stress-ng, 0, 0, 0755, -, /usr/bin/stress-ng) + + @$(call install_finish, stress-ng) + + @$(call touch) -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] stress-ng: add new package
Signed-off-by: Jan Luebbe <j...@pengutronix.de> --- rules/stress-ng.in | 11 ++ rules/stress-ng.make | 57 2 files changed, 68 insertions(+) create mode 100644 rules/stress-ng.in create mode 100644 rules/stress-ng.make diff --git a/rules/stress-ng.in b/rules/stress-ng.in new file mode 100644 index ..747302ac830b --- /dev/null +++ b/rules/stress-ng.in @@ -0,0 +1,11 @@ +## SECTION=test_suites + +config STRESS_NG + tristate + prompt "stress-ng" + select LIBBSD + select ZLIB + help + stress-ng will stress test a computer system in various selectable + ways. It was designed to exercise various physical subsystems of a + computer as well as the various operating system kernel interfaces. diff --git a/rules/stress-ng.make b/rules/stress-ng.make new file mode 100644 index ..15969d2a1436 --- /dev/null +++ b/rules/stress-ng.make @@ -0,0 +1,57 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Jan Luebbe <j...@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_STRESS_NG) += stress-ng + +# +# Paths and names +# +STRESS_NG_VERSION := 0.09.13 +STRESS_NG_MD5 := 37eaef85fb352760c9f92c09c2c992dc +STRESS_NG := stress-ng-$(STRESS_NG_VERSION) +STRESS_NG_SUFFIX := tar.xz +STRESS_NG_URL := http://kernel.ubuntu.com/~cking/tarballs/stress-ng/$(STRESS_NG).$(STRESS_NG_SUFFIX) +STRESS_NG_SOURCE := $(SRCDIR)/$(STRESS_NG).$(STRESS_NG_SUFFIX) +STRESS_NG_DIR := $(BUILDDIR)/$(STRESS_NG) +STRESS_NG_LICENSE := GPL-2.0+ + +# +# Prepare +# + +STRESS_NG_CONF_TOOL:= NO + +# +# Compile +# + +STRESS_NG_MAKE_ENV := $(CROSS_ENV) + +# +# Target-Install +# + +$(STATEDIR)/stress-ng.targetinstall: + @$(call targetinfo) + + @$(call install_init, stress-ng) + @$(call install_fixup, stress-ng,PRIORITY,optional) + @$(call install_fixup, stress-ng,SECTION,base) + @$(call install_fixup, stress-ng,AUTHOR,"Jan Luebbe <j...@pengutronix.de>") + @$(call install_fixup, stress-ng,DESCRIPTION,missing) + + @$(call install_copy, stress-ng, 0, 0, 0755, -, /usr/bin/stress-ng) + + @$(call install_finish, stress-ng) + + @$(call touch) -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] valgrind: don't use the host mpicc to build target libraries
Otherwise, valgrind builds a libmpiwrap-arm-linux.so for the host architecture when mpicc is found. Signed-off-by: Jan Luebbe <j...@pengutronix.de> --- rules/valgrind.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/valgrind.make b/rules/valgrind.make index 30ce223f96e9..afb7fabfb4b1 100644 --- a/rules/valgrind.make +++ b/rules/valgrind.make @@ -60,6 +60,7 @@ endif VALGRIND_CONF_TOOL := autoconf VALGRIND_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --without-mpicc \ --enable-tls # -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] krb5: add MIT Kerberos package
This adds a package for the krb5 Kerberos implementation. The tools and admin libraries (which are not required for servers) are only installed when requested. Signed-off-by: Jan Luebbe <j...@pengutronix.de> --- rules/krb5.in | 38 + rules/krb5.make | 129 2 files changed, 167 insertions(+) create mode 100644 rules/krb5.in create mode 100644 rules/krb5.make diff --git a/rules/krb5.in b/rules/krb5.in new file mode 100644 index ..2af9d2e0e3ad --- /dev/null +++ b/rules/krb5.in @@ -0,0 +1,38 @@ +## SECTION=security + +menuconfig KRB5 + tristate + select HOST_E2FSPROGS + select E2FSPROGS + select E2FSPROGS_LIBCOM_ERR + select E2FSPROGS_LIBSS + select OPENSSL + select LIBEDIT + select KEYUTILS if KRB5_CLIENT_TOOLS + prompt "Kerberos" + help + This is the MIT implementation of the Kerberos network authentication + protocol. + +if KRB5 + +config KRB5_ADMIN_LIBS + bool + prompt "enable admin libraries (libkadm5clnt & libkadm5srv)" + +config KRB5_CLIENT_TOOLS + bool + prompt "enable client tools" + +config KRB5_ADMIN_TOOLS + bool + select KRB5_ADMIN_LIBS + prompt "enable admin tools (kinit & kadmin)" + +config KRB5_EXAMPLES + bool + prompt "enable example tools" + help + This installs gss-client, gss-server, sclient and sserver. + +endif diff --git a/rules/krb5.make b/rules/krb5.make new file mode 100644 index ..a47907e39022 --- /dev/null +++ b/rules/krb5.make @@ -0,0 +1,129 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Jan Luebbe <j...@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_KRB5) += krb5 + +# +# Paths and names +# +KRB5_VERSION := 1.15.2 +KRB5_MD5 := b160f72161c730897dc7689f876b6e2a +KRB5 := krb5-$(KRB5_VERSION) +KRB5_SUFFIX:= tar.gz +KRB5_URL := https://web.mit.edu/kerberos/dist/krb5/1.15/$(KRB5).$(KRB5_SUFFIX) +KRB5_SOURCE:= $(SRCDIR)/$(KRB5).$(KRB5_SUFFIX) +KRB5_DIR := $(BUILDDIR)/$(KRB5) +KRB5_LICENSE := MIT + +KRB5_SUBDIR:= src + +# +# Prepare +# + +# keyutils is only useful for the client case + +KRB5_PATH := PATH=$(CROSS_PATH) +KRB5_CONF_ENV := \ + $(CROSS_ENV) \ + krb5_cv_attr_constructor_destructor=yes,yes \ + ac_cv_func_regcomp=yes \ + ac_cv_printf_positional=yes \ + ac_cv_file__etc_environment=yes \ + ac_cv_file__etc_TIMEZONE=no \ + ac_cv_header_keyutils_h=$(call ptx/ifdef, PTXCONF_KRB5_CLIENT_TOOLS, yes, no) + +# +# autoconf +# +KRB5_CONF_TOOL := autoconf +KRB5_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-dns-for-realm \ + --enable-delayed-initialization \ + --enable-thread-support \ + --disable-rpath \ + --disable-athena \ + --disable-audit-plugin \ + --enable-kdc-lookaside-cache \ + --disable-asan \ + --enable-pkinit \ + --without-size-optimizations \ + --with-system-et \ + --with-system-ss \ + --without-system-db \ + --without-netlib \ + --without-hesiod \ + --without-ldap \ + --without-tcl \ + --without-vague-errors \ + --with-crypto-impl=openssl \ + --with-prng-alg=fortuna \ + --with-pkinit-crypto-impl=openssl \ + --with-tls-impl=openssl \ + --with-libedit \ + --without-readline \ + --without-system-verto + +# +# Target-Install +# + +$(STATEDIR)/krb5.targetinstall: + @$(call targetinfo) + + @$(call install_init, krb5) + @$(call install_fixup, krb5,PRIORITY,optional) + @$(call install_fixup, krb5,SECTION,base) + @$(call install_fixup, krb5,AUTHOR,"Jan Luebbe <j...@pengutronix.de>") + @$(call install_fixup, krb5,DESCRIPTION,missing) + + @$(call install_lib, krb5, 0, 0, 0644, libgssapi_krb5) + @$(call install_lib, krb5, 0, 0, 0644, libgssrpc) + @$(call install_lib, krb5, 0, 0, 0644, libk5crypto) + @$(call install_lib, krb5, 0, 0, 0644, libkdb5) + @$(call install_lib, krb5, 0, 0, 0644, libkrb5) + @$(call install_lib, krb5, 0, 0, 0644, libkrb5support) + +ifdef PTXCONF_KRB5_ADMIN_LIBS + @$(call install_lib, krb5, 0, 0, 0644, libkadm5clnt_mit) + @$(call install_lib, krb5, 0, 0, 0644, libkadm5srv_mit) +endif + +ifdef PTXCONF_
[ptxdist] [PATCH 2/2] krb5: add MIT Kerberos package
This adds a package for the krb5 Kerberos implementation. The tools and admin libraries (which are not required for servers) are only installed when requested. Signed-off-by: Jan Luebbe <j...@pengutronix.de> --- rules/krb5.in | 37 + rules/krb5.make | 126 2 files changed, 163 insertions(+) create mode 100644 rules/krb5.in create mode 100644 rules/krb5.make diff --git a/rules/krb5.in b/rules/krb5.in new file mode 100644 index ..c07edcbd0f35 --- /dev/null +++ b/rules/krb5.in @@ -0,0 +1,37 @@ +## SECTION=security + +menuconfig KRB5 + tristate + select HOST_E2FSPROGS + select E2FSPROGS + select E2FSPROGS_LIBCOM_ERR + select E2FSPROGS_LIBSS + select OPENSSL + select LIBEDIT + prompt "Kerberos" + help + This is the MIT implementation of the Kerberos network authentication + protocol. + +if KRB5 + +config KRB5_ADMIN_LIBS + bool + prompt "enable admin libraries (libkadm5clnt & libkadm5srv)" + +config KRB5_CLIENT_TOOLS + bool + prompt "enable client tools" + +config KRB5_ADMIN_TOOLS + bool + select KRB5_ADMIN_LIBS + prompt "enable admin tools (kinit & kadmin)" + +config KRB5_EXAMPLES + bool + prompt "enable example tools" + help + This installs gss-client, gss-server, sclient and sserver. + +endif diff --git a/rules/krb5.make b/rules/krb5.make new file mode 100644 index ..c9dabfb087bc --- /dev/null +++ b/rules/krb5.make @@ -0,0 +1,126 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Jan Luebbe <j...@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_KRB5) += krb5 + +# +# Paths and names +# +KRB5_VERSION := 1.15.2 +KRB5_MD5 := b160f72161c730897dc7689f876b6e2a +KRB5 := krb5-$(KRB5_VERSION) +KRB5_SUFFIX:= tar.gz +KRB5_URL := https://web.mit.edu/kerberos/dist/krb5/1.15/$(KRB5).$(KRB5_SUFFIX) +KRB5_SOURCE:= $(SRCDIR)/$(KRB5).$(KRB5_SUFFIX) +KRB5_DIR := $(BUILDDIR)/$(KRB5) +KRB5_LICENSE := MIT + +KRB5_SUBDIR:= src + +# +# Prepare +# + +KRB5_PATH := PATH=$(CROSS_PATH) +KRB5_CONF_ENV := \ + $(CROSS_ENV) \ + krb5_cv_attr_constructor_destructor=yes,yes \ + ac_cv_func_regcomp=yes \ + ac_cv_printf_positional=yes \ + ac_cv_file__etc_environment=yes \ + ac_cv_file__etc_TIMEZONE=no + +# +# autoconf +# +KRB5_CONF_TOOL := autoconf +KRB5_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-dns-for-realm \ + --enable-delayed-initialization \ + --enable-thread-support \ + --disable-rpath \ + --disable-athena \ + --disable-audit-plugin \ + --enable-kdc-lookaside-cache \ + --disable-asan \ + --enable-pkinit \ + --without-size-optimizations \ + --with-system-et \ + --with-system-ss \ + --without-system-db \ + --without-netlib \ + --without-hesiod \ + --without-ldap \ + --without-tcl \ + --without-vague-errors \ + --with-crypto-impl=openssl \ + --with-prng-alg=fortuna \ + --with-pkinit-crypto-impl=openssl \ + --with-tls-impl=openssl \ + --with-libedit \ + --without-readline \ + --without-system-verto + +# +# Target-Install +# + +$(STATEDIR)/krb5.targetinstall: + @$(call targetinfo) + + @$(call install_init, krb5) + @$(call install_fixup, krb5,PRIORITY,optional) + @$(call install_fixup, krb5,SECTION,base) + @$(call install_fixup, krb5,AUTHOR,"Jan Luebbe <j...@pengutronix.de>") + @$(call install_fixup, krb5,DESCRIPTION,missing) + + @$(call install_lib, krb5, 0, 0, 0644, libgssapi_krb5) + @$(call install_lib, krb5, 0, 0, 0644, libgssrpc) + @$(call install_lib, krb5, 0, 0, 0644, libk5crypto) + @$(call install_lib, krb5, 0, 0, 0644, libkdb5) + @$(call install_lib, krb5, 0, 0, 0644, libkrb5) + @$(call install_lib, krb5, 0, 0, 0644, libkrb5support) + +ifdef PTXCONF_KRB5_ADMIN_LIBS + @$(call install_lib, krb5, 0, 0, 0644, libkadm5clnt_mit) + @$(call install_lib, krb5, 0, 0, 0644, libkadm5srv_mit) +endif + +ifdef PTXCONF_KRB5_CLIENT_TOOLS + @$(call install_copy, krb5, 0, 0, 0755, -, /usr/bin/kdestroy) + @$(call install_copy, krb5, 0, 0, 0755, -, /usr/bin/klist) + @$(call install_copy,
[ptxdist] [PATCH 1/2] e2fsprogs: install headers and host tools
The compile_et and mk_cmds helpers are needed to generate code during compilation. Signed-off-by: Jan Luebbe <j...@pengutronix.de> --- rules/e2fsprogs.make | 2 +- rules/host-e2fsprogs.make | 14 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 0b0a81668dd4..48806973beb9 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -73,7 +73,7 @@ E2FSPROGS_CONF_OPT:= \ --without-included-gettext E2FSPROGS_MAKE_OPT := $(if $(filter 1,$(strip $(PTXDIST_VERBOSE))),V=1) -E2FSPROGS_INSTALL_OPT := install +E2FSPROGS_INSTALL_OPT := install install-libs # # Target-Install diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make index c19b7b954b40..4c25cd9e2cb0 100644 --- a/rules/host-e2fsprogs.make +++ b/rules/host-e2fsprogs.make @@ -59,3 +59,17 @@ HOST_E2FSPROGS_CONF_OPT := \ # vim: syntax=make +# +# Install +# + +HOST_E2FSPROGS_INSTALL_OPT := install install-libs + +$(STATEDIR)/host-e2fsprogs.install.post: + @$(call targetinfo) + @$(call world/install.post, HOST_E2FSPROGS) + @sed -i -e 's,/share,$(PTXCONF_SYSROOT_HOST)/share,' \ + $(PTXCONF_SYSROOT_HOST)/bin/compile_et + @sed -i -e 's,/share,$(PTXCONF_SYSROOT_HOST)/share,' \ + $(PTXCONF_SYSROOT_HOST)/bin/mk_cmds + @$(call touch) -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] lldpd: bump version to 0.9.8
JSON support is now built-in, so drop the JSON_C dependency. Signed-off-by: Jan Luebbe <j...@pengutronix.de> --- rules/lldpd.in | 1 - rules/lldpd.make | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rules/lldpd.in b/rules/lldpd.in index 75a5fce4bc76..abe6f35c809c 100644 --- a/rules/lldpd.in +++ b/rules/lldpd.in @@ -9,7 +9,6 @@ menuconfig LLDPD select READLINE select NET_SNMP if LLDPD_SNMP select NET_SNMP_MIB_MODULES_AGENTX if LLDPD_SNMP - select JSON_C if LLDPD_JSON select LIBXML2 if LLDPD_XML select LIBXML2_WRITER if LLDPD_XML select BUSYBOX_START_STOP_DAEMON if LLDPD_STARTSCRIPT diff --git a/rules/lldpd.make b/rules/lldpd.make index 3cb6393e7e36..21df78018574 100644 --- a/rules/lldpd.make +++ b/rules/lldpd.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LLDPD) += lldpd # # Paths and names # -LLDPD_VERSION := 0.9.2 -LLDPD_MD5 := b809887bc927fb558fd5dd64b6c0a494 +LLDPD_VERSION := 0.9.8 +LLDPD_MD5 := 8809600492f6b73149eb19158e819c1f LLDPD := lldpd-$(LLDPD_VERSION) LLDPD_SUFFIX := tar.gz LLDPD_URL := http://media.luffy.cx/files/lldpd//$(LLDPD).$(LLDPD_SUFFIX) @@ -44,7 +44,6 @@ LLDPD_CONF_OPT:= $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_LLDPD_CUSTOM_TLV)-custom \ --$(call ptx/endis, PTXCONF_LLDPD_OLDIES)-oldies \ --$(call ptx/wwo, PTXCONF_LLDPD_SNMP)-snmp \ - --$(call ptx/wwo, PTXCONF_LLDPD_JSON)-json \ --$(call ptx/wwo, PTXCONF_LLDPD_XML)-xml \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-privsep-user="$(PTXCONF_LLDPD_PRIVSEP_USER)" \ -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] ntp: add option to install ntptime
Signed-off-by: Jan Luebbe <j...@pengutronix.de> --- rules/ntp.in | 8 rules/ntp.make | 8 2 files changed, 16 insertions(+) diff --git a/rules/ntp.in b/rules/ntp.in index dc244a1c9857..b8fdca23ebef 100644 --- a/rules/ntp.in +++ b/rules/ntp.in @@ -260,6 +260,14 @@ config NTP_NTPQ The ntpq utility program is used to monitor NTP daemon ntpd operations and determine performance. +config NTP_NTPTIME + bool + prompt "install ntptime" + depends on NTP + help + The ntptime utility program is used to read the kernel's NTP time + variables. + endif comment "NTP conflicts with OpenNTPD" diff --git a/rules/ntp.make b/rules/ntp.make index 1f7bc3eae69c..3a9677aa1ed7 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -366,6 +366,14 @@ ifdef PTXCONF_NTP_NTPQ endif # # +# # ntptime +# # +ifdef PTXCONF_NTP_NTPTIME + @$(call install_copy, ntp, 0, 0, 0755, -, \ + /usr/sbin/ntptime) +endif + +# # # # other dirs # # @$(call install_copy, ntp, 0, 0, 0755, /var/log/ntpstats) -- 2.1.4 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] strongswan: update to 5.0.4
The security bug fixed in 5.0.4 affected only the openssl plugin, which is disabled in this package. --- rules/strongswan.make | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/rules/strongswan.make b/rules/strongswan.make index 31b7221..6401832 100644 --- a/rules/strongswan.make +++ b/rules/strongswan.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_STRONGSWAN) += strongswan # # Paths and names # -STRONGSWAN_VERSION := 5.0.2 -STRONGSWAN_MD5 := 77dc16443fd141f46183d3a4f60986ef +STRONGSWAN_VERSION := 5.0.4 +STRONGSWAN_MD5 := 0ab0397b44b197febfd0f89148344035 STRONGSWAN := strongswan-$(STRONGSWAN_VERSION) STRONGSWAN_SUFFIX := tar.bz2 STRONGSWAN_URL := http://download.strongswan.org/$(STRONGSWAN).$(STRONGSWAN_SUFFIX) @@ -34,6 +34,7 @@ STRONGSWAN_CONF_TOOL := autoconf STRONGSWAN_CONF_OPT:= \ $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_STRONGSWAN_LIBCURL)-curl \ + --disable-unbound \ --disable-soup \ --disable-ldap \ --enable-aes \ @@ -57,6 +58,7 @@ STRONGSWAN_CONF_OPT := \ --enable-pkcs8 \ --enable-pgp \ --enable-dnskey \ + --disable-ipseckey \ --enable-pem \ --enable-hmac \ --enable-cmac \ @@ -95,6 +97,7 @@ STRONGSWAN_CONF_OPT := \ --enable-xauth-generic \ --disable-xauth-eap \ --disable-xauth-pam \ + --disable-xauth-noauth \ --disable-tnc-ifmap \ --disable-tnc-pdp \ --disable-tnc-imc \ @@ -146,7 +149,7 @@ STRONGSWAN_CONF_OPT := \ --disable-addrblock \ --disable-unity \ --disable-uci \ - --disable-android \ + --disable-android-dns \ --disable-android-log \ --disable-maemo \ --disable-nm \ @@ -155,6 +158,7 @@ STRONGSWAN_CONF_OPT := \ --disable-lookip \ --disable-error-notify \ --disable-certexpire \ + --disable-systime-fix \ --disable-led \ --disable-duplicheck \ --disable-coupling \ @@ -162,6 +166,9 @@ STRONGSWAN_CONF_OPT := \ --disable-vstr \ --disable-monolithic \ --disable-bfd-backtraces \ + --disable-unit-tests \ + --disable-tkm \ + --disable-defaults \ --enable-dependency-tracking \ --enable-shared \ --disable-static \ -- 1.7.10.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] libkmod: avoid calling syscall() with -1
This fixes an illegal instruction error on qemu ARM.
Signed-off-by: Jan Luebbe j...@pengutronix.de
---
...0001-libkmod-Avoid-calling-syscall-with-1.patch | 32
patches/kmod-13/series |4 +++
2 files changed, 36 insertions(+)
create mode 100644
patches/kmod-13/0001-libkmod-Avoid-calling-syscall-with-1.patch
create mode 100644 patches/kmod-13/series
diff --git a/patches/kmod-13/0001-libkmod-Avoid-calling-syscall-with-1.patch
b/patches/kmod-13/0001-libkmod-Avoid-calling-syscall-with-1.patch
new file mode 100644
index 000..bfeaf34
--- /dev/null
+++ b/patches/kmod-13/0001-libkmod-Avoid-calling-syscall-with-1.patch
@@ -0,0 +1,32 @@
+From: Jan Luebbe j...@pengutronix.de
+Date: Thu, 2 May 2013 16:40:22 +0200
+Subject: [PATCH] libkmod: Avoid calling syscall() with -1
+
+At least in qemu 1.4.1 for vexpress/arm-cortexa9, this resulted in an
+illegal instruction error. Solve that by returning an error when
+__NR_finit_module is -1.
+---
+ libkmod/missing.h |9 -
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/libkmod/missing.h b/libkmod/missing.h
+index edb88b9..ac24a35 100644
+--- a/libkmod/missing.h
b/libkmod/missing.h
+@@ -20,8 +20,15 @@
+ #endif
+
+ #ifndef HAVE_FINIT_MODULE
++#include errno.h
++
+ static inline int finit_module(int fd, const char *uargs, int flags)
+ {
+- return syscall(__NR_finit_module, fd, uargs, flags);
++ if (__NR_finit_module == -1) {
++ errno = ENOSYS;
++ return -1;
++ } else {
++ return syscall(__NR_finit_module, fd, uargs, flags);
++ }
+ }
+ #endif
diff --git a/patches/kmod-13/series b/patches/kmod-13/series
new file mode 100644
index 000..8f9a8ac
--- /dev/null
+++ b/patches/kmod-13/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-libkmod-Avoid-calling-syscall-with-1.patch
+# 663dcc1cd4b4be9a3934dab348129c99 - git-ptx-patches magic
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libkmod: avoid calling syscall() with -1
On Thu, May 02, 2013 at 04:54:30PM +0200, Jan Luebbe wrote: This fixes an illegal instruction error on qemu ARM. Please do not apply this yet, there is still some discussion going on upstream: http://bugs.funtoo.org/browse/FL-534 http://thread.gmane.org/gmane.linux.kernel.modules/1061 Jan -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] libkmod: avoid calling syscall() with -1
This fixes an illegal instruction error on qemu ARM.
Signed-off-by: Jan Luebbe j...@pengutronix.de
---
It seems this patch has been applied upstream:
http://thread.gmane.org/gmane.linux.kernel.modules/1061/focus=1064
...ssing-Don-t-call-syscall-with-syscallno-1.patch | 40
patches/kmod-13/series |4 ++
2 files changed, 44 insertions(+)
create mode 100644
patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch
create mode 100644 patches/kmod-13/series
diff --git
a/patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch
b/patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch
new file mode 100644
index 000..a385d63
--- /dev/null
+++ b/patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch
@@ -0,0 +1,40 @@
+From: Lucas De Marchi lucas.de.mar...@gmail.com
+Date: Thu, 2 May 2013 13:22:57 -0300
+Subject: [PATCH] missing: Don't call syscall() with syscallno == -1
+
+Reported-by: Jean-Francis Roy jeanfran...@funtoo.org
+Reported-by: Jan Luebbe j...@pengutronix.de
+---
+ libkmod/missing.h | 10 ++
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/libkmod/missing.h b/libkmod/missing.h
+index edb88b9..b31af84 100644
+--- a/libkmod/missing.h
b/libkmod/missing.h
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include errno.h
+ #include unistd.h
+ #include sys/syscall.h
+
+@@ -15,13 +16,14 @@
+ # define MODULE_INIT_IGNORE_VERMAGIC 2
+ #endif
+
+-#ifndef __NR_finit_module
+-# define __NR_finit_module -1
+-#endif
+-
+ #ifndef HAVE_FINIT_MODULE
+ static inline int finit_module(int fd, const char *uargs, int flags)
+ {
++#ifndef __NR_finit_module
++ errno = ENOSYS;
++ return -1;
++#else
+ return syscall(__NR_finit_module, fd, uargs, flags);
++#endif
+ }
+ #endif
diff --git a/patches/kmod-13/series b/patches/kmod-13/series
new file mode 100644
index 000..3fc301f
--- /dev/null
+++ b/patches/kmod-13/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-missing-Don-t-call-syscall-with-syscallno-1.patch
+# 0b7413dd7632441bc24225859a7d1866 - git-ptx-patches magic
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] dhcp client: comment out example options in dhclient.conf
The options are only intended as an example and should not be used
unmodified.
Signed-off-by: Jan Luebbe j...@pengutronix.de
---
generic/etc/dhclient.conf | 64 ++---
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/generic/etc/dhclient.conf b/generic/etc/dhclient.conf
index 147e004..6a994e6 100644
--- a/generic/etc/dhclient.conf
+++ b/generic/etc/dhclient.conf
@@ -1,36 +1,36 @@
-send host-name andare.fugue.com;
-send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
-send dhcp-lease-time 3600;
-supersede domain-name fugue.com home.vix.com;
-prepend domain-name-servers 127.0.0.1;
+#send host-name andare.fugue.com;
+#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
+#send dhcp-lease-time 3600;
+#supersede domain-name fugue.com home.vix.com;
+#prepend domain-name-servers 127.0.0.1;
request subnet-mask, broadcast-address, time-offset, routers,
domain-name, domain-name-servers, host-name;
-require subnet-mask, domain-name-servers;
-timeout 60;
-retry 60;
-reboot 10;
-select-timeout 5;
-initial-interval 2;
-script /etc/dhclient-script;
-media -link0 -link1 -link2, link0 link1;
-reject 192.33.137.209;
+#require subnet-mask, domain-name-servers;
+#timeout 60;
+#retry 60;
+#reboot 10;
+#select-timeout 5;
+#initial-interval 2;
+#script /etc/dhclient-script;
+#media -link0 -link1 -link2, link0 link1;
+#reject 192.33.137.209;
-alias {
- interface ep0;
- fixed-address 192.5.5.213;
- option subnet-mask 255.255.255.255;
-}
+#alias {
+# interface ep0;
+# fixed-address 192.5.5.213;
+# option subnet-mask 255.255.255.255;
+#}
-lease {
- interface ep0;
- fixed-address 192.33.137.200;
- medium link0 link1;
- option host-name andare.swiftmedia.com;
- option subnet-mask 255.255.255.0;
- option broadcast-address 192.33.137.255;
- option routers 192.33.137.250;
- option domain-name-servers 127.0.0.1;
- renew 2 2000/1/12 00:00:01;
- rebind 2 2000/1/12 00:00:01;
- expire 2 2000/1/12 00:00:01;
-}
+#lease {
+# interface ep0;
+# fixed-address 192.33.137.200;
+# medium link0 link1;
+# option host-name andare.swiftmedia.com;
+# option subnet-mask 255.255.255.0;
+# option broadcast-address 192.33.137.255;
+# option routers 192.33.137.250;
+# option domain-name-servers 127.0.0.1;
+# renew 2 2000/1/12 00:00:01;
+# rebind 2 2000/1/12 00:00:01;
+# expire 2 2000/1/12 00:00:01;
+#}
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] scripts: ptxd_make_get: change wording
Signed-off-by: Jan Luebbe j...@pengutronix.de
---
scripts/lib/ptxd_make_get.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
index cfba045..1e70034 100644
--- a/scripts/lib/ptxd_make_get.sh
+++ b/scripts/lib/ptxd_make_get.sh
@@ -225,7 +225,7 @@ ptxd_make_get() {
done
echo
- echo Could not download packet
+ echo Could not download package
echo URL: ${orig_argv[@]}
echo
exit 1
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] gtk: depend on required cairo backends
Signed-off-by: Jan Luebbe j...@pengutronix.de --- rules/gtk.in |3 +++ 1 file changed, 3 insertions(+) diff --git a/rules/gtk.in b/rules/gtk.in index c8b2e4c..3500aa6 100644 --- a/rules/gtk.in +++ b/rules/gtk.in @@ -9,6 +9,9 @@ menuconfig GTK select ATK select PANGO select CAIRO + select CAIRO_PDF + select CAIRO_PS + select CAIRO_SVG select CAIRO_GOBJECT select GDK_PIXBUF -- 1.7.10.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] libffi: install header files to /usr/include
Signed-off-by: Jan Luebbe j...@pengutronix.de
---
patches/libffi-3.0.11/0001-fix-powerpc-case.patch | 16
...der-files-to-includedir-and-adjust-libffi.patch | 39
patches/libffi-3.0.11/autogen.sh |6 +++
patches/libffi-3.0.11/series |4 ++
rules/libffi.make |1 -
5 files changed, 58 insertions(+), 8 deletions(-)
create mode 100644
patches/libffi-3.0.11/0002-install-header-files-to-includedir-and-adjust-libffi.patch
create mode 100755 patches/libffi-3.0.11/autogen.sh
diff --git a/patches/libffi-3.0.11/0001-fix-powerpc-case.patch
b/patches/libffi-3.0.11/0001-fix-powerpc-case.patch
index c596c83..4c5ce2c 100644
--- a/patches/libffi-3.0.11/0001-fix-powerpc-case.patch
+++ b/patches/libffi-3.0.11/0001-fix-powerpc-case.patch
@@ -1,4 +1,6 @@
-libffi: fix duplicate case on powerpc 32 bit
+From: Robert Schwebel r.schwe...@pengutronix.de
+Date: Thu, 14 Jun 2012 11:44:29 +0200
+Subject: [PATCH] libffi: fix duplicate case on powerpc 32 bit
Without this fix, gcc complains about a duplicate case value:
@@ -6,17 +8,17 @@ Without this fix, gcc complains about a duplicate case value:
../src/powerpc/ffi.c:670:5: error: duplicate case value
../src/powerpc/ffi.c:667:5: error: previously used here
+rsc: submitted as http://sourceware.org/ml/libffi-discuss/2012/msg00201.html
+
Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de
---
-# rsc: submitted as http://sourceware.org/ml/libffi-discuss/2012/msg00201.html
-
src/powerpc/ffi.c |2 ++
1 file changed, 2 insertions(+)
-Index: libffi-3.0.11/src/powerpc/ffi.c
-===
libffi-3.0.11.orig/src/powerpc/ffi.c
-+++ libffi-3.0.11/src/powerpc/ffi.c
+diff --git a/src/powerpc/ffi.c b/src/powerpc/ffi.c
+index baca694..257f02f 100644
+--- a/src/powerpc/ffi.c
b/src/powerpc/ffi.c
@@ -664,9 +664,11 @@ ffi_prep_cif_machdep (ffi_cif *cif)
switch (type)
{
diff --git
a/patches/libffi-3.0.11/0002-install-header-files-to-includedir-and-adjust-libffi.patch
b/patches/libffi-3.0.11/0002-install-header-files-to-includedir-and-adjust-libffi.patch
new file mode 100644
index 000..71bb537
--- /dev/null
+++
b/patches/libffi-3.0.11/0002-install-header-files-to-includedir-and-adjust-libffi.patch
@@ -0,0 +1,39 @@
+From: Jan Luebbe j...@pengutronix.de
+Date: Mon, 22 Oct 2012 18:25:03 +0200
+Subject: [PATCH] install header files to @includedir@ and adjust libffi.pc.in
+
+Signed-off-by: Jan Luebbe j...@pengutronix.de
+---
+ include/Makefile.am |2 +-
+ libffi.pc.in|6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/Makefile.am b/include/Makefile.am
+index fd28024..15301d6 100644
+--- a/include/Makefile.am
b/include/Makefile.am
+@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
+ DISTCLEANFILES=ffitarget.h
+ EXTRA_DIST=ffi.h.in ffi_common.h
+
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+diff --git a/libffi.pc.in b/libffi.pc.in
+index c2e1c7b..684ec32 100644
+--- a/libffi.pc.in
b/libffi.pc.in
+@@ -1,10 +1,10 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=@includedir@
+
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lffi
+-Cflags: -I${includedir}
++Libs: -lffi
++Cflags:
diff --git a/patches/libffi-3.0.11/autogen.sh b/patches/libffi-3.0.11/autogen.sh
new file mode 100755
index 000..0244c91
--- /dev/null
+++ b/patches/libffi-3.0.11/autogen.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+automake
+
diff --git a/patches/libffi-3.0.11/series b/patches/libffi-3.0.11/series
index 0bc570c..08fb64c 100644
--- a/patches/libffi-3.0.11/series
+++ b/patches/libffi-3.0.11/series
@@ -1 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
0001-fix-powerpc-case.patch
+0002-install-header-files-to-includedir-and-adjust-libffi.patch
+# 6a4e3935931e0b0433da3a0f41888342 - git-ptx-patches magic
diff --git a/rules/libffi.make b/rules/libffi.make
index d7bfd53..ddfb35a 100644
--- a/rules/libffi.make
+++ b/rules/libffi.make
@@ -41,7 +41,6 @@ LIBFFI_CONF_TOOL := autoconf
$(STATEDIR)/libffi.install:
@$(call targetinfo)
@$(call install, LIBFFI)
- mv $(LIBFFI_PKGDIR)/usr/lib/$(LIBFFI)/include/*
$(LIBFFI_PKGDIR)/usr/include
@$(call touch)
#
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] barebox: support new location of barebox_default_env
Since barebox v2012.10.0, barebox_default_env has moved to common/. Signed-off-by: Jan Luebbe j...@pengutronix.de --- rules/barebox.make |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rules/barebox.make b/rules/barebox.make index d16abda..ae00503 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -125,7 +125,11 @@ ifdef PTXCONF_BAREBOX_BAREBOXENV @$(call install_finish, barebox) endif @install -D -m644 $(BAREBOX_DIR)/barebox.bin $(IMAGEDIR)/barebox-image - @install -D -m644 $(BAREBOX_DIR)/barebox_default_env $(IMAGEDIR)/barebox-default-environment + @if [ -e $(BAREBOX_DIR)/common/barebox_default_env ]; then \ + install -D -m644 $(BAREBOX_DIR)/common/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \ + else \ + install -D -m644 $(BAREBOX_DIR)/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \ + fi @$(call touch) # -- 1.7.10.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] busybox: add patch to fix -Wformat-security problem
Signed-off-by: Jan Luebbe j...@pengutronix.de
---
.../0001-reactivate-check-for-tty.patch|1 -
.../0002-Fix-compilation-on-Darwin.patch |1 -
...mat-warning-when-building-applets-usage_p.patch | 27
patches/busybox-1.20.1/series |3 ++-
4 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644
patches/busybox-1.20.1/0003-Fix-the-format-warning-when-building-applets-usage_p.patch
diff --git a/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch
b/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch
index 186aa57..a44f6b6 100644
--- a/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch
+++ b/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch
@@ -1,4 +1,3 @@
-From 1bfae474d5bde25836fa996506f89018d6fbd6e1 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde m...@pengutronix.de
Date: Fri, 6 Nov 2009 09:19:58 +0100
Subject: [PATCH] reactivate check for tty
diff --git a/patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch
b/patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch
index 031a84f..a6a6d78 100644
--- a/patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch
+++ b/patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch
@@ -1,4 +1,3 @@
-From 6b464e669163eee0fc71b57ba3530df812736541 Mon Sep 17 00:00:00 2001
From: Bernhard Walle bernh...@bwalle.de
Date: Wed, 13 Jun 2012 21:44:46 +0200
Subject: [PATCH] Fix compilation on Darwin
diff --git
a/patches/busybox-1.20.1/0003-Fix-the-format-warning-when-building-applets-usage_p.patch
b/patches/busybox-1.20.1/0003-Fix-the-format-warning-when-building-applets-usage_p.patch
new file mode 100644
index 000..8c0b36a
--- /dev/null
+++
b/patches/busybox-1.20.1/0003-Fix-the-format-warning-when-building-applets-usage_p.patch
@@ -0,0 +1,27 @@
+From: Dinny Wu dinny...@gmail.com
+Date: Thu, 26 Jul 2012 14:12:51 +
+Subject: [PATCH] Fix the format warning when building applets/usage_pod.c
+
+When compiling busybox with gcc 4.6.3, it shows below warning:
+
+applets/usage_pod.c: In function ‘main’:
+applets/usage_pod.c:74:3: warning: format not a string literal and no format
arguments [-Wformat-security]
+
+Signed-off-by: Dinny Wu dinny...@gmail.com
+---
+ applets/usage_pod.c |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/usage_pod.c b/applets/usage_pod.c
+index 0b1c4aa..a67e8b4 100644
+--- a/applets/usage_pod.c
b/applets/usage_pod.c
+@@ -71,7 +71,7 @@ int main(void)
+ } else {
+ printf(, );
+ }
+- printf(usage_array[i].aname);
++ printf(%s, usage_array[i].aname);
+ col += len2;
+ }
+ printf(\n\n);
diff --git a/patches/busybox-1.20.1/series b/patches/busybox-1.20.1/series
index 4c4504b..0404eac 100644
--- a/patches/busybox-1.20.1/series
+++ b/patches/busybox-1.20.1/series
@@ -2,4 +2,5 @@
#tag:base --start-number 1
0001-reactivate-check-for-tty.patch
0002-Fix-compilation-on-Darwin.patch
-# 0f71f4e1223df5ecf36d97b5851e1c4c - git-ptx-patches magic
+0003-Fix-the-format-warning-when-building-applets-usage_p.patch
+# 5f3f3ac2bf84d7c201d42388a92d64f8 - git-ptx-patches magic
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] rootfs: support for symlink resolv.conf to /run
This allows using NetworkManager on a read-only root FS. Signed-off-by: Jan Luebbe j...@pengutronix.de --- rules/rootfs.in |8 rules/rootfs.make |3 +++ 2 files changed, 11 insertions(+) diff --git a/rules/rootfs.in b/rules/rootfs.in index 179e331..c36a79a 100644 --- a/rules/rootfs.in +++ b/rules/rootfs.in @@ -407,6 +407,14 @@ choice help If enabled, it installs /etc/resolv.conf as a link to /proc/net/pnp. + config ROOTFS_RESOLV_RUN + bool + prompt link to /run/resolv.conf + help + If enabled, it installs /etc/resolv.conf as a link to + /run/resolv.conf. This is useful if the root filesystem is mounted + read-only. + config ROOTFS_RESOLV_NONE bool prompt none diff --git a/rules/rootfs.make b/rules/rootfs.make index c60b840..4ba33d1 100644 --- a/rules/rootfs.make +++ b/rules/rootfs.make @@ -229,6 +229,9 @@ endif ifdef PTXCONF_ROOTFS_RESOLV_LINK @$(call install_link, rootfs, /proc/net/pnp, /etc/resolv.conf) endif +ifdef PTXCONF_ROOTFS_RESOLV_RUN + @$(call install_link, rootfs, /run/resolv.conf, /etc/resolv.conf) +endif ifdef PTXCONF_ROOTFS_SERVICES @$(call install_alternative, rootfs, 0, 0, 0644, /etc/services) endif -- 1.7.10.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] systemd: install systemd-vconsole-setup when needed
Signed-off-by: Jan Luebbe j...@pengutronix.de --- rules/systemd.make |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/systemd.make b/rules/systemd.make index 00f9a14..d9b85ed 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -127,7 +127,8 @@ SYSTEMD_HELPER := \ systemd-timedated \ systemd-timestamp \ systemd-update-utmp \ - systemd-user-sessions + systemd-user-sessions \ + $(call ptx/ifdef, PTXCONF_SYSTEMD_VCONSOLE,systemd-vconsole-setup,) $(STATEDIR)/systemd.targetinstall: @$(call targetinfo) -- 1.7.10.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] image-boot-mlo.in: select IMAGE_VFAT_TOOLS
It needs mkdosfs, which is built by selecting IMAGE_VFAT_TOOLS. Signed-off-by: Jan Luebbe j...@pengutronix.de --- platforms/image-boot-mlo.in |1 + 1 file changed, 1 insertion(+) diff --git a/platforms/image-boot-mlo.in b/platforms/image-boot-mlo.in index 5f9f428..a23591a 100644 --- a/platforms/image-boot-mlo.in +++ b/platforms/image-boot-mlo.in @@ -3,6 +3,7 @@ config IMAGE_BOOT_MLO tristate select HOST_GENIMAGE + select IMAGE_VFAT_TOOLS select U_BOOT select KERNEL prompt Generate images/boot-mlo.vfat -- 1.7.10.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] rsync3: support ACL and extended attributes
Signed-off-by: Jan Luebbe j...@pengutronix.de --- rules/rsync3.in | 13 + rules/rsync3.make |2 ++ 2 files changed, 15 insertions(+) diff --git a/rules/rsync3.in b/rules/rsync3.in index 4e1b6e7..b350c0e 100644 --- a/rules/rsync3.in +++ b/rules/rsync3.in @@ -3,6 +3,8 @@ menuconfig RSYNC3 tristate prompt rsync v3 select OPENSSH_SSH + select ACL if RSYNC3_ACL + select ATTR if RSYNC3_ATTR help rsync is a program that behaves in much the same way that rcp does, but has many more options and uses the rsync remote-update protocol to @@ -16,4 +18,15 @@ config RSYNC3_STARTSCRIPT default y prompt install /etc/init.d/rsync +config RSYNC3_ACL + bool + prompt enable ACL support + help + --disable-acl-support + +config RSYNC3_ATTR + bool + prompt enable extended attribute support + help + --enable-xattr-support endif diff --git a/rules/rsync3.make b/rules/rsync3.make index f3ac834..65826fe 100644 --- a/rules/rsync3.make +++ b/rules/rsync3.make @@ -39,6 +39,8 @@ RSYNC3_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_IPV6_OPTION) \ $(GLOBAL_LARGE_FILE_OPTION) \ + --$(call ptx/endis, PTXCONF_RSYNC3_ACL)-acl-support \ + --$(call ptx/endis, PTXCONF_RSYNC3_ATTR)-xattr-support \ --with-included-popt \ --disable-debug \ --disable-locale -- 1.7.10 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] rsync3: support ACL and extended attributes
Signed-off-by: Jan Luebbe j...@pengutronix.de --- rules/rsync3.in | 13 + rules/rsync3.make |2 ++ 2 files changed, 15 insertions(+) diff --git a/rules/rsync3.in b/rules/rsync3.in index 4e1b6e7..f01f294 100644 --- a/rules/rsync3.in +++ b/rules/rsync3.in @@ -3,6 +3,8 @@ menuconfig RSYNC3 tristate prompt rsync v3 select OPENSSH_SSH + select ACL if RSYNC3_ACL + select ATTR if RSYNC3_ATTR help rsync is a program that behaves in much the same way that rcp does, but has many more options and uses the rsync remote-update protocol to @@ -16,4 +18,15 @@ config RSYNC3_STARTSCRIPT default y prompt install /etc/init.d/rsync +config RSYNC3_ACL + bool + prompt enable ACL support + help + --enable-acl-support + +config RSYNC3_ATTR + bool + prompt enable extended attribute support + help + --enable-xattr-support endif diff --git a/rules/rsync3.make b/rules/rsync3.make index f3ac834..65826fe 100644 --- a/rules/rsync3.make +++ b/rules/rsync3.make @@ -39,6 +39,8 @@ RSYNC3_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_IPV6_OPTION) \ $(GLOBAL_LARGE_FILE_OPTION) \ + --$(call ptx/endis, PTXCONF_RSYNC3_ACL)-acl-support \ + --$(call ptx/endis, PTXCONF_RSYNC3_ATTR)-xattr-support \ --with-included-popt \ --disable-debug \ --disable-locale -- 1.7.10 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] template-kernel-make: use .tar.xz like the other kernel packages
Signed-off-by: Jan Luebbe j...@pengutronix.de --- rules/templates/template-kernel-make |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make index 92757c6..008c347 100644 --- a/rules/templates/template-kernel-make +++ b/rules/templates/template-kernel-make @@ -19,7 +19,7 @@ PACKAGES-$(PTXCONF_KERNEL_@PACKAGE@) += kernel-@package@ KERNEL_@PACKAGE@_VERSION := @VERSION@ KERNEL_@PACKAGE@_MD5 := KERNEL_@PACKAGE@ := linux-$(KERNEL_@PACKAGE@_VERSION) -KERNEL_@PACKAGE@_SUFFIX:= tar.bz2 +KERNEL_@PACKAGE@_SUFFIX:= tar.xz KERNEL_@PACKAGE@_DIR := $(BUILDDIR)/linux-@package@-$(KERNEL_@PACKAGE@_VERSION) KERNEL_@PACKAGE@_CONFIG:= $(PTXDIST_PLATFORMCONFIGDIR)/kernelconfig-@package@ KERNEL_@PACKAGE@_LICENSE := GPLv2 -- 1.7.10.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] networkmanager: update to release 0.9.4.0
Also include changes by Juergen Beisert j...@pengutronix.de
to correct configure options and the missing iptables dependency.
Signed-off-by: Jan Luebbe j...@pengutronix.de
---
rules/networkmanager.in |5 -
rules/networkmanager.make | 31 ---
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index 2c08fea..0397918 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -10,10 +10,13 @@ menuconfig NETWORKMANAGER
select DBUS_GLIB
select LIBNL
select LIBUUID
- select WPA_SUPPLICANT
+ select WPA_SUPPLICANT if RUNTIME
select GNUTLS
select HOST_INTLTOOL
select DBUS_PYTHON if NETWORKMANAGER_EXAMPLES
+ select IPTABLES
+# for the 'iptables' tool
+ select IPTABLES_IPV4
prompt networkmanager
help
NetworkManager is a tool to automate network configuration as far as
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 32d11ed..e9b38fd 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
#
# Paths and names
#
-NETWORKMANAGER_VERSION := 0.9.2.0
-NETWORKMANAGER_MD5 := d7dce01e97758253bc4ed81d7b86045f
+NETWORKMANAGER_VERSION := 0.9.4.0
+NETWORKMANAGER_MD5 := 66a54b51a4998c484613911b72a7e6ff
NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
NETWORKMANAGER_SUFFIX := tar.xz
NETWORKMANAGER_URL :=
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
@@ -48,7 +48,12 @@ NETWORKMANAGER_CONF_OPT := \
--without-docs \
--with-gnu-ld \
--with-crypto=gnutls \
- --with-distro=debian
+ --with-distro=debian \
+ --with-session-tracking=none \
+ --with-dhclient=/sbin/dhclient \
+ --with-dhcpcd=no \
+ --with-resolvconf=no \
+ --with-iptables=/usr/sbin/iptables
#
# Install
@@ -59,10 +64,16 @@ $(STATEDIR)/networkmanager.install:
@$(call world/install, NETWORKMANAGER)
ifdef PTXCONF_NETWORKMANAGER_EXAMPLES
- @cd $(NETWORKMANAGER_DIR)/examples/C/glib/ for FILE in `find -name
*-glib -printf '%f\n'`; do \
+ @cd $(NETWORKMANAGER_DIR)/examples/C/glib/ \
+for FILE in `find -name *-glib -printf '%f\n'`; do \
install -D -m 755 $${FILE}
$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}; \
done
- @cd $(NETWORKMANAGER_DIR)/examples/python/ for FILE in `find -name
*.py -printf '%f\n'`; do \
+ @cd $(NETWORKMANAGER_DIR)/examples/python/ \
+for FILE in `find -name *.py -printf '%f\n'`; do \
+ install -D -m 755 $${FILE}
$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}; \
+ done
+ @cd $(NETWORKMANAGER_DIR)/examples/shell/ \
+for FILE in `find -name *.sh -printf '%f\n'`; do \
install -D -m 755 $${FILE}
$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}; \
done
endif
@@ -126,10 +137,16 @@ endif
@$(call install_tree, networkmanager, 0, 0, -,
/usr/share/dbus-1/system-services/)
ifdef PTXCONF_NETWORKMANAGER_EXAMPLES
- @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ for FILE in `find -name
*-glib -printf '%f\n'`; do \
+ @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ \
+for FILE in `find -name *-glib -printf '%f\n'`; do \
+ $(call install_copy, networkmanager, 0, 0, 0755, -,
/usr/bin/$${FILE}); \
+ done
+ @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ \
+for FILE in `find -name *.py -printf '%f\n'`; do \
$(call install_copy, networkmanager, 0, 0, 0755, -,
/usr/bin/$${FILE}); \
done
- @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ for FILE in `find -name *.py
-printf '%f\n'`; do \
+ @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ \
+for FILE in `find -name *.sh -printf '%f\n'`; do \
$(call install_copy, networkmanager, 0, 0, 0755, -,
/usr/bin/$${FILE}); \
done
endif
--
1.7.10
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] e2fsprogs: update from 1.42 to 1.42.2
Signed-off-by: Jan Luebbe j...@pengutronix.de --- .../0001-Fixed-bitops.h-for-Coldfire-V4E.patch | 26 patches/e2fsprogs-1.42.2/series|4 +++ .../0001-Fixed-bitops.h-for-Coldfire-V4E.patch | 26 patches/e2fsprogs-1.42/series |4 --- rules/e2fsprogs.make |4 +-- 5 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 patches/e2fsprogs-1.42.2/0001-Fixed-bitops.h-for-Coldfire-V4E.patch create mode 100644 patches/e2fsprogs-1.42.2/series delete mode 100644 patches/e2fsprogs-1.42/0001-Fixed-bitops.h-for-Coldfire-V4E.patch delete mode 100644 patches/e2fsprogs-1.42/series diff --git a/patches/e2fsprogs-1.42.2/0001-Fixed-bitops.h-for-Coldfire-V4E.patch b/patches/e2fsprogs-1.42.2/0001-Fixed-bitops.h-for-Coldfire-V4E.patch new file mode 100644 index 000..f1bbd10 --- /dev/null +++ b/patches/e2fsprogs-1.42.2/0001-Fixed-bitops.h-for-Coldfire-V4E.patch @@ -0,0 +1,26 @@ +From: Carsten Schlote schl...@vahanus.net +Date: Tue, 11 Mar 2008 00:32:20 +0100 +Subject: [PATCH] Fixed bitops.h for Coldfire V4E + +Commented out assembly inline code for mc68020 or higher. +These mnemonics aren't available on Coldfire. Using C routines +now. + +Signed-off-by: Carsten Schlote schl...@vahanus.net +--- + lib/ext2fs/bitops.h |2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h +index 83a01e4..55c6782 100644 +--- a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h +@@ -336,7 +336,7 @@ _INLINE_ __u16 ext2fs_swab16(__u16 val) + #endif/* i386 */ + + #if ((defined __GNUC__) !defined(_EXT2_USE_C_VERSIONS_) \ +- (defined(__mc68000__))) ++ (defined(__mc68000__)) !defined(__mcoldfire__)) + + #define _EXT2_HAVE_ASM_BITOPS_ + diff --git a/patches/e2fsprogs-1.42.2/series b/patches/e2fsprogs-1.42.2/series new file mode 100644 index 000..355f846 --- /dev/null +++ b/patches/e2fsprogs-1.42.2/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Fixed-bitops.h-for-Coldfire-V4E.patch +# 51e935bcb2a32d87daadf80960d144b0 - git-ptx-patches magic diff --git a/patches/e2fsprogs-1.42/0001-Fixed-bitops.h-for-Coldfire-V4E.patch b/patches/e2fsprogs-1.42/0001-Fixed-bitops.h-for-Coldfire-V4E.patch deleted file mode 100644 index f1bbd10..000 --- a/patches/e2fsprogs-1.42/0001-Fixed-bitops.h-for-Coldfire-V4E.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Carsten Schlote schl...@vahanus.net -Date: Tue, 11 Mar 2008 00:32:20 +0100 -Subject: [PATCH] Fixed bitops.h for Coldfire V4E - -Commented out assembly inline code for mc68020 or higher. -These mnemonics aren't available on Coldfire. Using C routines -now. - -Signed-off-by: Carsten Schlote schl...@vahanus.net - lib/ext2fs/bitops.h |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h -index 83a01e4..55c6782 100644 a/lib/ext2fs/bitops.h -+++ b/lib/ext2fs/bitops.h -@@ -336,7 +336,7 @@ _INLINE_ __u16 ext2fs_swab16(__u16 val) - #endif/* i386 */ - - #if ((defined __GNUC__) !defined(_EXT2_USE_C_VERSIONS_) \ -- (defined(__mc68000__))) -+ (defined(__mc68000__)) !defined(__mcoldfire__)) - - #define _EXT2_HAVE_ASM_BITOPS_ - diff --git a/patches/e2fsprogs-1.42/series b/patches/e2fsprogs-1.42/series deleted file mode 100644 index 355f846..000 --- a/patches/e2fsprogs-1.42/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Fixed-bitops.h-for-Coldfire-V4E.patch -# 51e935bcb2a32d87daadf80960d144b0 - git-ptx-patches magic diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 858aeac..57dade2 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs # # Paths and names # -E2FSPROGS_VERSION := 1.42 -E2FSPROGS_MD5 := a3c4ffd7352310ab5e9412965d575610 +E2FSPROGS_VERSION := 1.42.2 +E2FSPROGS_MD5 := 04f4561a54ad0419248316a00c016baa E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION) E2FSPROGS_SUFFIX := tar.gz E2FSPROGS_URL := $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] image_ext2: improve image generation and support ext4
In some cases, genext2fs does not produce enough inodes. Specify 16384 bytes per inode by default (can be overridden using IMAGE_EXT2_EXTRA_ARGS). Also run e2fsck in all cases to generate a UUID in the superblock. Finally support upgrading the image to ext4. Signed-off-by: Jan Luebbe j...@pengutronix.de --- platforms/image_ext2.in| 14 +++--- rules/post/image_ext2.make | 25 +++-- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/platforms/image_ext2.in b/platforms/image_ext2.in index c26efd0..d87a8f5 100644 --- a/platforms/image_ext2.in +++ b/platforms/image_ext2.in @@ -14,7 +14,7 @@ config IMAGE_EXT2_SIZE default 20480 prompt Size in kilobytes help - FIXME: This item needs to be documented + Size of the image in kilobytes config IMAGE_EXT2_EXTRA_ARGS string @@ -33,9 +33,17 @@ config IMAGE_EXT2_GZIP config IMAGE_EXT2_JOURNAL bool select HOST_E2FSPROGS - prompt Add a journal to the ext2 file system image, making it ext3 + prompt Upgrade the ext2 file system image to ext3 by adding a journal + help + Enable this option if you want to mount the root file system as + an ext3 image. + +config IMAGE_EXT2_EXT4 + bool + select IMAGE_EXT2_JOURNAL + prompt Upgrade the ext2 file system image to ext4 help Enable this option if you want to mount the root file system as - ext3 image. + an ext4 image. endif diff --git a/rules/post/image_ext2.make b/rules/post/image_ext2.make index ed7d037..9988ce5 100644 --- a/rules/post/image_ext2.make +++ b/rules/post/image_ext2.make @@ -13,13 +13,14 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_EXT2_GZIP) += $(IMAGEDIR)/root.ext2.gz $(IMAGEDIR)/root.ext2: $(STATEDIR)/image_working_dir @echo -n Creating root.ext2 from working dir... - @cd $(image/work_dir); \ + @cd $(image/work_dir); \ (awk -F: $(DOPERMISSIONS) $(image/permissions)\ ( \ echo -n $(PTXCONF_SYSROOT_HOST)/bin/genext2fs ; \ echo -n -b $(PTXCONF_IMAGE_EXT2_SIZE) ; \ + echo -n -i 16384 ;\ echo -n $(PTXCONF_IMAGE_EXT2_EXTRA_ARGS) ;\ - echo -n -d $(image/work_dir) ; \ + echo -n -d $(image/work_dir) ;\ echo $@ ) \ ) | $(FAKEROOT) -- @echo done. @@ -31,12 +32,24 @@ ifdef PTXCONF_IMAGE_EXT2_JOURNAL # # mode we use output redirection (and since we're operating on files # # and not on real block devices, it's very unlikely that there are # # errors we want to see. - @echo -n Adding a journal to root.ext2 ... - @tune2fs -j $(IMAGEDIR)/root.ext2 /dev/null - @e2fsck -y $(IMAGEDIR)/root.ext2 /dev/null 21 - @echo done. + @echo -n Upgrading root.ext2 to ext3... + @tune2fs -O has_journal $(IMAGEDIR)/root.ext2 /dev/null + @echo done. +endif + +ifdef PTXCONF_IMAGE_EXT2_EXT4 + @echo -n Upgrading root.ext2 to ext4... + @tune2fs -O extents,uninit_bg,dir_index $(IMAGEDIR)/root.ext2 /dev/null + @echo done. endif + @echo -n Running e2fsck on root.ext2... + @e2fsck -pvfD $(IMAGEDIR)/root.ext2 /dev/null 21; test $$? -le 2 + @echo done. + + @echo -n Summary of root.ext2: + @e2fsck -pvf $(IMAGEDIR)/root.ext2 + $(IMAGEDIR)/root.ext2.gz: $(IMAGEDIR)/root.ext2 @echo -n Creating root.ext2.gz from root.ext2...; @rm -f $@ -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de
