From 3af640cb42a2628e02ebb355c6ade61538896d9d Mon Sep 17 00:00:00 2001 From: Jon Ringle Date: Sat, 6 Mar 2010 10:29:00 -0500 Subject: [mtd-utils] ubiformat select GCCLIBS_GCC_S Signed-off-by: Jon Ringle Signed-off-by: Marc Kleine-Budde (cherry picked from commit 7ecb4e47bac545ba206fbc37e8adf61b1fbbcc5a) --- rules/mtd-utils.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in index 6ca5513ad..4d3395484 100644 --- a/rules/mtd-utils.in +++ b/rules/mtd-utils.in @@ -167,6 +167,7 @@ config MTD_UTILS_UBIDETACH config MTD_UTILS_UBIFORMAT bool + select GCCLIBS_GCC_S prompt "ubiformat" help format an mtd device -- cgit v1.2.3 From 20550158698b56c3ba3ef5244d68f3031373bac4 Mon Sep 17 00:00:00 2001 From: Luotao Fu Date: Thu, 18 Mar 2010 10:00:03 +0100 Subject: [ptxdist] fix speed setting in test script library Setting speed is missing if the serial port is a telnet port. This will fail if the serial port daemon requires speed settings, e.g. moxa. Signed-off-by: Luotao Fu (cherry picked from commit 5c3328ebe6d7a771bab958da3f95cb234cba0560) --- tests/libptxdisttest.kermit | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/libptxdisttest.kermit b/tests/libptxdisttest.kermit index 84bfcbb26..5620c250b 100644 --- a/tests/libptxdisttest.kermit +++ b/tests/libptxdisttest.kermit @@ -34,6 +34,7 @@ define ptx_init { } else { set host \m(PTXCONF_BOARDSETUP_SERIALPORT) ptx_check_fail "Could not connect to port \m(PTXCONF_BOARDSETUP_SERIALPORT). Is it already in use?" + set speed \m(PTXCONF_BOARDSETUP_SERIALBAUDRATE) set terminal echo remote } set carrier-watch off -- cgit v1.2.3 From 962848ae5709ccdb94fcf2ecf88914de86056ece Mon Sep 17 00:00:00 2001 From: Luotao Fu Date: Thu, 18 Mar 2010 10:55:53 +0100 Subject: [ptxdist] fix exclude pattern while building environment The exclude pattern in the scripts for barebox/uboot-v2 environment creation is broken. It will include the config.in template file and all backup files in Emacs or vim style. Fix this so that we won't find things like /env/bin/config.in or /env/config.in~ on the target after running "test setenv" Signed-off-by: Luotao Fu (cherry picked from commit 759dd85a407e0c080d1d262ea8deee47615acf7e) --- tests/make_barebox_env | 3 ++- tests/make_uboot_v2_env | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/make_barebox_env b/tests/make_barebox_env index f49445519..84b069497 100755 --- a/tests/make_barebox_env +++ b/tests/make_barebox_env @@ -8,7 +8,8 @@ tar -C "${PTXDIST_PLATFORMCONFIGDIR}/barebox-env/" -c . \ --exclude .svn \ --exclude .pc \ --exclude .git \ - --exclude "${PTXDIST_PLATFORMCONFIGDIR}/barebox-env/config.in" \ + --exclude "config.in" \ + --exclude "*/*~" \ | tar -C "${ENVTMPDIR}" -x ${PTXDIST_SYSROOT_HOST}/bin/bareboxenv -s "${ENVTMPDIR}" "${IMAGEDIR}/barebox-environment" diff --git a/tests/make_uboot_v2_env b/tests/make_uboot_v2_env index f436ae3b4..8dad3d898 100755 --- a/tests/make_uboot_v2_env +++ b/tests/make_uboot_v2_env @@ -8,7 +8,8 @@ tar -C "${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/" -c . \ --exclude .svn \ --exclude .pc \ --exclude .git \ - --exclude "${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/config.in" \ + --exclude "config.in" \ + --exclude "*/*~" \ | tar -C "${ENVTMPDIR}" -x ${PTXDIST_SYSROOT_HOST}/bin/ubootenv -s "${ENVTMPDIR}" "${IMAGEDIR}/u-boot-v2-environment" -- cgit v1.2.3 From 59da4f4ae7c843e28a650a15f88f6ba474feecba Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 26 Mar 2010 12:12:17 +0100 Subject: [ptxdist] rename template "simple" -> "file" and add help Signed-off-by: Michael Olbrich (cherry picked from commit 900df22e4b2fca3a03a47756dccc6e4ad769fc24) --- bin/ptxdist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ptxdist b/bin/ptxdist index 89004d878..75b7ae4a1 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -976,7 +976,7 @@ newpackage() { local template_src="${RULESDIR}/templates/${action}" case "${action}" in - target|font|simple) + target|font|file) #template: default ;; host) @@ -1022,7 +1022,7 @@ newpackage() { echo " src-make-prog create a plain makefile binary" echo " src-stellaris create stellaris firmware" echo " font" - echo " simple" + echo " file create package to install existing files" echo exit 1 ;; -- cgit v1.2.3 From 55b80a73d0859b50d1e0b97e754e6828b9b11910 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 26 Mar 2010 12:15:16 +0100 Subject: [templates] add empty prepare stage to src-linux-driver template Without this the default prepare stage fails because of a missing build directory. Signed-off-by: Michael Olbrich (cherry picked from commit 4f71ffb8de74bf3d0b6fc2db5f23a8f3d77a9d51) --- rules/templates/template-src-linux-driver-make | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rules/templates/template-src-linux-driver-make b/rules/templates/template-src-linux-driver-make index c48309507..6d6b385ee 100644 --- a/rules/templates/template-src-linux-driver-make +++ b/rules/templates/template-src-linux-driver-make @@ -34,6 +34,14 @@ $(STATEDIR)/@package@.extract: @$(call targetinfo) @$(call touch) +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +$(STATEDIR)/@package@.prepare: + @$(call targetinfo) + @$(call touch) + # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -- cgit v1.2.3 From 70d84c538f63bf7d4d80a405763f0ca569150c41 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 25 Mar 2010 21:21:57 +0100 Subject: [template-src-stellaris-make] don't use := in @PACKAGE@_CONF_OPT Don't use := but = in an assignment when referencing variables from other makefiles. Signed-off-by: Marc Kleine-Budde (cherry picked from commit 3520db8f47c1e46ec33e11aaea2063d8d53b2887) Signed-off-by: Marc Kleine-Budde --- rules/templates/template-src-stellaris-make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/templates/template-src-stellaris-make b/rules/templates/template-src-stellaris-make index 4a63dd42b..6f723189e 100644 --- a/rules/templates/template-src-stellaris-make +++ b/rules/templates/template-src-stellaris-make @@ -64,7 +64,7 @@ endif # @PACKAGE@_CONF_ENV := CC=$(PTXCONF_STELLARIS_CC) @PACKAGE@_CONF_TOOL := autoconf -@PACKAGE@_CONF_OPT := \ +@PACKAGE@_CONF_OPT = \ --host=$(PTXCONF_STELLARIS_GNU_TARGET) \ --build=$(GNU_HOST) \ --with-stellaris-sdk=$(SW_EK_LM3S3748_DIR) \ -- cgit v1.2.3 From d171641275f6477892080e2ee98948c01a7e50bd Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 25 Mar 2010 20:45:56 +0100 Subject: [template-src-*-make] add dependency to autotools ... ...if we run autogen.sh Reported-by: Jon Ringle Signed-off-by: Marc Kleine-Budde (cherry picked from commit e469733b466373f3c855134af21aa98198eb3cfa) Signed-off-by: Marc Kleine-Budde --- rules/templates/template-src-autoconf-make | 4 ++++ rules/templates/template-src-stellaris-make | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/rules/templates/template-src-autoconf-make b/rules/templates/template-src-autoconf-make index 3ba3df482..c8081fd34 100644 --- a/rules/templates/template-src-autoconf-make +++ b/rules/templates/template-src-autoconf-make @@ -27,6 +27,10 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@ # Extract # ---------------------------------------------------------------------------- +ifdef PTXCONF_@PACKAGE@_TRUNK +$(STATEDIR)/@package@.extract: $(STATEDIR)/autogen-tools +endif + $(STATEDIR)/@package@.extract: @$(call targetinfo) @$(call clean, $(@PACKAGE@_DIR)) diff --git a/rules/templates/template-src-stellaris-make b/rules/templates/template-src-stellaris-make index 6f723189e..7ea8ada86 100644 --- a/rules/templates/template-src-stellaris-make +++ b/rules/templates/template-src-stellaris-make @@ -42,6 +42,10 @@ endif # Extract # ---------------------------------------------------------------------------- +ifdef PTXCONF_@PACKAGE@_TRUNK +$(STATEDIR)/@package@.extract: $(STATEDIR)/autogen-tools +endif + $(STATEDIR)/@package@.extract: @$(call targetinfo) @$(call clean, $(@PACKAGE@_DIR)) -- cgit v1.2.3 From 612cdb5a903d34cfb20f9f1a2768abc3303a59fd Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 29 Mar 2010 13:38:21 +0200 Subject: release ptxdist-2010.03.1 Signed-off-by: Marc Kleine-Budde --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6fbab7068..11c4640d8 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Most parts of this configure script have been borrowed from quilt. dnl AC_PREREQ(2.59) -AC_INIT([ptxdist],[2010.03.0],[ptxdist@pengutronix.de]) +AC_INIT([ptxdist],[2010.03.1],[ptxdist@pengutronix.de]) AC_CONFIG_AUX_DIR(scripts/autoconf) AC_CANONICAL_BUILD AC_CANONICAL_HOST -- cgit v1.2.3 From a7b418942bc34c95b5db76730b55e25c31f5baac Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 7 Apr 2010 13:15:27 +0200 Subject: [template-src-*-make] use "trunk" if requested by user Signed-off-by: Marc Kleine-Budde (cherry picked from commit e6dd06522735dfe652ba493140ab919f6e7df505) Signed-off-by: Marc Kleine-Budde --- rules/templates/template-src-autoconf-make | 4 ++++ rules/templates/template-src-cmake-prog-make | 4 ++++ rules/templates/template-src-stellaris-make | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/rules/templates/template-src-autoconf-make b/rules/templates/template-src-autoconf-make index c8081fd34..42f055ef9 100644 --- a/rules/templates/template-src-autoconf-make +++ b/rules/templates/template-src-autoconf-make @@ -16,7 +16,11 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@ # # Paths and names # +ifdef PTXCONF_@PACKAGE@_TRUNK +@PACKAGE@_VERSION := trunk +else @PACKAGE@_VERSION := @VERSION@ +endif @PACKAGE@ := @package@-$(@PACKAGE@_VERSION) @PACKAGE@_URL := file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@) @PACKAGE@_DIR := $(BUILDDIR)/$(@PACKAGE@) diff --git a/rules/templates/template-src-cmake-prog-make b/rules/templates/template-src-cmake-prog-make index 18c40a22f..c381fa1e2 100644 --- a/rules/templates/template-src-cmake-prog-make +++ b/rules/templates/template-src-cmake-prog-make @@ -16,7 +16,11 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@ # # Paths and names # +ifdef PTXCONF_@PACKAGE@_TRUNK +@PACKAGE@_VERSION := trunk +else @PACKAGE@_VERSION := @VERSION@ +endif @PACKAGE@ := @package@-$(@PACKAGE@_VERSION) @PACKAGE@_URL := file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@) @PACKAGE@_DIR := $(BUILDDIR)/$(@PACKAGE@) diff --git a/rules/templates/template-src-stellaris-make b/rules/templates/template-src-stellaris-make index 7ea8ada86..7c5628e8d 100644 --- a/rules/templates/template-src-stellaris-make +++ b/rules/templates/template-src-stellaris-make @@ -27,7 +27,11 @@ endif # # Paths and names # +ifdef PTXCONF_@PACKAGE@_TRUNK +@PACKAGE@_VERSION := trunk +else @PACKAGE@_VERSION := @VERSION@ +endif @PACKAGE@ := @package@-$(@PACKAGE@_VERSION) @PACKAGE@_URL := file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@) @PACKAGE@_DIR := $(BUILDDIR)/$(@PACKAGE@) -- cgit v1.2.3 From 938610b2bd2030675aa637fe612fc9028d4a8f93 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Tue, 4 May 2010 12:13:10 +0200 Subject: [host-pelts] add get stage The get stage has been accidently removed in "f24e7f331ab6d615ead3f46da9f5c13a1b604e13". Signed-off-by: Marc Kleine-Budde (cherry picked from commit 881042690b2484e5ede161167b53c72bac340ae3) --- rules/host-pelts.make | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rules/host-pelts.make b/rules/host-pelts.make index 5d3bc694c..19f123c3e 100644 --- a/rules/host-pelts.make +++ b/rules/host-pelts.make @@ -26,6 +26,14 @@ HOST_PELTS_URL := http://www.pengutronix.de/software/pelts/download/v1/$(HOST_P HOST_PELTS_SOURCE := $(SRCDIR)/$(HOST_PELTS).$(HOST_PELTS_SUFFIX) HOST_PELTS_DIR := $(HOST_BUILDDIR)/$(HOST_PELTS) +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +$(HOST_PELTS_SOURCE): + @$(call targetinfo) + @$(call get, HOST_PELTS) + # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -- cgit v1.2.3 From bf0d93e8f3dfb4de4bc18ae586c8de68d280843d Mon Sep 17 00:00:00 2001 From: Enrik Berkhan Date: Mon, 14 Jun 2010 18:05:49 +0200 Subject: fix wrong TABs in rules/pre/kernel.make 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. Signed-off-by: Enrik Berkhan Signed-off-by: Marc Kleine-Budde (cherry picked from commit f8770aecb60892154556082c1c68762f5da83728) Signed-off-by: Marc Kleine-Budde --- rules/pre/kernel.make | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make index 6e15a70d5..31d3d4d93 100644 --- a/rules/pre/kernel.make +++ b/rules/pre/kernel.make @@ -25,13 +25,13 @@ KERNEL_HEADERS_INCLUDE_DIR := $(KERNEL_HEADERS_DIR)/include # ifdef PTXCONF_KERNEL ifneq ($(PTXCONF_COMPILER_PREFIX),$(PTXCONF_COMPILER_PREFIX_KERNEL)) - ifeq ($(wildcard selected_toolchain_kernel/$(PTXCONF_COMPILER_PREFIX_KERNEL)gcc),) - $(warning *** no 'selected_toolchain_kernel' link found. Please create a link) - $(warning *** 'selected_toolchain_kernel' to the bin directory of your) - $(warning '$(PTXCONF_COMPILER_PREFIX_KERNEL)' toolchain) - $(error ) - endif - KERNEL_TOOLCHAIN_LINK := $(PTXDIST_WORKSPACE)/selected_toolchain_kernel/ + ifeq ($(wildcard selected_toolchain_kernel/$(PTXCONF_COMPILER_PREFIX_KERNEL)gcc),) + $(warning *** no 'selected_toolchain_kernel' link found. Please create a link) + $(warning *** 'selected_toolchain_kernel' to the bin directory of your) + $(warning '$(PTXCONF_COMPILER_PREFIX_KERNEL)' toolchain) + $(error ) + endif + KERNEL_TOOLCHAIN_LINK := $(PTXDIST_WORKSPACE)/selected_toolchain_kernel/ endif endif -- cgit v1.2.3 From 2a5e0ae717cd4e6e40bf9aa80ae9c5a35fc7c568 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 2 Aug 2010 13:29:29 +0200 Subject: [host-xorg-lib-Xfont] turn off documentation regenerating documentation breaks on gentoo Signed-off-by: Marc Kleine-Budde (cherry picked from commit bdfb95f42e6c7c8179b363d685277d15304eed69) Signed-off-by: Marc Kleine-Budde --- rules/host-xorg-lib-Xfont.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/host-xorg-lib-Xfont.make b/rules/host-xorg-lib-Xfont.make index 7bd072d4c..d903cf95c 100644 --- a/rules/host-xorg-lib-Xfont.make +++ b/rules/host-xorg-lib-Xfont.make @@ -31,6 +31,7 @@ HOST_XORG_LIB_XFONT_ENV := $(HOST_ENV) # HOST_XORG_LIB_XFONT_AUTOCONF := \ $(HOST_AUTOCONF) \ - --disable-freetype + --disable-freetype \ + --without-xmlto # vim: syntax=make -- cgit v1.2.3 From 6248e5ddbe0d79ec1fdfb0e66fc8200f73ebe22f Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 2 Aug 2010 14:00:58 +0200 Subject: [sdl] fix typo: properly disable audio Signed-off-by: Marc Kleine-Budde (cherry picked from commit 9602dadda30058385fe65d04da34ebdd863fb046) Signed-off-by: Marc Kleine-Budde --- rules/sdl.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/sdl.make b/rules/sdl.make index 89fdef52a..cfde07beb 100644 --- a/rules/sdl.make +++ b/rules/sdl.make @@ -118,7 +118,7 @@ SDL_AUTOCONF += --enable-audio endif else -SDL_LIB_AUTOCONF += --disable-audio +SDL_AUTOCONF += --disable-audio endif ifdef PTXCONF_SDL_VIDEO -- cgit v1.2.3 From feb44bc3ab5f5843847f6d2e58c2519b8367aa96 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 2 Aug 2010 17:11:38 +0200 Subject: [expat] use bz2 tarball because the gz tarball has problems on certain i386 ubuntu systems Signed-off-by: Marc Kleine-Budde (cherry picked from commit 7d14006b7f76b26ddbd52f0bc00fa5c8f7056641) Signed-off-by: Marc Kleine-Budde --- rules/expat.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/expat.make b/rules/expat.make index 13401924b..0b788d6b3 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_EXPAT) += expat # EXPAT_VERSION := 2.0.1 EXPAT := expat-$(EXPAT_VERSION) -EXPAT_SUFFIX := tar.gz +EXPAT_SUFFIX := tar.bz2 EXPAT_URL := $(PTXCONF_SETUP_SFMIRROR)/expat/$(EXPAT).$(EXPAT_SUFFIX) EXPAT_SOURCE := $(SRCDIR)/$(EXPAT).$(EXPAT_SUFFIX) EXPAT_DIR := $(BUILDDIR)/$(EXPAT) -- cgit v1.2.3