[ptxdist] [PATCH] image_ipkg.make: create repository directory
Pushing ipks fails when top level repository directory does not exists. Once here, use helper variables for repository paths. Signed-off-by: Ladislav Michl --- image_ipkg.make | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make index 5449553..4989632 100644 --- a/rules/post/image_ipkg.make +++ b/rules/post/image_ipkg.make @@ -11,17 +11,21 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY) += $(STATEDIR)/ipkg-push -ipkg-push : $(STATEDIR)/ipkg-push +ipkg-push: $(STATEDIR)/ipkg-push + +IPKG_DISTDIR := $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)) +IPKG_REPODIR := $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) $(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post $(STATEDIR)/world.targetinstall @$(call targetinfo) ifdef PTXCONF_IMAGE_IPKG_FORCED_PUSH - rm -rf $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION) + rm -rf $(IPKG_DISTDIR) endif + mkdir -p $(IPKG_REPODIR) @echo "pushing ipkg packages to ipkg-repository..." @$(HOST_ENV) $(PTXDIST_TOPDIR)/scripts/ipkg-push \ --ipkgdir $(call remove_quotes,$(PKGDIR)) \ - --repodir $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \ + --repodir $(IPKG_REPODIR) \ --revision $(call remove_quotes,$(PTXDIST_VERSION_FULL)) \ --project $(call remove_quotes,$(PTXCONF_PROJECT)) \ --dist $(call remove_quotes,$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)) \ @@ -30,12 +34,12 @@ endif ifdef PTXCONF_IMAGE_IPKG_SIGN_OPENSSL @echo "signing Packages..." openssl smime -sign \ - -in $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)/Packages \ + -in $(IPKG_DISTDIR)/Packages \ -text -binary \ -outform PEM \ -signer $(PTXCONF_IMAGE_IPKG_SIGN_OPENSSL_SIGNER) \ -inkey $(PTXCONF_IMAGE_IPKG_SIGN_OPENSSL_KEY) \ - -out $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)/Packages.sig + -out $(IPKG_DISTDIR)/Packages.sig @echo "Packages.sig created" endif @touch $@ -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] scripts/ipkg-push: return nonzero on error
ipkg-push returns zero when ipkg repository path does not exist causing make
continues ignoring error.
Signed-off-by: Ladislav Michl
---
ipkg-push |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/ipkg-push b/scripts/ipkg-push
index 3f8c823..b8d5228 100755
--- a/scripts/ipkg-push
+++ b/scripts/ipkg-push
@@ -33,7 +33,7 @@ usage() {
echo " --dist use this to make a dist release
(optional)"
echo " --type specify package type (default: ipkg)"
echo
- exit 0
+ exit 1
}
IPKGDIR=
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Change some install_alternative to install_config
On 03/14/2012 10:10 AM, Benoît Burnichon wrote: To avoid loss of configuration when upgrading packages with default configurations. This is a tricky subject. On some embedded systems it may be expected for a user or configuration utility to change some configs while not other configs. On some embedded systems it may be impossible (or unlikely) for the user to modify configurations. When a package is upgraded sometimes new configuration options are added and sometimes they are deleted, sometimes the format of the configuration is changed entirely or moved to a different location. Other times the upgrade is just a maintenance release and only contains minor fixes. If you mark a file as a config file by default opkg won't upgrade that file during a package upgrade, even if the user never made any modifications. At this point you are basically deciding to leave the original file unchanged and putting the burden of merging old and new config files on the user. We've dealt with this by leaving install_alternative for all config files by default and only making custom rules with install_config for files we intend for users to change. For our device it makes sense for instance that a user may want to modify ntp.conf to add an ntp time source (we provide a web based utility to do this), yet it makes no sense for a user to change the dbus configuration. If during the course of a version upgrade a configuration option is renamed, eliminated or added, we provide a .postinstall script to modify the user configuration and make the required changes so the user doesn't end up with a broken device. Ultimately I think a better frame work is needed to handle management of configs. Suppose your user wants to backup his device's configuration files to a PC. Then suppose said user's device is burnt to a crisp when lightning strikes an improperly arrested antenna (this has happened). He orders replacement but it arrives with new firmware. He sends his backed up config files to it from a and it doesn't work because the name of a setting in one of the config files changed. Ideally you could provide a single script to migrate a config file from one package version to another. This script could be used when the package is upgraded OR when users send configuration files to the device. Regards, George McCollister -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Add flashbench tool
From: Bernhard Walle
This patch adds the flashbench tool from Linaro Project
git://git.linaro.org/people/arnd/flashbench.git. See also
http://lwn.net/Articles/428584/. Because there is no tarball, I
exported the current git repo and put it on my server.
The default maximum buffer size of 64 MiB (the buffer is allocated 4
times) was too large for my device, so I patched the tool and added an
option in the ptxdist menu.
Tested with a custom OMAP3 board which is similar to the Devkit8000.
Signed-off-by: Bernhard Walle
---
...o-specify-MAX_BUFSIZE-during-compile-time.patch | 37 +++
patches/flashbench-20120222/series |4 ++
rules/flashbench.in| 31 +
rules/flashbench.make | 68
4 files changed, 140 insertions(+)
create mode 100644
patches/flashbench-20120222/0001-Allow-to-specify-MAX_BUFSIZE-during-compile-time.patch
create mode 100644 patches/flashbench-20120222/series
create mode 100644 rules/flashbench.in
create mode 100644 rules/flashbench.make
diff --git
a/patches/flashbench-20120222/0001-Allow-to-specify-MAX_BUFSIZE-during-compile-time.patch
b/patches/flashbench-20120222/0001-Allow-to-specify-MAX_BUFSIZE-during-compile-time.patch
new file mode 100644
index 000..cc9505b
--- /dev/null
+++
b/patches/flashbench-20120222/0001-Allow-to-specify-MAX_BUFSIZE-during-compile-time.patch
@@ -0,0 +1,37 @@
+From: Bernhard Walle
+Date: Wed, 14 Mar 2012 16:52:47 +0100
+Subject: [PATCH] Allow to specify MAX_BUFSIZE during compile time
+
+The default value of 64 MiB is too large for small embedded systems.
+
+Signed-off-by: Bernhard Walle
+---
+ Makefile |2 +-
+ dev.c|2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 8fbd119..01771b0 100644
+--- a/Makefile
b/Makefile
+@@ -1,5 +1,5 @@
+ CC:= gcc
+-CFLAGS:= -O2 -Wall -Wextra -Wno-missing-field-initializers
-Wno-unused-parameter -g2
++CFLAGS:= -O2 -Wall -Wextra -Wno-missing-field-initializers
-Wno-unused-parameter -g2 $(EXTRA_CFLAGS)
+ LDFLAGS := -lrt
+
+ all: flashbench erase
+diff --git a/dev.c b/dev.c
+index f1718be..73a9b3f 100644
+--- a/dev.c
b/dev.c
+@@ -22,7 +22,9 @@
+
+ #include "dev.h"
+
++#ifndef MAX_BUFSIZE
+ #define MAX_BUFSIZE (64 * 1024 * 1024)
++#endif
+
+ static inline long long time_to_ns(struct timespec *ts)
+ {
diff --git a/patches/flashbench-20120222/series
b/patches/flashbench-20120222/series
new file mode 100644
index 000..8ac1f19
--- /dev/null
+++ b/patches/flashbench-20120222/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Allow-to-specify-MAX_BUFSIZE-during-compile-time.patch
+# 2284485069f201f5dd31c217b70f51e0 - git-ptx-patches magic
diff --git a/rules/flashbench.in b/rules/flashbench.in
new file mode 100644
index 000..96fa631
--- /dev/null
+++ b/rules/flashbench.in
@@ -0,0 +1,31 @@
+## SECTION=test_suites
+
+config FLASHBENCH
+ tristate
+ prompt "flashbench"
+ help
+ Identify characteristics of flash media
+
+ This is the tool used to identify the properties of
+ SD cards and other media for the Linaro flash memory
+ survey at [1]. The latest version should be available
+ at [2]. Please also check out the article on lwn.net [3].
+
+ [1]
https://wiki.linaro.org/WorkingGroups/KernelConsolidation/Projects/FlashCardSurvey
+ [2] git clone git://git.linaro.org/people/arnd/flashbench.git
+ [3] http://lwn.net/Articles/428XXX FIXME
+
+if FLASHBENCH
+
+config FLASHBENCH_MAX_BUFSIZE
+ string
+ prompt "Maximum flashbench buffer size in bytes"
+ default 67108864
+ help
+ This is the maximum buffer size flashbench uses during operationg.
+ The buffer gets allocated 4 times, so take that into account when
+ choosing a buffer. The default is 64 MiB.
+
+endif
+
+# vim: set ft=kconfig:
diff --git a/rules/flashbench.make b/rules/flashbench.make
new file mode 100644
index 000..f71f0c8
--- /dev/null
+++ b/rules/flashbench.make
@@ -0,0 +1,68 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2012 by Bernhard Walle
+#
+# 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_FLASHBENCH) += flashbench
+
+#
+# Paths and names
+#
+FLASHBENCH_VERSION := 20120222
+FLASHBENCH_MD5 := 3d99608022b50e891e5f66d7c637d8b1
+FLASHBENCH := flashbench-$(FLASHBENCH_VERSION)
+FLASHBENCH_SUFFIX := tar.gz
+FLASHBENCH_URL :=
http://bwalle.de/programme/$(FLASHBENCH).$(FLASHBENCH_SUFFIX)
+FLASHBENCH_SOURCE := $(SRCDIR)/$(FLASHBENCH).$(FLASHBENCH_SUFFIX)
+FLASHBENCH_DIR := $(BUILDDIR)/$(FLASHBENCH)
+FLASHBENCH_LICENSE := GPL v2
+
+#
Re: [ptxdist] [PATCH] Build MLO from barebox sources
On Wed, Mar 14, 2012 at 02:15:01PM +0100, Jan Weitzel wrote:
> Am Freitag, den 09.03.2012, 15:40 +0100 schrieb Michael Olbrich:
> > On Fri, Mar 09, 2012 at 03:23:51PM +0100, Jan Weitzel wrote:
> > > Am Freitag, den 09.03.2012, 13:47 +0100 schrieb Michael Olbrich:
> > > > On Fri, Mar 09, 2012 at 11:02:44AM +0100, Jan Weitzel wrote:
> > > > > Am Donnerstag, den 08.03.2012, 14:23 +0100 schrieb Michael Olbrich:
> > > > > > On Thu, Feb 23, 2012 at 05:40:51PM +0100, Jan Weitzel wrote:
> > > > > > > Build MLO in $(BUILDDIR)/barebox_mlo-* with config
> > > > > > > PTXCONF_BAREBOX_MLO_CONFIG
> > > > > > > Default config is barebox_mlo.config.
> > > > > >
> > > > > > Applied.
> > > > > > I did some more modifications in another commit. Please check that
> > > > > > it still
> > > > > > works for you.
> > > > > No, version is missing in url. Fixed by a hint from you ;)
> > > > > I am going to send the patch.
> > > > >
> > > > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo
> > > >
> > > > Did you run "ptxdist oldconfig" first? If barebox is enabled the
> > > > PTXCONF_BAREBOX_MLO_VERSION defaults to PTXCONF_BAREBOX_VERSION. However
> > > > without oldconfig this will not be set.
> > > Hello, oldconfig didn't help:
> > >
> > > ~/git/ptxdist/bin/ptxdist oldconfig
> >
> > Sorry, I meant of course:
> > $ ptxdist oldconfig platform
>
> still the same error:
Arg, sorry my fault, I used the wrong config to test this. Now I get the
problem. I've pushed a fix to master.
Michael
> weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ ~/git/ptxdist/bin/ptxdist
> oldconfig platform
> weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ ~/git/ptxdist/bin/ptxdist
> targetinstall barebox_mlo
>
>
> target: barebox-.tar.bz2
>
>
> --2012-03-14 14:07:24--
> http://www.barebox.org/download/barebox-.tar.bz2
> ...
>
> > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo
> >
> > if it still does not work (or where ever your platformconfig is):
> >
> > $ grep BAREBOX selected_platformconfig
>
> weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ grep BAREBOX
> selected_platformconfig
> PTXCONF_BAREBOX=y
> PTXCONF_BAREBOX_VERSION="2011.12.0"
> PTXCONF_BAREBOX_MD5="a2f7725dfb5b15b2f3275663d663ab3b"
> PTXCONF_BAREBOX_CONFIG="barebox.config"
> PTXCONF_BAREBOX_ARCH_STRING="arm"
> PTXCONF_BAREBOX_EXTRA_ENV=y
> PTXCONF_BAREBOX_EXTRA_ENV_PATH="${PTXDIST_PLATFORMCONFIGDIR}/barebox-defaultenv"
> PTXCONF_BAREBOX_MLO=y
> PTXCONF_BAREBOX_MLO_VERSION="${BAREBOX_VERSION}"
> PTXCONF_BAREBOX_MLO_MD5="${BAREBOX_MD5}"
> PTXCONF_BAREBOX_MLO_ARCH_STRING="arm"
> PTXCONF_BAREBOX_MLO_CONFIG="barebox_mlo.config"
> # PTXCONF_BAREBOX_BBENV is not set
>
> Jan
> > 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
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/5 v4] [busybox] Pass extra platform CFLAGS to busybox make
On Wed, Mar 14, 2012 at 02:38:18PM +0100, Remy Bohmer wrote: > Busybox make is not properly called in case: > * compiler name tuple does not match target tuple (as used in multilib > compilers, for example: i686-pc-linux-gnu-gcc can compile for > x86_64-unknown-linux-gnu targets. To solve this the 'SUBARCH' need to be > set) > * CONFIG_EXTRA_CFLAGS need to e set to select the proper sysroot to > compile against in busybox > * LDFLAGS to link against the proper sysroot. > > Signed-off-by: Remy Bohmer > --- > v2: Reworked review comments from Michael Olbrich > v3: Convert spaces->tabs + Added '\' after CFLAGS line > checked after build if build-target/busybox/busybox remains unstripped. > v4: My authors email-address was wrong Sorry, to late. I already applied the last version. Michael > rules/busybox.make | 13 - > 1 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/rules/busybox.make b/rules/busybox.make > index 536aa80..54b5367 100644 > --- a/rules/busybox.make > +++ b/rules/busybox.make > @@ -49,14 +49,17 @@ $(STATEDIR)/busybox.prepare: > > BUSYBOX_MAKE_OPT := \ > ARCH=$(PTXCONF_ARCH_STRING) \ > + SUBARCH=$(PTXCONF_ARCH_STRING) \ > CROSS_COMPILE=$(COMPILER_PREFIX) \ > - CONFIG_EXTRA_CFLAGS="$(CROSS_CFLAGS)" \ > - HOSTCC=$(HOSTCC) \ > + HOSTCC=$(HOSTCC) > + > +BUSYBOX_MAKE_ENV := \ > + $(CROSS_ENV) \ > + CFLAGS="$(CROSS_CFLAGS) -I$(KERNEL_HEADERS_INCLUDE_DIR)" \ > SKIP_STRIP=y > > -ifdef PTXCONF_BUSYBOX_RFKILL > -BUSYBOX_MAKE_OPT += CFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR)" > -endif > +BUSYBOX_INSTAL_ENV := \ > + $(BUSYBOX_MAKE_ENV) > > BUSYBOX_INSTALL_OPT := \ > $(BUSYBOX_MAKE_OPT) \ > -- > 1.7.0.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
[ptxdist] [PATCH 3/5 v4] [busybox] Pass extra platform CFLAGS to busybox make
Busybox make is not properly called in case: * compiler name tuple does not match target tuple (as used in multilib compilers, for example: i686-pc-linux-gnu-gcc can compile for x86_64-unknown-linux-gnu targets. To solve this the 'SUBARCH' need to be set) * CONFIG_EXTRA_CFLAGS need to e set to select the proper sysroot to compile against in busybox * LDFLAGS to link against the proper sysroot. Signed-off-by: Remy Bohmer --- v2: Reworked review comments from Michael Olbrich v3: Convert spaces->tabs + Added '\' after CFLAGS line checked after build if build-target/busybox/busybox remains unstripped. v4: My authors email-address was wrong rules/busybox.make | 13 - 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rules/busybox.make b/rules/busybox.make index 536aa80..54b5367 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -49,14 +49,17 @@ $(STATEDIR)/busybox.prepare: BUSYBOX_MAKE_OPT := \ ARCH=$(PTXCONF_ARCH_STRING) \ + SUBARCH=$(PTXCONF_ARCH_STRING) \ CROSS_COMPILE=$(COMPILER_PREFIX) \ - CONFIG_EXTRA_CFLAGS="$(CROSS_CFLAGS)" \ - HOSTCC=$(HOSTCC) \ + HOSTCC=$(HOSTCC) + +BUSYBOX_MAKE_ENV := \ + $(CROSS_ENV) \ + CFLAGS="$(CROSS_CFLAGS) -I$(KERNEL_HEADERS_INCLUDE_DIR)" \ SKIP_STRIP=y -ifdef PTXCONF_BUSYBOX_RFKILL -BUSYBOX_MAKE_OPT += CFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR)" -endif +BUSYBOX_INSTAL_ENV := \ + $(BUSYBOX_MAKE_ENV) BUSYBOX_INSTALL_OPT := \ $(BUSYBOX_MAKE_OPT) \ -- 1.7.0.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Build MLO from barebox sources
Am Freitag, den 09.03.2012, 15:40 +0100 schrieb Michael Olbrich:
> On Fri, Mar 09, 2012 at 03:23:51PM +0100, Jan Weitzel wrote:
> > Am Freitag, den 09.03.2012, 13:47 +0100 schrieb Michael Olbrich:
> > > On Fri, Mar 09, 2012 at 11:02:44AM +0100, Jan Weitzel wrote:
> > > > Am Donnerstag, den 08.03.2012, 14:23 +0100 schrieb Michael Olbrich:
> > > > > On Thu, Feb 23, 2012 at 05:40:51PM +0100, Jan Weitzel wrote:
> > > > > > Build MLO in $(BUILDDIR)/barebox_mlo-* with config
> > > > > > PTXCONF_BAREBOX_MLO_CONFIG
> > > > > > Default config is barebox_mlo.config.
> > > > >
> > > > > Applied.
> > > > > I did some more modifications in another commit. Please check that it
> > > > > still
> > > > > works for you.
> > > > No, version is missing in url. Fixed by a hint from you ;)
> > > > I am going to send the patch.
> > > >
> > > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo
> > >
> > > Did you run "ptxdist oldconfig" first? If barebox is enabled the
> > > PTXCONF_BAREBOX_MLO_VERSION defaults to PTXCONF_BAREBOX_VERSION. However
> > > without oldconfig this will not be set.
> > Hello, oldconfig didn't help:
> >
> > ~/git/ptxdist/bin/ptxdist oldconfig
>
> Sorry, I meant of course:
> $ ptxdist oldconfig platform
still the same error:
weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ ~/git/ptxdist/bin/ptxdist
oldconfig platform
weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ ~/git/ptxdist/bin/ptxdist
targetinstall barebox_mlo
target: barebox-.tar.bz2
--2012-03-14 14:07:24--
http://www.barebox.org/download/barebox-.tar.bz2
...
> > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo
>
> if it still does not work (or where ever your platformconfig is):
>
> $ grep BAREBOX selected_platformconfig
weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ grep BAREBOX
selected_platformconfig
PTXCONF_BAREBOX=y
PTXCONF_BAREBOX_VERSION="2011.12.0"
PTXCONF_BAREBOX_MD5="a2f7725dfb5b15b2f3275663d663ab3b"
PTXCONF_BAREBOX_CONFIG="barebox.config"
PTXCONF_BAREBOX_ARCH_STRING="arm"
PTXCONF_BAREBOX_EXTRA_ENV=y
PTXCONF_BAREBOX_EXTRA_ENV_PATH="${PTXDIST_PLATFORMCONFIGDIR}/barebox-defaultenv"
PTXCONF_BAREBOX_MLO=y
PTXCONF_BAREBOX_MLO_VERSION="${BAREBOX_VERSION}"
PTXCONF_BAREBOX_MLO_MD5="${BAREBOX_MD5}"
PTXCONF_BAREBOX_MLO_ARCH_STRING="arm"
PTXCONF_BAREBOX_MLO_CONFIG="barebox_mlo.config"
# PTXCONF_BAREBOX_BBENV is not set
Jan
> 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
Re: [ptxdist] [PATCH] configure.ac: Improve curses searching
On Mon, Mar 12, 2012 at 09:59:50AM +0100, Michael Olbrich wrote: > On Thu, Mar 08, 2012 at 11:07:12AM +0100, Ladislav Michl wrote: > > This is a resend of an older patch: > > http://www.mail-archive.com/ptxdist@pengutronix.de/msg03400.html > > > > Cygwin-1.7 places curses headers into /usr/include/ncurses. > > Tested on Debian, MinGW with pdcurses and Cygwin. > > any reason, why you changed the search order to look for curses first? > > Michael I'm fine with dropping that change. For mconf, curses is fine. On systems with ncurses, curses just symlinks to them. Changing order just allows mconf to link to default curses-type library, whereas ncurses explicitely links to ncurses if it is installed. ladis -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/5 v3] [busybox] Pass extra platform CFLAGS to busybox make
From: Remy Bohmer Busybox make is not properly called in case: * compiler name tuple does not match target tuple (as used in multilib compilers, for example: i686-pc-linux-gnu-gcc can compile for x86_64-unknown-linux-gnu targets. To solve this the 'SUBARCH' need to be set) * CONFIG_EXTRA_CFLAGS need to e set to select the proper sysroot to compile against in busybox * LDFLAGS to link against the proper sysroot. Signed-off-by: Remy Bohmer --- v2: Reworked review comments from Michael Olbrich v3: Convert spaces->tabs + Added '\' after CFLAGS line checked after build if build-target/busybox/busybox remains unstripped. rules/busybox.make | 13 - 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rules/busybox.make b/rules/busybox.make index 536aa80..54b5367 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -49,14 +49,17 @@ $(STATEDIR)/busybox.prepare: BUSYBOX_MAKE_OPT := \ ARCH=$(PTXCONF_ARCH_STRING) \ + SUBARCH=$(PTXCONF_ARCH_STRING) \ CROSS_COMPILE=$(COMPILER_PREFIX) \ - CONFIG_EXTRA_CFLAGS="$(CROSS_CFLAGS)" \ - HOSTCC=$(HOSTCC) \ + HOSTCC=$(HOSTCC) + +BUSYBOX_MAKE_ENV := \ + $(CROSS_ENV) \ + CFLAGS="$(CROSS_CFLAGS) -I$(KERNEL_HEADERS_INCLUDE_DIR)" \ SKIP_STRIP=y -ifdef PTXCONF_BUSYBOX_RFKILL -BUSYBOX_MAKE_OPT += CFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR)" -endif +BUSYBOX_INSTAL_ENV := \ + $(BUSYBOX_MAKE_ENV) BUSYBOX_INSTALL_OPT := \ $(BUSYBOX_MAKE_OPT) \ -- 1.7.0.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/5 v2] [busybox] Pass extra platform CFLAGS to busybox make
Hi, 2012/3/14 Michael Olbrich : >> >> Indent with on everywhere. OK >> > + >> > +BUSYBOX_MAKE_ENV := \ >> > + $(CROSS_ENV) \ >> > + CFLAGS="$(CROSS_CFLAGS) -I$(KERNEL_HEADERS_INCLUDE_DIR)" >> > + SKIP_STRIP=y >> >> Looks like SKIP_STRIP=y must be in BUSYBOX_MAKE_OPT, or it's not used. > > No wait, you're just missing '\' at the end of the previous line. Fun :-) I just copied your proposal and tested if it did what it needed to do... I will fix it and repost a new patch version. Thanks. Kind regards, Remy -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/5 v2] [busybox] Pass extra platform CFLAGS to busybox make
On Wed, Mar 14, 2012 at 11:42:51AM +0100, Michael Olbrich wrote: > On Tue, Mar 13, 2012 at 10:32:16PM +0100, Remy Bohmer wrote: > > Busybox make is not properly called in case: > > * compiler name tuple does not match target tuple (as used in multilib > > compilers, for example: i686-pc-linux-gnu-gcc can compile for > > x86_64-unknown-linux-gnu targets. To solve this the 'SUBARCH' need to be > > set) > > * CONFIG_EXTRA_CFLAGS need to e set to select the proper sysroot to > > compile against in busybox > > * LDFLAGS to link against the proper sysroot. > > > > Signed-off-by: Remy Bohmer > > --- > > v2: Reworked review comments from Michael Olbrich > > > > rules/busybox.make | 21 - > > 1 files changed, 12 insertions(+), 9 deletions(-) > > > > diff --git a/rules/busybox.make b/rules/busybox.make > > index 536aa80..45fd20f 100644 > > --- a/rules/busybox.make > > +++ b/rules/busybox.make > > @@ -48,15 +48,18 @@ $(STATEDIR)/busybox.prepare: > > @$(call touch) > > > > BUSYBOX_MAKE_OPT := \ > > - ARCH=$(PTXCONF_ARCH_STRING) \ > > - CROSS_COMPILE=$(COMPILER_PREFIX) \ > > - CONFIG_EXTRA_CFLAGS="$(CROSS_CFLAGS)" \ > > - HOSTCC=$(HOSTCC) \ > > - SKIP_STRIP=y > > - > > -ifdef PTXCONF_BUSYBOX_RFKILL > > -BUSYBOX_MAKE_OPT += CFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR)" > > -endif > > + ARCH=$(PTXCONF_ARCH_STRING) \ > > + SUBARCH=$(PTXCONF_ARCH_STRING) \ > > + CROSS_COMPILE=$(COMPILER_PREFIX) \ > > + HOSTCC=$(HOSTCC) > > Indent with on everywhere. > > > + > > +BUSYBOX_MAKE_ENV := \ > > + $(CROSS_ENV) \ > > + CFLAGS="$(CROSS_CFLAGS) -I$(KERNEL_HEADERS_INCLUDE_DIR)" > > + SKIP_STRIP=y > > Looks like SKIP_STRIP=y must be in BUSYBOX_MAKE_OPT, or it's not used. No wait, you're just missing '\' at the end of the previous line. Michael > > + > > +BUSYBOX_INSTAL_ENV := \ > > install with 2 'L' > > Michael > > > + $(BUSYBOX_MAKE_ENV) > > > > BUSYBOX_INSTALL_OPT := \ > > $(BUSYBOX_MAKE_OPT) \ > > -- > > 1.7.5.4 -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/5 v2] [busybox] Pass extra platform CFLAGS to busybox make
On Tue, Mar 13, 2012 at 10:32:16PM +0100, Remy Bohmer wrote: > Busybox make is not properly called in case: > * compiler name tuple does not match target tuple (as used in multilib > compilers, for example: i686-pc-linux-gnu-gcc can compile for > x86_64-unknown-linux-gnu targets. To solve this the 'SUBARCH' need to be > set) > * CONFIG_EXTRA_CFLAGS need to e set to select the proper sysroot to > compile against in busybox > * LDFLAGS to link against the proper sysroot. > > Signed-off-by: Remy Bohmer > --- > v2: Reworked review comments from Michael Olbrich > > rules/busybox.make | 21 - > 1 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/rules/busybox.make b/rules/busybox.make > index 536aa80..45fd20f 100644 > --- a/rules/busybox.make > +++ b/rules/busybox.make > @@ -48,15 +48,18 @@ $(STATEDIR)/busybox.prepare: > @$(call touch) > > BUSYBOX_MAKE_OPT := \ > - ARCH=$(PTXCONF_ARCH_STRING) \ > - CROSS_COMPILE=$(COMPILER_PREFIX) \ > - CONFIG_EXTRA_CFLAGS="$(CROSS_CFLAGS)" \ > - HOSTCC=$(HOSTCC) \ > - SKIP_STRIP=y > - > -ifdef PTXCONF_BUSYBOX_RFKILL > -BUSYBOX_MAKE_OPT += CFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR)" > -endif > + ARCH=$(PTXCONF_ARCH_STRING) \ > + SUBARCH=$(PTXCONF_ARCH_STRING) \ > + CROSS_COMPILE=$(COMPILER_PREFIX) \ > + HOSTCC=$(HOSTCC) Indent with on everywhere. > + > +BUSYBOX_MAKE_ENV := \ > + $(CROSS_ENV) \ > + CFLAGS="$(CROSS_CFLAGS) -I$(KERNEL_HEADERS_INCLUDE_DIR)" > + SKIP_STRIP=y Looks like SKIP_STRIP=y must be in BUSYBOX_MAKE_OPT, or it's not used. > + > +BUSYBOX_INSTAL_ENV := \ install with 2 'L' Michael > + $(BUSYBOX_MAKE_ENV) > > BUSYBOX_INSTALL_OPT := \ > $(BUSYBOX_MAKE_OPT) \ > -- > 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
[ptxdist] [PATCH V2 1/3] libmikmod: add package
needed to extend SDL capabilities for tracker music. Signed-off-by: Wolfram Sang --- * dropped unused patches * added patch headers patches/libmikmod-3.1.12/CVE-2010-2971.patch | 33 +++ patches/libmikmod-3.1.12/ldflags.patch | 19 +++ patches/libmikmod-3.1.12/series |2 + rules/libmikmod.in |8 +++ rules/libmikmod.make | 76 ++ 5 files changed, 138 insertions(+), 0 deletions(-) create mode 100644 patches/libmikmod-3.1.12/CVE-2010-2971.patch create mode 100644 patches/libmikmod-3.1.12/ldflags.patch create mode 100644 patches/libmikmod-3.1.12/series create mode 100644 rules/libmikmod.in create mode 100644 rules/libmikmod.make diff --git a/patches/libmikmod-3.1.12/CVE-2010-2971.patch b/patches/libmikmod-3.1.12/CVE-2010-2971.patch new file mode 100644 index 000..e712ed0 --- /dev/null +++ b/patches/libmikmod-3.1.12/CVE-2010-2971.patch @@ -0,0 +1,33 @@ +From: Wolfram Sang +Subject: libmikmod: apply patch for CVE-2010-2971 + +Signed-off-by: Chris Larson + +Taken from OpenEmbedded (4880cfd0217466c737c14f5fe7687baa0a01c00d) + +Signed-off-by: Wolfram Sang + +--- + loaders/load_it.c |4 + 1 file changed, 4 insertions(+) + +--- libmikmod-3.1.12.orig/loaders/load_it.c libmikmod-3.1.12/loaders/load_it.c +@@ -743,6 +743,8 @@ BOOL IT_Load(BOOL curious) + #define IT_LoadEnvelope(name,type) \ + ih. name##flg =_mm_read_UBYTE(modreader); \ + ih. name##pts =_mm_read_UBYTE(modreader); \ ++ if (ih. name##pts > ITENVCNT) \ ++ ih. name##pts = ITENVCNT; \ + ih. name##beg =_mm_read_UBYTE(modreader); \ + ih. name##end =_mm_read_UBYTE(modreader); \ + ih. name##susbeg=_mm_read_UBYTE(modreader); \ +@@ -756,6 +758,8 @@ BOOL IT_Load(BOOL curious) + #define IT_LoadEnvelope(name,type) \ + ih. name/**/flg =_mm_read_UBYTE(modreader); \ + ih. name/**/pts =_mm_read_UBYTE(modreader); \ ++ if (ih. name/**/pts > ITENVCNT) \ ++ ih. name/**/pts = ITENVCNT; \ + ih. name/**/beg =_mm_read_UBYTE(modreader); \ + ih. name/**/end =_mm_read_UBYTE(modreader); \ + ih. name/**/susbeg=_mm_read_UBYTE(modreader); \ diff --git a/patches/libmikmod-3.1.12/ldflags.patch b/patches/libmikmod-3.1.12/ldflags.patch new file mode 100644 index 000..0236256 --- /dev/null +++ b/patches/libmikmod-3.1.12/ldflags.patch @@ -0,0 +1,19 @@ +From: Wolfram Sang +Subject: libmikmod: add LDFLAGS + +Taken from OpenEmbedded (c7a2bcb77ed92c0731bb696e0909ef3184a568e7) + +Signed-off-by: Wolfram Sang + +diff -urN libmikmod-3.1.12.orig/libmikmod/Makefile.in libmikmod-3.1.12/libmikmod/Makefile.in +--- libmikmod-3.1.12.orig/libmikmod/Makefile.in2004-01-21 17:43:52.0 + libmikmod-3.1.12/libmikmod/Makefile.in 2009-04-02 11:28:01.0 + +@@ -72,7 +72,7 @@ + rm -f Makefile + + $(LIB): $(OBJ) +- $(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir) ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir) + + dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \ + $(top_srcdir)/dlapi/dlfcn.h diff --git a/patches/libmikmod-3.1.12/series b/patches/libmikmod-3.1.12/series new file mode 100644 index 000..d921086 --- /dev/null +++ b/patches/libmikmod-3.1.12/series @@ -0,0 +1,2 @@ +ldflags.patch +CVE-2010-2971.patch diff --git a/rules/libmikmod.in b/rules/libmikmod.in new file mode 100644 index 000..dc29e0f --- /dev/null +++ b/rules/libmikmod.in @@ -0,0 +1,8 @@ +## SECTION=multimedia_sound + +config LIBMIKMOD + tristate + prompt "libmikmod" + help + libmikmod is a module player library supporting many formats, + including mod, s3m, it, and xm. diff --git a/rules/libmikmod.make b/rules/libmikmod.make new file mode 100644 index 000..bdc1bdc --- /dev/null +++ b/rules/libmikmod
[ptxdist] newer version of berlios-can-utils
Hello, I'm thinking about a new release of berlios-can-utils. The current version has a buggy slcand which is fixed upstream. But the project has no download URL and moved recently to http://gitorious.org/linux-can/can-utils. How shall the download then be handled as IIRC git snapshot URLs are not recommended. Best regards, Alexander -- Dipl.-Inf. Alexander Stein SYS TEC electronic GmbH August-Bebel-Str. 29 D-07973 Greiz Tel: +49-3661-6279-0, Fax: +49-3661-6279-99 eMail:alexander.st...@systec-electronic.com Internet: http://www.systec-electronic.com Managing Director: Dipl.-Phys. Siegmar Schmidt Commercial registry: Amtsgericht Jena, HRB 205563 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] file: security update to version 5.11
On Tue, Mar 13, 2012 at 06:23:39PM +0100, Alexander Dahl wrote: > > Signed-off-by: Alexander Dahl Tnx. Applied. Michael > --- > rules/file.make |4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/rules/file.make b/rules/file.make > index 8840bc4..5c7d739 100644 > --- a/rules/file.make > +++ b/rules/file.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_FILE) += file > # > # Paths and names > # > -FILE_VERSION := 5.06 > -FILE_MD5 := deb12b0fb9d09e7681be72bad6eba4e0 > +FILE_VERSION := 5.11 > +FILE_MD5 := 16a407bd66d6c7a832f3a5c0d609c27b > FILE := file-$(FILE_VERSION) > FILE_SUFFIX := tar.gz > FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) > -- > 1.7.2.5 > > > -- > 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] [PATCH v2] mtd-utils update / fixes
On Tue, Mar 13, 2012 at 08:45:57PM +0100, Bernhard Walle wrote: > This is the 2nd/3rd version of the patches. Hopefully the last round. > > Sorry for the confusion today. Too many machines, branches and too much work > at > the same time. :( No problem. The series file still referred to the 3rd patch. I've fixed that and applied both patches. 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
Re: [ptxdist] [PATCH 1/2] dropbear: security update to version 2012.55
On Tue, Mar 13, 2012 at 06:23:38PM +0100, Alexander Dahl wrote: > > Signed-off-by: Alexander Dahl Tnx. Applied. Michael > --- > rules/dropbear.make |4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/rules/dropbear.make b/rules/dropbear.make > index a3ba905..fe52ad8 100644 > --- a/rules/dropbear.make > +++ b/rules/dropbear.make > @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear > # > # Paths and names > # > -DROPBEAR_VERSION := 0.53.1 > -DROPBEAR_MD5 := 0284ea239083f04c8b874e08e1aca243 > +DROPBEAR_VERSION := 2012.55 > +DROPBEAR_MD5 := 8c784baec3054cdb1bb4bfa792c87812 > DROPBEAR := dropbear-$(DROPBEAR_VERSION) > DROPBEAR_SUFFIX := tar.bz2 > DROPBEAR_URL := > http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) > -- > 1.7.2.5 > > > -- > 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
[ptxdist] [PATCH 3/3] supertux: add library for music
Signed-off-by: Wolfram Sang --- rules/supertux.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rules/supertux.in b/rules/supertux.in index 67e2698..cce88f8 100644 --- a/rules/supertux.in +++ b/rules/supertux.in @@ -5,6 +5,7 @@ config SUPERTUX select GCCLIBS_CXX select GCCLIBS_GCC_S select SDL_MIXER + select SDL_MIXER_MOD select SDL_IMAGE select SDL_JOYSTICK select SDL_IMAGE__PNG -- 1.7.9.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/3] libmikmod: add package
needed to extend SDL capabilities for tracker music. Signed-off-by: Wolfram Sang --- patches/libmikmod-3.1.12/CVE-2010-2971.patch | 24 +++ patches/libmikmod-3.1.12/autofoo.patch | 16 ++ patches/libmikmod-3.1.12/ldflags.patch | 12 ++ patches/libmikmod-3.1.12/m4.patch| 197 ++ patches/libmikmod-3.1.12/series |5 + rules/libmikmod.in |8 + rules/libmikmod.make | 76 ++ 7 files changed, 338 insertions(+), 0 deletions(-) create mode 100644 patches/libmikmod-3.1.12/CVE-2010-2971.patch create mode 100644 patches/libmikmod-3.1.12/autofoo.patch create mode 100644 patches/libmikmod-3.1.12/ldflags.patch create mode 100644 patches/libmikmod-3.1.12/m4.patch create mode 100644 patches/libmikmod-3.1.12/series create mode 100644 rules/libmikmod.in create mode 100644 rules/libmikmod.make diff --git a/patches/libmikmod-3.1.12/CVE-2010-2971.patch b/patches/libmikmod-3.1.12/CVE-2010-2971.patch new file mode 100644 index 000..94ea8f5 --- /dev/null +++ b/patches/libmikmod-3.1.12/CVE-2010-2971.patch @@ -0,0 +1,24 @@ +--- + loaders/load_it.c |4 + 1 file changed, 4 insertions(+) + +--- libmikmod-3.1.12.orig/loaders/load_it.c libmikmod-3.1.12/loaders/load_it.c +@@ -743,6 +743,8 @@ BOOL IT_Load(BOOL curious) + #define IT_LoadEnvelope(name,type) \ + ih. name##flg =_mm_read_UBYTE(modreader); \ + ih. name##pts =_mm_read_UBYTE(modreader); \ ++ if (ih. name##pts > ITENVCNT) \ ++ ih. name##pts = ITENVCNT; \ + ih. name##beg =_mm_read_UBYTE(modreader); \ + ih. name##end =_mm_read_UBYTE(modreader); \ + ih. name##susbeg=_mm_read_UBYTE(modreader); \ +@@ -756,6 +758,8 @@ BOOL IT_Load(BOOL curious) + #define IT_LoadEnvelope(name,type) \ + ih. name/**/flg =_mm_read_UBYTE(modreader); \ + ih. name/**/pts =_mm_read_UBYTE(modreader); \ ++ if (ih. name/**/pts > ITENVCNT) \ ++ ih. name/**/pts = ITENVCNT; \ + ih. name/**/beg =_mm_read_UBYTE(modreader); \ + ih. name/**/end =_mm_read_UBYTE(modreader); \ + ih. name/**/susbeg=_mm_read_UBYTE(modreader); \ diff --git a/patches/libmikmod-3.1.12/autofoo.patch b/patches/libmikmod-3.1.12/autofoo.patch new file mode 100644 index 000..22d8170 --- /dev/null +++ b/patches/libmikmod-3.1.12/autofoo.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libmikmod-3.2.0-beta2/configure.in~autofoo libmikmod-3.2.0-beta2/configure.in +@@ -415,8 +415,6 @@ + + AC_CHECK_FUNCS(setenv snprintf srandom) + AC_REPLACE_FUNCS(strcasecmp strdup strstr) +-# Change extension, as we use libtool +-LIBOBJS="`echo $LIBOBJS|sed -e 's/\.o/\.lo/g'`" + + AC_HEADER_EGREP(srandom,math.h,AC_DEFINE(SRANDOM_IN_MATH_H)) + diff --git a/patches/libmikmod-3.1.12/ldflags.patch b/patches/libmikmod-3.1.12/ldflags.patch new file mode 100644 index 000..4261379 --- /dev/null +++ b/patches/libmikmod-3.1.12/ldflags.patch @@ -0,0 +1,12 @@ +diff -urN libmikmod-3.1.12.orig/libmikmod/Makefile.in libmikmod-3.1.12/libmikmod/Makefile.in +--- libmikmod-3.1.12.orig/libmikmod/Makefile.in2004-01-21 17:43:52.0 + libmikmod-3.1.12/libmikmod/Makefile.in 2009-04-02 11:28:01.0 + +@@ -72,7 +72,7 @@ + rm -f Makefile + + $(LIB): $(OBJ) +- $(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir) ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir) + + dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \ + $(top_srcdir)/dlapi/dlfcn.h diff --git a/patches/libmikmod-3.1.12/m4.patch b/patches/libmikmod-3.1.12/m4.patch new file mode 100644 index 000..ac7f2d7 --- /dev/null +++ b/patches/libmikmod-3.1.12/m4.patch @@ -0,0 +1,197 @@ +--- /dev/null libmikmod-3.2.0-beta2/m4/esd.m4 +@@ -0,0 +1,194 @@ ++# Configure paths for ESD ++# Manish Sin
[ptxdist] [PATCH 2/3] sdl_mixer: enable MOD support
Signed-off-by: Wolfram Sang --- rules/sdl_mixer.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/sdl_mixer.in b/rules/sdl_mixer.in index c3c3f37..f329a71 100644 --- a/rules/sdl_mixer.in +++ b/rules/sdl_mixer.in @@ -6,6 +6,7 @@ menuconfig SDL_MIXER select SDL select LIBVORBISif SDL_MIXER_OGG select LIBMAD if SDL_MIXER_MP3 + select LIBMIKMODif SDL_MIXER_MOD select FLAC if SDL_MIXER_FLAC help @@ -22,7 +23,6 @@ config SDL_MIXER_WAVE config SDL_MIXER_MOD bool - depends on BROKEN prompt "MOD support" config SDL_MIXER_MIDI_TIMIDITY -- 1.7.9.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 0/3] have 'supertux' with music
Here is a small series which adds libmikmod to ptxdist which adds MOD capability to SDL which adds music to supertux \o/ Wolfram Sang (3): libmikmod: add package sdl_mixer: enable MOD support supertux: add library for music patches/libmikmod-3.1.12/CVE-2010-2971.patch | 24 +++ patches/libmikmod-3.1.12/autofoo.patch | 16 ++ patches/libmikmod-3.1.12/ldflags.patch | 12 ++ patches/libmikmod-3.1.12/m4.patch| 197 ++ patches/libmikmod-3.1.12/series |5 + rules/libmikmod.in |8 + rules/libmikmod.make | 76 ++ rules/sdl_mixer.in |2 +- rules/supertux.in|1 + 9 files changed, 340 insertions(+), 1 deletions(-) create mode 100644 patches/libmikmod-3.1.12/CVE-2010-2971.patch create mode 100644 patches/libmikmod-3.1.12/autofoo.patch create mode 100644 patches/libmikmod-3.1.12/ldflags.patch create mode 100644 patches/libmikmod-3.1.12/m4.patch create mode 100644 patches/libmikmod-3.1.12/series create mode 100644 rules/libmikmod.in create mode 100644 rules/libmikmod.make -- 1.7.9.1 -- ptxdist mailing list ptxdist@pengutronix.de
