[ptxdist] [PATCH v2] memtest86+: added new package
In ptxdist it is called MEMTEST86P because + is not valid.
Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com
---
Changes in V2:
* Adjust files suggested by Michael.
.../memtest86+-4.10-hardcoded_cc.patch | 39 ++
patches/memtest86+-4.20/serial_base.patch | 26 ++
patches/memtest86+-4.20/series |2 +
rules/memtest86p.in| 27 +++
rules/memtest86p.make | 81
5 files changed, 175 insertions(+), 0 deletions(-)
create mode 100644 patches/memtest86+-4.20/memtest86+-4.10-hardcoded_cc.patch
create mode 100755 patches/memtest86+-4.20/serial_base.patch
create mode 100644 patches/memtest86+-4.20/series
create mode 100644 rules/memtest86p.in
create mode 100644 rules/memtest86p.make
diff --git a/patches/memtest86+-4.20/memtest86+-4.10-hardcoded_cc.patch
b/patches/memtest86+-4.20/memtest86+-4.10-hardcoded_cc.patch
new file mode 100644
index 000..4841b1d
--- /dev/null
+++ b/patches/memtest86+-4.20/memtest86+-4.10-hardcoded_cc.patch
@@ -0,0 +1,39 @@
+Subject: Remove hardcoded cc variable
+
+This patch is from Gentoo.
+URL:
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/memtest86+/files/memtest86+-4.10-hardcoded_cc.patch?revision=1.1
+
+This patch cleans up the Makefile to allow overwrite CC and AS variable
+
+Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com
+
+diff -Naurp memtest86+-4.10-orig/Makefile memtest86+-4.10/Makefile
+--- memtest86+-4.10-orig/Makefile 2010-06-24 00:27:22.864634431 +0200
memtest86+-4.10/Makefile 2010-06-24 00:28:42.402478590 +0200
+@@ -8,10 +8,9 @@
+ #
+ FDISK=/dev/fd0
+
+-AS=as -32
+-CC=gcc
+-
+-CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin
-ffreestanding -fPIC -fno-stack-protector
++CFLAGS=-Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin
-ffreestanding -fPIC -fno-stack-protector
++CPPFLAGS=-m32
++ASFLAGS=-32
+
+ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
+ config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
+@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
+ memtest_shared.bin -o memtest.bin
+
+ reloc.o: reloc.c
+- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
++ $(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
+
+ test.o: test.c
+- $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin
-ffreestanding test.c
++ $(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin
-ffreestanding -fno-stack-protector -fno-pie -nopie test.c
+
+ clean:
+ rm -f *.o *.s *.iso memtest.bin memtest memtest_shared
memtest_shared.bin
diff --git a/patches/memtest86+-4.20/serial_base.patch
b/patches/memtest86+-4.20/serial_base.patch
new file mode 100755
index 000..ea18382
--- /dev/null
+++ b/patches/memtest86+-4.20/serial_base.patch
@@ -0,0 +1,26 @@
+Subject: Use serial port addresses provided by BIOS
+
+Using this patch memtest86+ uses the serial port addresses provided by BIOS
rather hardcoded defaults.
+
+Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com
+
+--- memtest86+-4.20/lib.c 2011-01-23 19:11:04.0 +0100
memtest86+-4.20/lib.c 2011-03-30 09:31:38.519674571 +0200
+@@ -24,7 +24,7 @@
+ #error Bad SERIAL_TTY. Only ttyS0 and ttyS1 are supported.
+ #endif
+ short serial_tty = SERIAL_TTY;
+-const short serial_base_ports[] = {0x3f8, 0x2f8, 0x3e8, 0x2e8};
++unsigned short serial_base_ports[] = {0x3f8, 0x2f8, 0x3e8, 0x2e8};
+
+ #if ((115200%SERIAL_BAUD_RATE) != 0)
+ #error Bad default baud rate
+@@ -1112,6 +1112,8 @@
+ serial_baud_rate = (int) baud_rate;
+ save_tty:
+ serial_tty = (short) tty;
++ /* fetch I/O port address from BIOS data area */
++ serial_base_ports[serial_tty] = ((const unsigned short *)
0x0400)[serial_tty];
+ serial_cons = 1;
+ }
+
diff --git a/patches/memtest86+-4.20/series b/patches/memtest86+-4.20/series
new file mode 100644
index 000..70c0db8
--- /dev/null
+++ b/patches/memtest86+-4.20/series
@@ -0,0 +1,2 @@
+memtest86+-4.10-hardcoded_cc.patch
+serial_base.patch
diff --git a/rules/memtest86p.in b/rules/memtest86p.in
new file mode 100644
index 000..7e0a3f4
--- /dev/null
+++ b/rules/memtest86p.in
@@ -0,0 +1,27 @@
+## SECTION=debug_tools
+
+menuconfig MEMTEST86P
+ tristate
+ prompt memtest86+
+ help
+ Memory tester based on memtest86
+
+if MEMTEST86P
+
+config MEMTEST86P_SERIAL
+ bool serial support
+ help
+ The default state of the serial console.
+ This is normally off since it slows down testing.
+
+if MEMTEST86P_SERIAL
+
+config MEMTEST86P_BAUDRATE
+ int default serial baudrate
+ default 115200
+ help
+ Default baudrate for serial console.
+
+endif
+
+endif
diff --git a/rules/memtest86p.make
Re: [ptxdist] [PATCH] Add lpc21isp package
Hi, * Michael Olbrich m.olbr...@pengutronix.de [2011-06-18 10:19]: patchin: quilt: apply 'ptxdist-git/patches/lpc21isp-1.79/series' Applying patch lpc21isp-fix-arm.diff patching file lpc21isp.h Hunk #1 FAILED at 37. 1 out of 1 hunk FAILED -- rejects in file lpc21isp.h Patch lpc21isp-fix-arm.diff does not apply (enforce with -f) Hm ..., I don't understand why. I just re-applied the patch on a clean tarball and it works. Using -p1 patches without '-p1' in the series file should be also ok. Can you check why the patch doesn't apply here. +$(STATEDIR)/lpc21isp.compile: + @$(call targetinfo) + make -C $(LPC21ISP_DIR) CC=$(CROSS_CC) clean any special need for this? otherwise don't clean here. It's a relict from when I packaged the ZIP file which includes a pre-built binary. Can be removed now. I will resend a patch with the other remarks applied. Thanks for the review. +$(STATEDIR)/lpc21isp.clean: + @$(call targetinfo) + @-cd $(LPC21ISP_DIR) \ + $(LPC21ISP_ENV) $(LPC21ISP_PATH) $(MAKE) clean why? clean_pkg removes LPC21ISP_DIR anyways. Just remove the clean stage, to use the default. Well, it's just from the template ptxdist generates. It's hard to see at the first place what the default behaviour is, i.e. what can be removed. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Downloading packages from URLs containing ;
Hello,
I'm about to create a package which download URL contains ;
http://git.kernel.org/?p=linux/kernel/git/shemminger/rstp.git;a=snapshot;h=54aa4d79759e468c128fe8a67ca4361cc2cfa993;sf=tgz
Reading through ptxd_make_get I found that downlaod options are passed in the
URL separated by ;
So I'm wondering how can I specify the correct URL in the rstp.make to allow
automatic download. Putting in ' oder doesn't work because the
case ${url} in
doesn't find http:// then.
Regards,
Alexander
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Add lpc21isp package
* Bernhard Walle bernh...@bwalle.de [2011-06-20 09:57]: * Michael Olbrich m.olbr...@pengutronix.de [2011-06-18 10:19]: patchin: quilt: apply 'ptxdist-git/patches/lpc21isp-1.79/series' Applying patch lpc21isp-fix-arm.diff patching file lpc21isp.h Hunk #1 FAILED at 37. 1 out of 1 hunk FAILED -- rejects in file lpc21isp.h Patch lpc21isp-fix-arm.diff does not apply (enforce with -f) Hm ..., I don't understand why. I just re-applied the patch on a clean tarball and it works. Using -p1 patches without '-p1' in the series file should be also ok. Can you check why the patch doesn't apply here. Now it's clear. The source code (and the patch) has Windows line endings, but git-send-email strips the ^M. Will play with some git options. :) Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Add lpc21isp package
* Bernhard Walle bernh...@bwalle.de [2011-06-20 10:46]: * Bernhard Walle bernh...@bwalle.de [2011-06-20 09:57]: * Michael Olbrich m.olbr...@pengutronix.de [2011-06-18 10:19]: patchin: quilt: apply 'ptxdist-git/patches/lpc21isp-1.79/series' Applying patch lpc21isp-fix-arm.diff patching file lpc21isp.h Hunk #1 FAILED at 37. 1 out of 1 hunk FAILED -- rejects in file lpc21isp.h Patch lpc21isp-fix-arm.diff does not apply (enforce with -f) Hm ..., I don't understand why. I just re-applied the patch on a clean tarball and it works. Using -p1 patches without '-p1' in the series file should be also ok. Can you check why the patch doesn't apply here. Now it's clear. The source code (and the patch) has Windows line endings, but git-send-email strips the ^M. Will play with some git options. :) Didn't find any options. I hope this attached and with gzip compressed version is okay ... Regards, Bernhard 0001-Add-lpc21isp-package.patch.gz Description: Binary data -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Update gnuplot to 4.4.3
Signed-off-by: Bernhard Walle bernh...@bwalle.de --- rules/gnuplot.make |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rules/gnuplot.make b/rules/gnuplot.make index 4de83b0..d8fabf6 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot # # Paths and names # -GNUPLOT_VERSION:= 4.2.6 -GNUPLOT_MD5:= c10468d74030e8bed0fd6865a45cf1fd +GNUPLOT_VERSION:= 4.4.3 +GNUPLOT_MD5:= 639603752996f4923bc02c895fa03b45 GNUPLOT:= gnuplot-$(GNUPLOT_VERSION) GNUPLOT_SUFFIX := tar.gz GNUPLOT_URL:= $(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX) @@ -49,7 +49,6 @@ GNUPLOT_ENV := $(CROSS_ENV) GNUPLOT_AUTOCONF = \ $(CROSS_AUTOCONF_USR) \ --disable-history-file \ - --disable-mouse \ --disable-x11-mbfonts \ --enable-binary-data-file \ --disable-with-image \ @@ -86,8 +85,10 @@ endif ifdef PTXCONF_GNUPLOT_X GNUPLOT_AUTOCONF += --with-x +GNUPLOT_AUTOCONF += --enable-mouse else GNUPLOT_AUTOCONF += --without-x +GNUPLOT_AUTOCONF += --disable-mouse endif ifdef PTXCONF_GNUPLOT_PLOT @@ -139,7 +140,7 @@ $(STATEDIR)/gnuplot.targetinstall: @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/bin/gnuplot) ifdef PTXCONF_GNUPLOT_X - @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.2/gnuplot_x11) + @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.4/gnuplot_x11) endif @$(call install_finish, gnuplot) -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Update gnuplot to 4.4.3
On Mon, Jun 20, 2011 at 09:04:47PM +0200, Bernhard Walle wrote: Signed-off-by: Bernhard Walle bernh...@bwalle.de --- rules/gnuplot.make |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rules/gnuplot.make b/rules/gnuplot.make index 4de83b0..d8fabf6 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot # # Paths and names # -GNUPLOT_VERSION := 4.2.6 -GNUPLOT_MD5 := c10468d74030e8bed0fd6865a45cf1fd +GNUPLOT_VERSION := 4.4.3 +GNUPLOT_MD5 := 639603752996f4923bc02c895fa03b45 GNUPLOT := gnuplot-$(GNUPLOT_VERSION) GNUPLOT_SUFFIX := tar.gz GNUPLOT_URL := $(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX) @@ -49,7 +49,6 @@ GNUPLOT_ENV := $(CROSS_ENV) GNUPLOT_AUTOCONF = \ $(CROSS_AUTOCONF_USR) \ --disable-history-file \ - --disable-mouse \ --disable-x11-mbfonts \ --enable-binary-data-file \ --disable-with-image \ @@ -86,8 +85,10 @@ endif ifdef PTXCONF_GNUPLOT_X GNUPLOT_AUTOCONF += --with-x +GNUPLOT_AUTOCONF += --enable-mouse in one line please. And there is an old patch. Please check if its still necessary. If not, remove it. Michael else GNUPLOT_AUTOCONF += --without-x +GNUPLOT_AUTOCONF += --disable-mouse endif ifdef PTXCONF_GNUPLOT_PLOT @@ -139,7 +140,7 @@ $(STATEDIR)/gnuplot.targetinstall: @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/bin/gnuplot) ifdef PTXCONF_GNUPLOT_X - @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.2/gnuplot_x11) + @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.4/gnuplot_x11) endif @$(call install_finish, gnuplot) -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [oselas] mini2440 Qt Arora
On Sun, Jun 19, 2011 at 08:11:27PM +, Dave Festing wrote: graphics driver -LinuxFB (x)none, should this be builtin or plugin? builtin or plugin works both. But, neither can be selected That's not possible. These are always selectable. Are you using menuconfig correctly? Michael -- 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] Update gnuplot to 4.4.3
The patch gnuplot-4.2.2-cc-for-build.diff has been integrated upstream
and is superfluous.
Signed-off-by: Bernhard Walle bernh...@bwalle.de
---
patches/gnuplot-4.2.6/autogen.sh |1 -
.../gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff | 89
patches/gnuplot-4.2.6/series |1 -
rules/gnuplot.make | 11 +--
4 files changed, 5 insertions(+), 97 deletions(-)
delete mode 12 patches/gnuplot-4.2.6/autogen.sh
delete mode 100644 patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
delete mode 100644 patches/gnuplot-4.2.6/series
diff --git a/patches/gnuplot-4.2.6/autogen.sh b/patches/gnuplot-4.2.6/autogen.sh
deleted file mode 12
index 9f8a4cb..000
--- a/patches/gnuplot-4.2.6/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
b/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
deleted file mode 100644
index e0f63b9..000
--- a/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-Subject: gnuplot: build documentation generator tools with CC_FOR_BUILD
-From: Robert Schwebel r.schwe...@pengutronix.de
-
-When cross compiling gnuplot, it tries to build the documentation
-generation tools in docs/ with the cross compiler, not with
-CC_FOR_BUILD.
-
-Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de
-
-# 20091222 rsc:
https://sourceforge.net/tracker/?func=detailaid=2918992group_id=2055atid=302055
-
- configure.in | 40
- docs/Makefile.in |2 +-
- 2 files changed, 41 insertions(+), 1 deletion(-)
-
-Index: gnuplot-4.2.4/docs/Makefile.in
-===
gnuplot-4.2.4.orig/docs/Makefile.in2009-01-06 18:46:41.0
+0100
-+++ gnuplot-4.2.4/docs/Makefile.in 2009-01-06 18:46:46.0 +0100
-@@ -70,7 +70,7 @@
-
- INFO_DEPS = $(srcdir)/gnuplot.info
-
--CC = @CC@
-+CC = @CC_FOR_BUILD@
- CPP= @CPP@
- DEFS = @DEFS@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I.. -I$(top_builddir)
-Index: gnuplot-4.2.4/configure.in
-===
gnuplot-4.2.4.orig/configure.in2009-01-06 18:46:41.0 +0100
-+++ gnuplot-4.2.4/configure.in 2009-01-06 18:46:56.0 +0100
-@@ -12,6 +12,8 @@
- AM_CONFIG_HEADER(config.h:config.hin)
- AM_INIT_AUTOMAKE(1.7.9)
-
-+AM_MAINTAINER_MODE
-+
- VERSION_MAJOR=`cat $srcdir/VERSION`
- PATCHLEVEL=`cat $srcdir/PATCHLEVEL`
-
-@@ -27,6 +29,46 @@
- AC_C_INLINE
- AC_C_STRINGIZE
-
-+
-+if test ${build} != ${host}
-+then
-+ CC=${CC-${host_alias}-gcc}
-+ CFLAGS=${CFLAGS--g -O2}
-+ CXX=${CXX-${host_alias}-c++}
-+ CXXFLAGS=${CXXFLAGS--g -O2}
-+ CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-+else
-+ CC_FOR_BUILD=\$(CC)
-+ AC_PROG_CC
-+
-+ # We must set the default linker to the linker used by gcc for the correct
-+ # operation of libtool. If LD is not defined and we are using gcc, try to
-+ # set the LD default to the ld used by gcc.
-+ if test -z $LD
-+ then
-+if test $GCC = yes
-+then
-+ case $build in
-+ *-*-mingw*)
-+gcc_prog_ld=`$CC -print-prog-name=ld 21 | tr -d '\015'` ;;
-+ *)
-+gcc_prog_ld=`$CC -print-prog-name=ld 21` ;;
-+ esac
-+ case $gcc_prog_ld in
-+ # Accept absolute paths.
-+ [[\\/]* | [A-Za-z]:[\\/]*)]
-+LD=$gcc_prog_ld ;;
-+ esac
-+fi
-+ fi
-+
-+ CXX=${CXX-c++}
-+ CFLAGS=${CFLAGS--g -O2}
-+ CXXFLAGS=${CXXFLAGS--g -O2}
-+fi
-+AC_SUBST(CC_FOR_BUILD)
-+
-+
- dnl Various programs
- dnl X/Emacs for building lisp packages and creating .texi version of docs
- # If set to t, that means we are running in a shell under Emacs.
diff --git a/patches/gnuplot-4.2.6/series b/patches/gnuplot-4.2.6/series
deleted file mode 100644
index 12cf91b..000
--- a/patches/gnuplot-4.2.6/series
+++ /dev/null
@@ -1 +0,0 @@
-gnuplot-4.2.2-cc-for-build.diff
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index 4de83b0..0a2ed36 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot
#
# Paths and names
#
-GNUPLOT_VERSION:= 4.2.6
-GNUPLOT_MD5:= c10468d74030e8bed0fd6865a45cf1fd
+GNUPLOT_VERSION:= 4.4.3
+GNUPLOT_MD5:= 639603752996f4923bc02c895fa03b45
GNUPLOT:= gnuplot-$(GNUPLOT_VERSION)
GNUPLOT_SUFFIX := tar.gz
GNUPLOT_URL:=
$(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX)
@@ -49,7 +49,6 @@ GNUPLOT_ENV := $(CROSS_ENV)
GNUPLOT_AUTOCONF = \
$(CROSS_AUTOCONF_USR) \
--disable-history-file \
- --disable-mouse \
--disable-x11-mbfonts \
--enable-binary-data-file \
--disable-with-image \
@@ -85,9 +84,9 @@ GNUPLOT_AUTOCONF += --disable-fiterrvars
endif
ifdef PTXCONF_GNUPLOT_X
-GNUPLOT_AUTOCONF += --with-x
