* [Buildroot] [PATCH] change getty port configuration
From: Yegor Yefremov @ 2010-09-29 13:37 UTC (permalink / raw)
To: buildroot
BR2_TARGET_GENERIC_GETTY_PORT has now a string type instead of choice.
This makes port configuration flexible and compact.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Index: b/target/generic/Config.in
===================================================================
--- a/target/generic/Config.in 2010-09-29 10:02:34.000000000 +0200
+++ b/target/generic/Config.in 2010-09-29 14:48:55.000000000 +0200
@@ -17,123 +17,11 @@
if BR2_TARGET_GENERIC_GETTY
-choice
- prompt "Serial port to run a getty on"
- default BR2_TARGET_GENERIC_GETTY_TTYS0
+config BR2_TARGET_GENERIC_GETTY_PORT
+ string "Serial port to run a getty on"
+ default "ttyS0"
help
- Select a port to run a getty (login prompt) on.
-
-config BR2_TARGET_GENERIC_GETTY_NONE
- bool "none"
-config BR2_TARGET_GENERIC_GETTY_TTYS0
- bool "ttyS0"
-config BR2_TARGET_GENERIC_GETTY_TTYS1
- bool "ttyS1"
-config BR2_TARGET_GENERIC_GETTY_TTYS2
- bool "ttyS2"
-config BR2_TARGET_GENERIC_GETTY_TTYS3
- bool "ttyS3"
-config BR2_TARGET_GENERIC_GETTY_TTYAMA0
- bool "ttyAMA0"
- depends on BR2_arm
-config BR2_TARGET_GENERIC_GETTY_TTYAMA1
- bool "ttyAMA1"
- depends on BR2_arm
-config BR2_TARGET_GENERIC_GETTY_TTYAMA2
- bool "ttyAMA2"
- depends on BR2_arm
-config BR2_TARGET_GENERIC_GETTY_TTYAMA3
- bool "ttyAMA3"
- depends on BR2_arm
-config BR2_TARGET_GENERIC_GETTY_TTYSAC0
- bool "ttySAC0"
- depends on BR2_arm
-config BR2_TARGET_GENERIC_GETTY_TTYSAC1
- bool "ttySAC1"
- depends on BR2_arm
-config BR2_TARGET_GENERIC_GETTY_TTYSAC2
- bool "ttySAC2"
- depends on BR2_arm
-config BR2_TARGET_GENERIC_GETTY_TTYSAC3
- bool "ttySAC3"
- depends on BR2_arm
-config BR2_TARGET_GENERIC_GETTY_TTYMXC0
- bool "ttymxc0"
- depends on BR2_arm
-config BR2_TARGET_GENERIC_GETTY_TTYMXC1
- bool "ttymxc1"
- depends on BR2_arm
-config BR2_TARGET_GENERIC_GETTY_TTYMXC2
- bool "ttymxc2"
- depends on BR2_arm
-config BR2_TARGET_GENERIC_GETTY_TTYUL0
- bool "ttyUL0"
- depends on BR2_powerpc
-config BR2_TARGET_GENERIC_GETTY_TTYUL1
- bool "ttyUL1"
- depends on BR2_powerpc
-config BR2_TARGET_GENERIC_GETTY_TTYUL2
- bool "ttyUL2"
- depends on BR2_powerpc
-config BR2_TARGET_GENERIC_GETTY_TTYUL3
- bool "ttyUL3"
- depends on BR2_powerpc
-config BR2_TARGET_GENERIC_GETTY_TTYPSC0
- bool "ttyPSC0"
- depends on BR2_powerpc
-config BR2_TARGET_GENERIC_GETTY_TTYPSC1
- bool "ttyPSC1"
- depends on BR2_powerpc
-config BR2_TARGET_GENERIC_GETTY_TTYPSC2
- bool "ttyPSC2"
- depends on BR2_powerpc
-config BR2_TARGET_GENERIC_GETTY_TTYPSC3
- bool "ttyPSC3"
- depends on BR2_powerpc
-config BR2_TARGET_GENERIC_GETTY_TTYCPM0
- bool "ttyCPM0"
- depends on BR2_powerpc
-config BR2_TARGET_GENERIC_GETTY_TTYCPM1
- bool "ttyCPM1"
- depends on BR2_powerpc
-config BR2_TARGET_GENERIC_GETTY_TTYCPM2
- bool "ttyCPM2"
- depends on BR2_powerpc
-config BR2_TARGET_GENERIC_GETTY_TTYCPM3
- bool "ttyCPM3"
- depends on BR2_powerpc
-endchoice
-
-config BR2_TARGET_GENERIC_GETTY_PORT
- string
- default "#ttyS0" if BR2_TARGET_GENERIC_GETTY_NONE
- default "ttyS0" if BR2_TARGET_GENERIC_GETTY_TTYS0
- default "ttyS1" if BR2_TARGET_GENERIC_GETTY_TTYS1
- default "ttyS2" if BR2_TARGET_GENERIC_GETTY_TTYS2
- default "ttyS3" if BR2_TARGET_GENERIC_GETTY_TTYS3
- default "ttyAMA0" if BR2_TARGET_GENERIC_GETTY_TTYAMA0
- default "ttyAMA1" if BR2_TARGET_GENERIC_GETTY_TTYAMA1
- default "ttyAMA2" if BR2_TARGET_GENERIC_GETTY_TTYAMA2
- default "ttyAMA3" if BR2_TARGET_GENERIC_GETTY_TTYAMA3
- default "ttySAC0" if BR2_TARGET_GENERIC_GETTY_TTYSAC0
- default "ttySAC1" if BR2_TARGET_GENERIC_GETTY_TTYSAC1
- default "ttySAC2" if BR2_TARGET_GENERIC_GETTY_TTYSAC2
- default "ttySAC3" if BR2_TARGET_GENERIC_GETTY_TTYSAC3
- default "ttymxc0" if BR2_TARGET_GENERIC_GETTY_TTYMXC0
- default "ttymxc1" if BR2_TARGET_GENERIC_GETTY_TTYMXC1
- default "ttymxc2" if BR2_TARGET_GENERIC_GETTY_TTYMXC2
- default "ttyUL0" if BR2_TARGET_GENERIC_GETTY_TTYUL0
- default "ttyUL1" if BR2_TARGET_GENERIC_GETTY_TTYUL1
- default "ttyUL2" if BR2_TARGET_GENERIC_GETTY_TTYUL2
- default "ttyUL3" if BR2_TARGET_GENERIC_GETTY_TTYUL3
- default "ttyPSC0" if BR2_TARGET_GENERIC_GETTY_TTYPSC0
- default "ttyPSC1" if BR2_TARGET_GENERIC_GETTY_TTYPSC1
- default "ttyPSC2" if BR2_TARGET_GENERIC_GETTY_TTYPSC2
- default "ttyPSC3" if BR2_TARGET_GENERIC_GETTY_TTYPSC3
- default "ttyCPM0" if BR2_TARGET_GENERIC_GETTY_TTYCPM0
- default "ttyCPM1" if BR2_TARGET_GENERIC_GETTY_TTYCPM1
- default "ttyCPM2" if BR2_TARGET_GENERIC_GETTY_TTYCPM2
- default "ttyCPM3" if BR2_TARGET_GENERIC_GETTY_TTYCPM3
+ Specify a port to run a getty (login prompt) on.
choice
prompt "Baudrate to use"
^ permalink raw reply
* [Buildroot] Libtool work: a tentative summary
From: Martin Banky @ 2010-09-29 19:59 UTC (permalink / raw)
To: buildroot
In-Reply-To: <AANLkTikZEe+tS3WtxULNLNq80QrVRy0U5XWzneRcHRnw@mail.gmail.com>
In the libtool heads up patch that I had sent, I didn't include some of the
preliminary work that I've been doing with libtool 2.4. I've been taking the
approach of both our methods. I'm autoreconfiguring the packages that don't
have issues, and patching the others with a modified
Makefile.autotools.inthat recognizes both 1.5 and 2.2 ltmain.sh files
and ignores the 2.4 ones.
If I remember correctly, the packages that I've had issues with
autoreconfiguring are expat, libusb, and libvorbis. I've not done a full
package build yet. I feel that Lionel has spent far more time on his
solution, than I have on mine. For me, I discovered the
buildroot-libtool.patch issue when I started upgrading some of the packages,
and didn't want to keep including a v2.2 patch for every package that needed
it. So, I just came up with this fast and easy method to solve this issue.
Currently, I'm working on converting the rest of the packages to either
autotargets or gentargets, and was planning on looking at incorporating
libtool 2.4 after this. That is, if Lionel hasn't already done something by
then.
Martin
On Wed, Sep 29, 2010 at 4:01 AM, Paulius Zaleckas <
paulius.zaleckas@gmail.com> wrote:
> On Wed, Sep 29, 2010 at 11:51 AM, Thomas Petazzoni
> <thomas.petazzoni@free-electrons.com> wrote:
> > Hello Paulius,
> >
> > On Wed, 29 Sep 2010 11:32:29 +0300
> > Paulius Zaleckas <paulius.zaleckas@gmail.com> wrote:
> >
> >> I would go for a conservative solution.
> >> The main reason here is compile speed.
> >> Currently my configuration takes ~1 hour to compile on my 4x3.4GHz
> >> machine with DDR3 RAM...
> >
> > Are you using internal toolchain or external toolchain ?
>
> internal
>
> >> The worst part here is that autoreconfigure and ./configure scripts
> doesn't
> >> scale on multicore CPU :(
> >> So adding a lot more autoreconfigure usage would drastically reduce
> >> build time.
> >
> > Thanks for your feedback.
> >
> > For what it's worth, I've started to experiment the modification of our
> > package infrastructure in order to use real file targets instead of
> > phony targets for the steps sequencing (download -> extract -> patch ->
> > configure, etc.). This is one of the requirements to be able to do
> > top-level parallel builds, which I think, definitely becomes necessary
> > to parallelize the autoreconf/configure steps of packages. This is
> > however a lot of work, and I don't expect this to be ready anytime soon.
> >
> > Regards,
> >
> > Thomas
> > --
> > Thomas Petazzoni, Free Electrons
> > Kernel, drivers, real-time and embedded Linux
> > development, consulting, training and support.
> > http://free-electrons.com
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
> >
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100929/ccb86115/attachment.html>
^ permalink raw reply
* [Buildroot] [PATCH 10/18] fconfig: convert to gentargets and bump to 20080329
From: Peter Korsgaard @ 2010-09-29 20:15 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-10-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Committed with minor tweaks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 1/6] coreutils: converted to autotarget
From: Martin Banky @ 2010-09-29 20:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20100929132354.69c0efed@surf>
On Wed, Sep 29, 2010 at 4:23 AM, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:
> Hello Martin,
>
> On Thu, 23 Sep 2010 19:54:59 -0700
> Martin Banky <martin.banky@gmail.com> wrote:
>
> > +#COREUTILS_SITE = ftp://alpha.gnu.org/gnu/coreutils/
>
> Remove this line.
>
> > +BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false hostname
> \
> > + ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \
> > + uname join
>
> The variable namespace is completely global in Buildroot, so I'd prefer
> to see this variable prefixed with COREUTILS_
>
> > +ifneq ($(BR2_ENABLE_LOCALE),y)
> > +define COREUTILS_REMOVE_LOCALE
> > + rm -rf $(TARGET_DIR)/share/locale
> > +endef
> > +COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_REMOVE_LOCALE
>
> Not needed, the top-level Makefile takes care of this.
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
Thomas,
I'll take care of this, and resubmit the patch set. Did you see any
other issues that need to be taken care of?
Martin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100929/651dea18/attachment.html>
^ permalink raw reply
* [Buildroot] [PATCH 11/18] gadgets-test: convert to gentargets
From: Peter Korsgaard @ 2010-09-29 20:27 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-11-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Committed with minor tweaks, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 15/18] liberation: convert to gentargets and bump to 1.06.0.20100721
From: Peter Korsgaard @ 2010-09-29 20:30 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-15-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] libdaemon; bump version
From: Peter Korsgaard @ 2010-09-29 20:40 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=799c1328234bca5c39249ee0fea7cc614c0be680
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 27 ++++++++++++++-------------
package/libdaemon/libdaemon.mk | 18 +++++++++---------
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/CHANGES b/CHANGES
index 6e6539c..345b927 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,19 +25,20 @@
bootutils, bridge-utils, bsdiff, busybox, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
ffmpeg, freetype, gamin, gawk, gperf, gtk2-themes, gtkperf,
- gvfs, haserl, hdparm, hostapd, hwdata, ifplugd, iperf, iproute2,
- iptables, jpeg, kexec, kismet, less, libcgi, libcurl, libdnet,
- libevent, libglade, libgtk2, libiconv, libidn, libmms, libnl,
- liboil, libpcap, libpng, libtool, libungif, libxml2, libxslt,
- lighttpd, lite, lm-sensors, logrotate, m4, mdadm, mesa3d,
- metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon,
- netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd,
- openssh, openvpn, oprofile, pango, patch, pcre, php,
- pkg-config, prboom, radvd, rdesktop, ruby, qt, samba, sawman,
- sdl_mixer, sdl_sound, setserial, shared-mime-info, speex,
- sqlite, squashfs, strace, sylpheed, taglib, tcpdump, thttpd,
- tiff, tn5250, udev, udpcast, usbmount, usbutils, vsftpd, vtun,
- which, wpa_supplicant,
+ gvfs, haserl, hdparm, hostapd, hwdata, ifplugd, iperf,
+ iproute2, iptables, jpeg, kexec, kismet, less, libcgi,
+ libcurl, libdaemon, libdnet, libevent, libglade, libgtk2,
+ libiconv, libidn, libmms, libnl, liboil, libpcap, libpng,
+ libtool, libungif, libxml2, libxslt, lighttpd, lite,
+ lm-sensors, logrotate, m4, mdadm, mesa3d, metacity, mtd-utils,
+ mysql_client, nano, nbd, ncftp, neon, netperf, netsnmp,
+ ng-spice-rework, ntfsprogs, ntp, openntpd, openssh, openvpn,
+ oprofile, pango, patch, pcre, php, pkg-config, prboom, radvd,
+ rdesktop, ruby, qt, samba, sawman, sdl_mixer, sdl_sound,
+ setserial, shared-mime-info, speex, sqlite, squashfs, strace,
+ sylpheed, taglib, tcpdump, thttpd, tiff, tn5250, udev,
+ udpcast, usbmount, usbutils, vsftpd, vtun, which,
+ wpa_supplicant,
xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
xdriver-xf86-input-{mouse,synaptics,vmmouse,void},
xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index 7a9d5c8..9a78bff 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -4,15 +4,15 @@
#
#############################################################
-LIBDAEMON_VERSION:=0.13
-LIBDAEMON_SOURCE:=libdaemon-$(LIBDAEMON_VERSION).tar.gz
-LIBDAEMON_SITE:=http://0pointer.de/lennart/projects/libdaemon/
-LIBDAEMON_AUTORECONF:=no
-LIBDAEMON_INSTALL_STAGING:=YES
-LIBDAEMON_INSTALL_TARGET:=YES
-LIBDAEMON_CONF_ENV:=ac_cv_func_setpgrp_void=no
-LIBDAEMON_CONF_OPT:=--disable-lynx
+LIBDAEMON_VERSION = 0.14
+LIBDAEMON_SOURCE = libdaemon-$(LIBDAEMON_VERSION).tar.gz
+LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon/
+LIBDAEMON_AUTORECONF = NO
+LIBDAEMON_LIBTOOL_PATCH = NO
+LIBDAEMON_INSTALL_STAGING = YES
+LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no
+LIBDAEMON_CONF_OPT = --disable-lynx
-LIBDAEMON_DEPENDENCIES:=host-pkg-config
+LIBDAEMON_DEPENDENCIES = host-pkg-config
$(eval $(call AUTOTARGETS,package,libdaemon))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] lockfile-progs: cleanup install/uninstall
From: Peter Korsgaard @ 2010-09-29 20:40 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=ccb974d7ea4a63ba3423e6bd7d91c18d02ea4fde
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Install/uninstall all programs (including mail-*), and use install -D
to copy to target.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/lockfile-progs/lockfile-progs.mk | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index c7b5565..f8d8cee 100644
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -7,16 +7,25 @@ LOCKFILE_PROGS_VERSION = 0.1.15
LOCKFILE_PROGS_SOURCE = lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz
LOCKFILE_PROGS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/l/lockfile-progs/
+LOCKFILE_BINS = \
+ $(addprefix lockfile-,check create remove touch) \
+ $(addprefix mail-,lock touchlock unlock)
+
define LOCKFILE_PROGS_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
endef
define LOCKFILE_PROGS_INSTALL_TARGET_CMDS
- cp -a $(@D)/bin/lockfile* $(TARGET_DIR)/usr/bin
+ for i in $(LOCKFILE_BINS); do \
+ install -D -m 755 $(@D)/bin/$$i $(TARGET_DIR)/usr/bin/$$i; \
+ done
+endef
+
+define LOCKFILE_PROGS_UNINSTALL_TARGET_CMDS
+ rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(LOCKFILE_BINS))
endef
define LOCKFILE_PROGS_CLEAN_CMDS
- -rm -f $(TARGET_DIR)/usr/bin/lockfile-*
-$(MAKE) -C $(@D) clean
endef
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] fconfig: convert to gentargets and bump to 20080329
From: Martin Banky @ 2010-09-29 20:40 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=e3da887298563ac77c6e60f55a0c919b0097906e
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: no strip, remove _BINARY vars, add homepage URL]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 6 +-
package/fconfig/Config.in | 1 +
package/fconfig/fconfig-listmode.patch | 177 --------------------------------
package/fconfig/fconfig.mk | 54 +++-------
4 files changed, 20 insertions(+), 218 deletions(-)
delete mode 100644 package/fconfig/fconfig-listmode.patch
diff --git a/CHANGES b/CHANGES
index 345b927..80c6a0f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,9 +24,9 @@
automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
bootutils, bridge-utils, bsdiff, busybox, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
- ffmpeg, freetype, gamin, gawk, gperf, gtk2-themes, gtkperf,
- gvfs, haserl, hdparm, hostapd, hwdata, ifplugd, iperf,
- iproute2, iptables, jpeg, kexec, kismet, less, libcgi,
+ fconfig, ffmpeg, freetype, gamin, gawk, gperf, gtk2-themes,
+ gtkperf, gvfs, haserl, hdparm, hostapd, hwdata, ifplugd,
+ iperf, iproute2, iptables, jpeg, kexec, kismet, less, libcgi,
libcurl, libdaemon, libdnet, libevent, libglade, libgtk2,
libiconv, libidn, libmms, libnl, liboil, libpcap, libpng,
libtool, libungif, libxml2, libxslt, lighttpd, lite,
diff --git a/package/fconfig/Config.in b/package/fconfig/Config.in
index e679c09..e7dd58a 100644
--- a/package/fconfig/Config.in
+++ b/package/fconfig/Config.in
@@ -3,3 +3,4 @@ config BR2_PACKAGE_FCONFIG
help
fconfig - get/set RedBoot configuration parameters from Linux.
+ http://andrzejekiert.ovh.org/software.html.en
diff --git a/package/fconfig/fconfig-listmode.patch b/package/fconfig/fconfig-listmode.patch
deleted file mode 100644
index e7f2418..0000000
--- a/package/fconfig/fconfig-listmode.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -x.svn -u fconfig/crunchfc.c ../../../snapgear_avila/user/fconfig/crunchfc.c
---- fconfig/crunchfc.c 2006-03-15 01:18:17.000000000 +1100
-+++ ../../../snapgear_avila/user/fconfig/crunchfc.c 2007-09-06 13:48:38.000000000 +1000
-@@ -320,6 +320,48 @@
- }
-
- /*
-+ * List known keys.
-+ */
-+int8_t list_keys(struct config_data *data)
-+{
-+ struct fconfig_key key;
-+ uint32_t len = data->reallen;
-+ uint8_t *keyptr = NULL;
-+ uint8_t *ptr = data->buf+8;
-+ uint8_t *ptrend = data->buf+len-9;
-+ printer_t printer;
-+
-+ while (ptr < ptrend-4) {
-+ keyptr = ptr;
-+ ptr = get_key(ptr, &key);
-+ if (ptr == NULL) {
-+ MESSAGE(VERB_LOW, "Error in structure\n");
-+ return -1;
-+ }
-+ if (ptr > ptrend) {
-+ MESSAGE(VERB_LOW, "Parser went out of struct!\n");
-+ return -1;
-+ }
-+
-+ if ((key.type == 0) && (key.namelen==0)) {
-+ MESSAGE(VERB_NORMAL, "EOF reached - key not found\n");
-+ return -1;
-+ }
-+
-+ print_key(&key, VERB_HIGH, data->swab);
-+
-+ printf("%s: ", key.keyname);
-+ printer = TYPE_PRINTER(key.type);
-+ if (printer == NULL) {
-+ MESSAGE(VERB_LOW, "Printer missing for type %d\n", key.type);
-+ return -1;
-+ }
-+ printer(key.dataval);
-+ printf("\n");
-+ }
-+}
-+
-+/*
- * Find a key with given nickname, check its type and set value
- * Assumes that verify_fconfig() has been called on 'data' before.
- */
-diff -x.svn -u fconfig/crunchfc.h ../../../snapgear_avila/user/fconfig/crunchfc.h
---- fconfig/crunchfc.h 2006-03-15 01:18:17.000000000 +1100
-+++ ../../../snapgear_avila/user/fconfig/crunchfc.h 2007-09-06 13:48:38.000000000 +1000
-@@ -31,6 +31,7 @@
- int8_t verify_fconfig(struct config_data *data);
- int8_t get_key_value(struct config_data *data, uint8_t *nickname);
- int8_t set_key_value(struct config_data *data, uint8_t *nickname, void *value);
-+int8_t list_keys(struct config_data *data);
- void recalculate_crc(struct config_data *data);
-
- #endif //CRUNCHFC_H
-diff -x.svn -u fconfig/fconfig.c ../../../snapgear_avila/user/fconfig/fconfig.c
---- fconfig/fconfig.c 2006-03-15 01:18:18.000000000 +1100
-+++ ../../../snapgear_avila/user/fconfig/fconfig.c 2007-09-06 13:48:38.000000000 +1000
-@@ -35,8 +35,9 @@
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <getopt.h>
-
- #include "debug.h"
- #include "ftypes.h"
- #include "crunchfc.h"
-
-@@ -72,7 +73,7 @@
- }
-
- fputs("Read or write Redboot configuration\n", stdout);
-- fputs("usage: fconfig [-r|-w] -d dev -n nickname -x value\n", stdout);
-+ fputs("usage: fconfig [-r|-w|-l] -d dev -n nickname -x value\n", stdout);
- fputs("'dev' may be a char device, block device or a file\n", stdout);
- fputs("Supported types: \n", stdout);
- for (i = 0; i < NUM_TYPES; i++) {
-@@ -181,7 +182,33 @@
- close_fconfig_handle(data);
- return 0;
-
--exit_fail:
-+exit_fail:
-+ close_fconfig_handle(data);
-+ return 1;
-+}
-+
-+/*
-+ * List mode of operation: list parameter values from the configuration.
-+ */
-+static int list_mode(struct config_data *data, uint8_t *device)
-+{
-+ if (get_fconfig_handle(data, device, O_RDONLY) == NULL) {
-+ MESSAGE(VERB_LOW, "Could not get a config data handle!\n");
-+ return 1;
-+ }
-+ if (verify_fconfig(data)) {
-+ MESSAGE(VERB_LOW, "Config verification failed!\n");
-+ goto exit_fail;
-+ }
-+
-+ if (list_keys(data)) {
-+ goto exit_fail;
-+ }
-+
-+ close_fconfig_handle(data);
-+ return 0;
-+
-+exit_fail:
- close_fconfig_handle(data);
- return 1;
- }
-@@ -189,6 +216,7 @@
- #define MODE_NONE 0
- #define MODE_WRITE 1
- #define MODE_READ 2
-+#define MODE_LIST 3
-
- /*
- * main(). ...nuff said.
-@@ -202,14 +230,17 @@
- uint8_t *value = NULL;
- uint8_t *device = NULL;
-
-- while ((c = getopt(argc, argv, "hrwvsd:n:x:")) != -1) {
-+ while ((c = getopt(argc, argv, "hrwlvsd:n:x:")) != -1) {
- switch (c) {
- case 'r':
- mode = MODE_READ;
- break;
-- case 'w':
-+ case 'w':
- mode = MODE_WRITE;
- break;
-+ case 'l':
-+ mode = MODE_LIST;
-+ break;
- case 'n':
- nickname = optarg;
- break;
-@@ -240,7 +271,7 @@
- MESSAGE(VERB_NORMAL, "Normal verbosity messages are printed.\n");
- MESSAGE(VERB_HIGH, "High verbosity messages are printed.\n");
-
-- if (nickname == NULL) {
-+ if (nickname == NULL && mode != MODE_LIST) {
- usage();
- exit(1);
- }
-@@ -251,13 +282,16 @@
- }
-
- switch (mode) {
-- case MODE_WRITE :
-+ case MODE_WRITE :
- ret = write_mode(&data, device, nickname, value);
- break;
-- case MODE_READ :
-+ case MODE_READ :
- ret = read_mode(&data, device, nickname);
- break;
-- default :
-+ case MODE_LIST :
-+ ret = list_mode(&data, device);
-+ break;
-+ default :
- MESSAGE(VERB_LOW, "Unknown mode of operation\n");
- usage();
- ret = 1;
diff --git a/package/fconfig/fconfig.mk b/package/fconfig/fconfig.mk
index 72f6c4a..c595678 100644
--- a/package/fconfig/fconfig.mk
+++ b/package/fconfig/fconfig.mk
@@ -3,48 +3,26 @@
# fconfig
#
#############################################################
-FCONFIG_VERSION:=20060419
-FCONFIG_SOURCE:=fconfig-$(FCONFIG_VERSION).tar.gz
-FCONFIG_SITE:=http://andrzejekiert.ovh.org/software/fconfig/
-FCONFIG_CAT:=$(ZCAT)
-FCONFIG_DIR:=$(BUILD_DIR)/fconfig
-FCONFIG_BINARY:=fconfig
-FCONFIG_TARGET_BINARY:=sbin/fconfig
+FCONFIG_VERSION = 20080329
+FCONFIG_SOURCE = fconfig-$(FCONFIG_VERSION).tar.gz
+FCONFIG_SITE = http://andrzejekiert.ovh.org/software/fconfig/
-$(DL_DIR)/$(FCONFIG_SOURCE):
- $(call DOWNLOAD,$(FCONFIG_SITE),$(FCONFIG_SOURCE))
-
-fconfig-source: $(DL_DIR)/$(FCONFIG_SOURCE)
-
-$(FCONFIG_DIR)/.unpacked: $(DL_DIR)/$(FCONFIG_SOURCE)
- $(FCONFIG_CAT) $(DL_DIR)/$(FCONFIG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FCONFIG_DIR) package/fconfig \*.patch
- touch $@
-
-$(FCONFIG_DIR)/$(FCONFIG_BINARY): $(FCONFIG_DIR)/.unpacked
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FCONFIG_DIR) \
+define FCONFIG_BUILD_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)"
+endef
-$(TARGET_DIR)/$(FCONFIG_TARGET_BINARY): $(FCONFIG_DIR)/$(FCONFIG_BINARY)
- rm -f $(TARGET_DIR)/$(FCONFIG_TARGET_BINARY)
- $(INSTALL) -D -m 0755 $(FCONFIG_DIR)/$(FCONFIG_BINARY) $(TARGET_DIR)/$(FCONFIG_TARGET_BINARY)
- $(STRIPCMD) $(STRIP_STRIP_ALL) $@
-
-fconfig: $(TARGET_DIR)/$(FCONFIG_TARGET_BINARY)
+define FCONFIG_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/fconfig $(TARGET_DIR)/sbin/fconfig
+endef
-fconfig-clean:
- -$(MAKE) -C $(FCONFIG_DIR) clean
- rm -f $(TARGET_DIR)/$(FCONFIG_TARGET_BINARY)
+define FCONFIG_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/sbin/fconfig
+endef
-fconfig-dirclean:
- rm -rf $(FCONFIG_DIR)
+define FCONFIG_CLEAN_CMDS
+ -$(MAKE) -C $(@D) clean
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_FCONFIG),y)
-TARGETS+=fconfig
-endif
+$(eval $(call GENTARGETS,package,fconfig))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] lockfile-progs: convert to gentargets and bump to 0.1.15
From: Martin Banky @ 2010-09-29 20:40 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=9793ea56615616589e2eccdab65c49aa501c2ed4
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: no strip, remove unused _BINARY var]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 18 ++++----
...ch => lockfile-progs-0.1.15-sus3v-legacy.patch} | 0
package/lockfile-progs/lockfile-progs.mk | 47 +++++--------------
3 files changed, 22 insertions(+), 43 deletions(-)
rename package/lockfile-progs/{lockfile-progs-0.1.11-sus3v-legacy.patch => lockfile-progs-0.1.15-sus3v-legacy.patch} (100%)
diff --git a/CHANGES b/CHANGES
index 907eab1..0ce74e4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,15 +30,15 @@
libcgi, libcurl, libdaemon, libdnet, liberation, libevent,
libglade, libgtk2, libiconv, libidn, libmms, libnl, liboil,
libpcap, libpng, libtool, libungif, libxml2, libxslt,
- lighttpd, lite, lm-sensors, logrotate, m4, mdadm, mesa3d,
- metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon,
- netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd,
- openssh, openvpn, oprofile, pango, patch, pcre, php,
- pkg-config, prboom, radvd, rdesktop, ruby, qt, samba, sawman,
- sdl_mixer, sdl_sound, setserial, shared-mime-info, speex,
- sqlite, squashfs, strace, sylpheed, taglib, tcpdump, thttpd,
- tiff, tn5250, udev, udpcast, usbmount, usbutils, vsftpd, vtun,
- which, wpa_supplicant,
+ lighttpd, lite, lm-sensors, lockfile-progs, logrotate, m4,
+ mdadm, mesa3d, metacity, mtd-utils, mysql_client, nano, nbd,
+ ncftp, neon, netperf, netsnmp, ng-spice-rework, ntfsprogs,
+ ntp, openntpd, openssh, openvpn, oprofile, pango, patch, pcre,
+ php, pkg-config, prboom, radvd, rdesktop, ruby, qt, samba,
+ sawman, sdl_mixer, sdl_sound, setserial, shared-mime-info,
+ speex, sqlite, squashfs, strace, sylpheed, taglib, tcpdump,
+ thttpd, tiff, tn5250, udev, udpcast, usbmount, usbutils,
+ vsftpd, vtun, which, wpa_supplicant,
xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
xdriver-xf86-input-{mouse,synaptics,vmmouse,void},
xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},
diff --git a/package/lockfile-progs/lockfile-progs-0.1.11-sus3v-legacy.patch b/package/lockfile-progs/lockfile-progs-0.1.15-sus3v-legacy.patch
similarity index 100%
rename from package/lockfile-progs/lockfile-progs-0.1.11-sus3v-legacy.patch
rename to package/lockfile-progs/lockfile-progs-0.1.15-sus3v-legacy.patch
diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index 3925ca3..c7b5565 100644
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -3,42 +3,21 @@
# lockfile-progs
#
#############################################################
-LOCKFILE_PROGS_VERSION=0.1.11-0.1
-LOCKFILE_PROGS_SOURCE:=lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz
-LOCKFILE_PROGS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/l/lockfile-progs/
-LOCKFILE_PROGS_CAT:=$(ZCAT)
-LOCKFILE_PROGS_DIR:=$(BUILD_DIR)/lockfile-progs-0.1.11
-LOCKFILE_PROGS_BINARY:=usr/bin/lockfile-create
+LOCKFILE_PROGS_VERSION = 0.1.15
+LOCKFILE_PROGS_SOURCE = lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz
+LOCKFILE_PROGS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/l/lockfile-progs/
-$(DL_DIR)/$(LOCKFILE_PROGS_SOURCE):
- $(call DOWNLOAD,$(LOCKFILE_PROGS_SITE),$(LOCKFILE_PROGS_SOURCE))
+define LOCKFILE_PROGS_BUILD_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
-lockfile-progs-source: $(DL_DIR)/$(LOCKFILE_PROGS_SOURCE)
+define LOCKFILE_PROGS_INSTALL_TARGET_CMDS
+ cp -a $(@D)/bin/lockfile* $(TARGET_DIR)/usr/bin
+endef
-$(LOCKFILE_PROGS_DIR)/.unpacked: $(DL_DIR)/$(LOCKFILE_PROGS_SOURCE)
- $(LOCKFILE_PROGS_CAT) $(DL_DIR)/$(LOCKFILE_PROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LOCKFILE_PROGS_DIR) package/lockfile-progs/ \*.patch
- touch $(LOCKFILE_PROGS_DIR)/.unpacked
-
-$(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY): $(LOCKFILE_PROGS_DIR)/.unpacked
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LOCKFILE_PROGS_DIR)
- cp -a $(LOCKFILE_PROGS_DIR)/bin/lockfile* $(TARGET_DIR)/usr/bin
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY)
-
-lockfile-progs: liblockfile $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY)
-
-lockfile-progs-clean:
+define LOCKFILE_PROGS_CLEAN_CMDS
-rm -f $(TARGET_DIR)/usr/bin/lockfile-*
- -$(MAKE) -C $(LOCKFILE_PROGS_DIR) clean
-
-lockfile-progs-dirclean:
- rm -rf $(LOCKFILE_PROGS_DIR)
+ -$(MAKE) -C $(@D) clean
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LOCKFILE_PROGS),y)
-TARGETS+=lockfile-progs
-endif
+$(eval $(call GENTARGETS,package,lockfile-progs))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] gadgets-test: convert to gentargets
From: Martin Banky @ 2010-09-29 20:40 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=aca1958b8be478532d5043c80d17b8e64b0592b2
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: fix aio dependency, add uninstall]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 12 ++++----
package/gadgetfs-test/gadgetfs-test.mk | 49 ++++++++++----------------------
2 files changed, 21 insertions(+), 40 deletions(-)
diff --git a/CHANGES b/CHANGES
index 80c6a0f..88267a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,12 +24,12 @@
automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
bootutils, bridge-utils, bsdiff, busybox, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
- fconfig, ffmpeg, freetype, gamin, gawk, gperf, gtk2-themes,
- gtkperf, gvfs, haserl, hdparm, hostapd, hwdata, ifplugd,
- iperf, iproute2, iptables, jpeg, kexec, kismet, less, libcgi,
- libcurl, libdaemon, libdnet, libevent, libglade, libgtk2,
- libiconv, libidn, libmms, libnl, liboil, libpcap, libpng,
- libtool, libungif, libxml2, libxslt, lighttpd, lite,
+ fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk, gperf,
+ gtk2-themes, gtkperf, gvfs, haserl, hdparm, hostapd, hwdata,
+ ifplugd, iperf, iproute2, iptables, jpeg, kexec, kismet, less,
+ libcgi, libcurl, libdaemon, libdnet, libevent, libglade,
+ libgtk2, libiconv, libidn, libmms, libnl, liboil, libpcap,
+ libpng, libtool, libungif, libxml2, libxslt, lighttpd, lite,
lm-sensors, logrotate, m4, mdadm, mesa3d, metacity, mtd-utils,
mysql_client, nano, nbd, ncftp, neon, netperf, netsnmp,
ng-spice-rework, ntfsprogs, ntp, openntpd, openssh, openvpn,
diff --git a/package/gadgetfs-test/gadgetfs-test.mk b/package/gadgetfs-test/gadgetfs-test.mk
index e3ab95e..1464ec1 100644
--- a/package/gadgetfs-test/gadgetfs-test.mk
+++ b/package/gadgetfs-test/gadgetfs-test.mk
@@ -5,47 +5,28 @@
#############################################################
GADGETFS_TEST_SOURCE=gadgetfs-test.tar.bz2
GADGETFS_TEST_SITE=http://avr32linux.org/twiki/pub/Main/GadgetFsTest/
-GADGETFS_TEST_DIR=$(BUILD_DIR)/gadgetfs-test
-GADGETFS_TEST_MAKEOPTS:=CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
+GADGETFS_TEST_MAKEOPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
ifeq ($(BR2_PACKAGE_GADGETFS_TEST_USE_AIO),y)
+GADGETFS_TEST_DEPENDENCIES = libaio
GADGETFS_TEST_MAKEOPTS+=USE_AIO=y
endif
-$(DL_DIR)/$(GADGETFS_TEST_SOURCE):
- $(call DOWNLOAD,$(GADGETFS_TEST_SITE),$(GADGETFS_TEST_SOURCE))
+define GADGETFS_TEST_BUILD_CMDS
+ $(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS)
+endef
-$(GADGETFS_TEST_DIR)/.unpacked: $(DL_DIR)/$(GADGETFS_TEST_SOURCE)
- $(BZCAT) $(DL_DIR)/$(GADGETFS_TEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(GADGETFS_TEST_DIR) package/gadgetfs-test gadgetfs-test\*.patch
- touch $@
+define GADGETFS_TEST_INSTALL_TARGET_CMDS
+ $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) prefix=/usr install
+endef
-$(GADGETFS_TEST_DIR)/gadgetfs-test: $(GADGETFS_TEST_DIR)/.unpacked
- $(MAKE) -C $(GADGETFS_TEST_DIR) $(GADGETFS_TEST_MAKEOPTS)
+define GADGETFS_TEST_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/bin/gadgetfs-test
+endef
-$(TARGET_DIR)/usr/bin/gadgetfs-test: $(GADGETFS_TEST_DIR)/gadgetfs-test
- $(MAKE) -C $(GADGETFS_TEST_DIR) DESTDIR=$(TARGET_DIR) prefix=/usr install
+define GADGETFS_TEST_CLEAN_CMDS
+ -$(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS) clean
+endef
-ifeq ($(BR2_PACKAGE_GADGETFS_TEST_USE_AIO),y)
-gadgetfs-test: libaio $(TARGET_DIR)/usr/bin/gadgetfs-test
-else
-gadgetfs-test: $(TARGET_DIR)/usr/bin/gadgetfs-test
-endif
-
-gadgetfs-test-source: $(DL_DIR)/$(GADGETFS_TEST_SOURCE)
-
-gadgetfs-test-clean:
- -$(MAKE) -C $(GADGETFS_TEST_DIR) $(GADGETFS_TEST_MAKEOPTS) clean
-
-gadgetfs-test-dirclean:
- rm -rf $(GADGETFS_TEST_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_GADGETFS_TEST),y)
-TARGETS+=gadgetfs-test
-endif
+$(eval $(call GENTARGETS,package,gadgetfs-test))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] liberation: convert to gentargets and bump to 1.06.0.20100721
From: Martin Banky @ 2010-09-29 20:40 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=ed947b383ff45ec992b8d51a858e475abd0c6f73
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 24 +++++++++++-----------
package/liberation/liberation.mk | 39 ++++++++-----------------------------
2 files changed, 21 insertions(+), 42 deletions(-)
diff --git a/CHANGES b/CHANGES
index 88267a1..907eab1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,18 +27,18 @@
fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk, gperf,
gtk2-themes, gtkperf, gvfs, haserl, hdparm, hostapd, hwdata,
ifplugd, iperf, iproute2, iptables, jpeg, kexec, kismet, less,
- libcgi, libcurl, libdaemon, libdnet, libevent, libglade,
- libgtk2, libiconv, libidn, libmms, libnl, liboil, libpcap,
- libpng, libtool, libungif, libxml2, libxslt, lighttpd, lite,
- lm-sensors, logrotate, m4, mdadm, mesa3d, metacity, mtd-utils,
- mysql_client, nano, nbd, ncftp, neon, netperf, netsnmp,
- ng-spice-rework, ntfsprogs, ntp, openntpd, openssh, openvpn,
- oprofile, pango, patch, pcre, php, pkg-config, prboom, radvd,
- rdesktop, ruby, qt, samba, sawman, sdl_mixer, sdl_sound,
- setserial, shared-mime-info, speex, sqlite, squashfs, strace,
- sylpheed, taglib, tcpdump, thttpd, tiff, tn5250, udev,
- udpcast, usbmount, usbutils, vsftpd, vtun, which,
- wpa_supplicant,
+ libcgi, libcurl, libdaemon, libdnet, liberation, libevent,
+ libglade, libgtk2, libiconv, libidn, libmms, libnl, liboil,
+ libpcap, libpng, libtool, libungif, libxml2, libxslt,
+ lighttpd, lite, lm-sensors, logrotate, m4, mdadm, mesa3d,
+ metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon,
+ netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd,
+ openssh, openvpn, oprofile, pango, patch, pcre, php,
+ pkg-config, prboom, radvd, rdesktop, ruby, qt, samba, sawman,
+ sdl_mixer, sdl_sound, setserial, shared-mime-info, speex,
+ sqlite, squashfs, strace, sylpheed, taglib, tcpdump, thttpd,
+ tiff, tn5250, udev, udpcast, usbmount, usbutils, vsftpd, vtun,
+ which, wpa_supplicant,
xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
xdriver-xf86-input-{mouse,synaptics,vmmouse,void},
xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},
diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk
index ad65670..89987d6 100644
--- a/package/liberation/liberation.mk
+++ b/package/liberation/liberation.mk
@@ -3,40 +3,19 @@
# liberation
#
#############################################################
-LIBERATION_VERSION = 1.04
+LIBERATION_VERSION = 1.06.0.20100721
LIBERATION_SITE = http://www.fedorahosted.org/releases/l/i/liberation-fonts
-LIBERATION_SOURCE = liberation-fonts-$(LIBERATION_VERSION).tar.gz
-LIBERATION_DIR = $(BUILD_DIR)/liberation-fonts-$(LIBERATION_VERSION)
-LIBERATION_CAT:=$(ZCAT)
-LIBERATION_TARGET_DIR:=$(TARGET_DIR)/usr/share/fonts/liberation
+LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz
-$(DL_DIR)/$(LIBERATION_SOURCE):
- $(call DOWNLOAD,$(LIBERATION_SITE),$(LIBERATION_SOURCE))
+LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation
-liberation-source: $(DL_DIR)/$(LIBERATION_SOURCE)
-
-$(LIBERATION_DIR)/.unpacked: $(DL_DIR)/$(LIBERATION_SOURCE)
- $(LIBERATION_CAT) $(DL_DIR)/$(LIBERATION_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(LIBERATION_TARGET_DIR)/LiberationMono-Bold.ttf: $(LIBERATION_DIR)/.unpacked
+define LIBERATION_INSTALL_TARGET_CMDS
mkdir -p $(LIBERATION_TARGET_DIR)
- $(INSTALL) -m0644 $(LIBERATION_DIR)/*.ttf $(LIBERATION_TARGET_DIR)
- touch -c $@
+ $(INSTALL) -m 644 $(@D)/*.ttf $(LIBERATION_TARGET_DIR)
+endef
-liberation: $(LIBERATION_TARGET_DIR)/LiberationMono-Bold.ttf
-
-liberation-clean:
+define LIBERATION_CLEAN_CMDS
rm -rf $(LIBERATION_TARGET_DIR)
+endef
-liberation-dirclean:
- rm -rf $(LIBERATION_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LIBERATION),y)
-TARGETS+=liberation
-endif
+$(eval $(call GENTARGETS,package,liberation))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 17/18] lockfile-progs: convert to gentargets and bump to 0.1.15
From: Peter Korsgaard @ 2010-09-29 20:41 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-17-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Committed with minor tweaks, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] acpid: convert to gentargets and bump to 2.0.6
From: Peter Korsgaard @ 2010-09-29 20:54 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=299f7820de00ef6f34409735cbaaffc193142028
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Also, added acpi_listen to the target. It was being stripped, but not
copied.
acpi_listen is a simple shell-friendly tool which connects to acpid and
listens for events. When an event occurs, acpi_listen will print it on
stdout.
[Peter: no strip, install/remove man pages, add uninstall]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 +-
package/acpid/acpid.mk | 61 ++++++++++++++++++-----------------------------
2 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/CHANGES b/CHANGES
index 0ce74e4..cf85b85 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,7 +20,7 @@
New packages: xz
- Updated/fixed packages: alsa-lib, argus, at, autoconf,
+ Updated/fixed packages: acpid, alsa-lib, argus, at, autoconf,
automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
bootutils, bridge-utils, bsdiff, busybox, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk
index 73c2fb8..d61ca41 100644
--- a/package/acpid/acpid.mk
+++ b/package/acpid/acpid.mk
@@ -3,46 +3,31 @@
# acpid
#
#############################################################
-ACPID_VERSION:=1.0.8
-ACPID_DIR=$(BUILD_DIR)/acpid-$(ACPID_VERSION)
-ACPID_SOURCE=acpid_$(ACPID_VERSION).orig.tar.gz
-ACPID_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/acpid
-
-$(DL_DIR)/$(ACPID_SOURCE):
- $(call DOWNLOAD,$(ACPID_SITE),$(ACPID_SOURCE))
-
-$(ACPID_DIR)/.unpacked: $(DL_DIR)/$(ACPID_SOURCE)
- $(ZCAT) $(DL_DIR)/$(ACPID_SOURCE) | tar -C $(BUILD_DIR) -xvf -
- toolchain/patch-kernel.sh $(ACPID_DIR) package/acpid/ acpid-$(ACPID_VERSION)\*.patch
- touch $(ACPID_DIR)/.unpacked
-
-$(ACPID_DIR)/acpid: $(ACPID_DIR)/.unpacked
- $(MAKE) CC="$(TARGET_CC)" -C $(ACPID_DIR)
- $(STRIPCMD) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpid
- $(STRIPCMD) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpi_listen
- touch -c $(ACPID_DIR)/acpid $(ACPID_DIR)/acpi_listen
-
-$(TARGET_DIR)/usr/sbin/acpid: $(ACPID_DIR)/acpid
- cp -a $(ACPID_DIR)/acpid $(TARGET_DIR)/usr/sbin/acpid
+ACPID_VERSION = 2.0.6
+ACPID_SOURCE = acpid_$(ACPID_VERSION).orig.tar.gz
+ACPID_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/acpid
+
+define ACPID_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" -C $(@D)
+endef
+
+define ACPID_INSTALL_TARGET_CMDS
+ install -D -m 755 $(@D)/acpid $(TARGET_DIR)/usr/sbin/acpid
+ install -D -m 755 $(@D)/acpi_listen $(TARGET_DIR)/usr/bin/acpi_listen
+ install -D -m 644 $(@D)/acpid.8 $(TARGET_DIR)/usr/share/man/man8/acpid.8
+ install -D -m 644 $(@D)/acpi_listen.8 $(TARGET_DIR)/usr/share/man/man8/acpi_listen.8
mkdir -p $(TARGET_DIR)/etc/acpi/events
/bin/echo -e "event=button[ /]power\naction=/sbin/poweroff" > $(TARGET_DIR)/etc/acpi/events/powerbtn
- touch -c $(TARGET_DIR)/usr/sbin/acpid
-
-acpid: $(TARGET_DIR)/usr/sbin/acpid
+endef
-acpid-source: $(DL_DIR)/$(ACPID_SOURCE)
+define ACPID_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/acpid
+ rm -f $(TARGET_DIR)/usr/bin/acpi_listen
+ rm -f $(addprefix )$(TARGET_DIR)/usr/share/man/man8/,acpid.8 acpi_listen.8)
+endef
-acpid-clean:
- -$(MAKE) -C $(ACPID_DIR) clean
+define ACPID_CLEAN_CMDS
+ -$(MAKE) -C $(@D) clean
+endef
-acpid-dirclean:
- rm -rf $(ACPID_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_ACPID),y)
-TARGETS+=acpid
-endif
+$(eval $(call GENTARGETS,package,acpid))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 01/18] acpid: convert to gentargets and bump to 2.0.6
From: Peter Korsgaard @ 2010-09-29 20:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-1-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Also, added acpi_listen to the target. It was being stripped, but not copied.
Martin> acpi_listen is a simple shell-friendly tool which connects to acpid and listens
Martin> for events. When an event occurs, acpi_listen will print it on stdout.
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Committed with minor tweaks, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] Where is Bluez in the config?
From: Barry Bridges @ 2010-09-30 10:15 UTC (permalink / raw)
To: buildroot
In-Reply-To: <mailman.982.1284576537.2900.buildroot@busybox.net>
Hi All,
I have a need to include Bluez into my build and have noticed it nemtioned
in the mailing list, but can't find it anywhere in the config to build it
in. What am I missing? Does it need patching into buildroot?
Many thanks
Barry Bridges
-------------- next part --------------
No virus found in this outgoing message.
Checked by AVG - www.avg.com
Version: 9.0.856 / Virus Database: 271.1.1/3167 - Release Date: 09/29/10 20:50:00
^ permalink raw reply
* [Buildroot] CONFIG_BLK_DEV_INITRD deactivated on automatic build
From: Dennis Borgmann @ 2010-09-30 11:23 UTC (permalink / raw)
To: buildroot
Hello buildroot-list!
First of all - thank you for the work done for this project. It is
awesome and I really like it. Straightforward and quick to use.
I think, I found a bug. If you download buildroot and start configuring
your project with "make menuconfig" and after that configure the kernel
with "make linux26-menuconfig", everything seems to be ok. I did give it
a custom kernel-config named "/tmp/config-2.6.34".
After running "make", everything seems to be ok, but the resulting
kernel does not contain the option "CONFIG_BLK_DEV_INITRD". I need to
manually do a "make linux26-menuconfig" again and rebuild the kernel for
the resulting kernel to contain this option.
This was a really silly thing to find, took me around one week, because
you wouldn't think of such a mistake. Could it be, that this is a bug? I
am using buildroot-2010.08.
Kind regards,
Dennis
^ permalink raw reply
* [Buildroot] [PATCH 06/18] cvs: convert to autotargets
From: Peter Korsgaard @ 2010-09-30 12:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-6-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Committed with minor tweaks, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 1/3] libgtk2: bump to version 2.20.1 and mark Gtk/DirectFB as broken
From: Peter Korsgaard @ 2010-09-30 12:35 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20100929082914.3185053a@surf>
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> On Wed, 29 Sep 2010 01:28:40 +0200
Thomas> Lionel Landwerlin <llandwerlin@gmail.com> wrote:
>> Gtk+ 2.22 has been released early this week, it brings back
>> compiling/quite-good-working DirectFB backend.
>>
>> Would you consider bumping to 2.22 ?
Thomas> Argh, I checked http://www.gtk.org/download-linux.html yesterday, and
Thomas> it still advertise Gtk 2.20 and Glib 2.24.
Thomas> I will bump those versions, yes, and mark the DirectFB support as
Thomas> working again.
Ok, I'll put your pull request on hold for now then. Please resend once
ready.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] Makefile: Force make to run serially in the top-level Makefile
From: Peter Korsgaard @ 2010-09-30 12:36 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285710658-17096-1-git-send-email-yann.morin.1998@anciens.enib.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@anciens.enib.fr> writes:
Yann> The top-level Makefile can be executed in parallel, as it causes problems.
Yann> We can force make to be not parallel.
Yann> It's been reported many times, and recent discussions on IRC with kos_tom,
Yann> and user nick-named knee, led to this patch.
Cool, I didn't know .NOTPARALLEL - Thanks, committed.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] Makefile: Force make to run serially in the top-level Makefile
From: Peter Korsgaard @ 2010-09-30 12:37 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=d487168c711388efbe8185e94e2690bdf7cd5b4a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The top-level Makefile can be executed in parallel, as it causes problems.
We can force make to be not parallel.
It's been reported many times, and recent discussions on IRC with kos_tom,
and user nick-named knee, led to this patch.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Makefile | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index aab346e..9c2e6af 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,9 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+# This top-level Makefile can *not* be executed in parallel
+.NOTPARALLEL:
+
#--------------------------------------------------------------
# Just run 'make menuconfig', configure stuff, then run 'make'.
# You shouldn't need to mess with anything beyond this point...
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] cvs: convert to autotargets
From: Martin Banky @ 2010-09-30 12:37 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=82ab8b3b31b968b11f1e26bd52a63c127d6182cf
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: no strip, remove _BINARY vars]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 +-
package/cvs/cvs.mk | 91 ++++++++++++++-------------------------------------
2 files changed, 26 insertions(+), 67 deletions(-)
diff --git a/CHANGES b/CHANGES
index cf85b85..fad49f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,7 +22,7 @@
Updated/fixed packages: acpid, alsa-lib, argus, at, autoconf,
automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
- bootutils, bridge-utils, bsdiff, busybox, dbus, dmraid,
+ bootutils, bridge-utils, bsdiff, busybox, cvs, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk, gperf,
gtk2-themes, gtkperf, gvfs, haserl, hdparm, hostapd, hwdata,
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index e0f97ec..023e93b 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -3,16 +3,15 @@
# cvs
#
#############################################################
-CVS_VERSION:=1.12.13
-CVS_SOURCE:=cvs_$(CVS_VERSION).orig.tar.gz
-CVS_PATCH:=cvs_$(CVS_VERSION)-8.diff.gz
-CVS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/c/cvs/
-CVS_DIR:=$(BUILD_DIR)/cvs-$(CVS_VERSION)
-CVS_CAT:=$(ZCAT)
-CVS_BINARY:=src/cvs
-CVS_TARGET_BINARY:=usr/bin/cvs
+CVS_VERSION = 1.12.13
+CVS_SOURCE = cvs_$(CVS_VERSION).orig.tar.gz
+CVS_PATCH = cvs_$(CVS_VERSION)-12.diff.gz
+CVS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/c/cvs/
+CVS_DEPENDENCIES = ncurses
-CVS_CONFIGURE_ARGS:=--disable-old-info-format-support
+CVS_CONF_ENV = cvs_cv_func_printf_ptr=yes
+
+CVS_CONFIGURE_ARGS=--disable-old-info-format-support
ifeq ($(BR2_PACKAGE_CVS_SERVER),y)
CVS_CONFIGURE_ARGS+=--enable-server
else
@@ -22,73 +21,33 @@ ifeq ($(BR2_PACKAGE_ZLIB),y)
CVS_CONFIGURE_ARGS+=--with-external-zlib
endif
-$(DL_DIR)/$(CVS_SOURCE):
- $(call DOWNLOAD,$(CVS_SITE),$(CVS_SOURCE))
+CVS_CONF_OPT = $(CVS_CONFIGURE_ARGS)
-ifneq ($(CVS_PATCH),)
-CVS_PATCH_FILE=$(DL_DIR)/$(CVS_PATCH)
-$(CVS_PATCH_FILE):
- $(call DOWNLOAD,$(CVS_SITE),$(CVS_PATCH))
-endif
-cvs-source: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE)
+define CVS_BZIP_UNPACK
+ $(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ rm -f $(@D)/cvs-$(CVS_VERSION).tar.bz2
+endef
+
+CVS_POST_PATCH_HOOKS += CVS_BZIP_UNPACK
-$(CVS_DIR)/.unpacked: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE)
- -mkdir $(CVS_DIR)
- $(CVS_CAT) $(DL_DIR)/$(CVS_SOURCE) | tar -C $(CVS_DIR) $(TAR_OPTIONS) -
- $(BZCAT) $(CVS_DIR)/cvs-$(CVS_VERSION)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- rm -rf $(CVS_DIR)/cvs-$(CVS_VERSION)
- $(CONFIG_UPDATE) $(CVS_DIR)
- $(CONFIG_UPDATE) $(CVS_DIR)/build-aux
- toolchain/patch-kernel.sh $(CVS_DIR) package/cvs \*$(CVS_VERSION)\*.patch
ifneq ($(CVS_PATCH),)
- toolchain/patch-kernel.sh $(CVS_DIR) $(DL_DIR) $(CVS_PATCH)
- if [ -d $(CVS_DIR)/debian/patches ]; then \
- (cd $(CVS_DIR)/debian/patches && for i in *; \
+define CVS_DEBIAN_PATCHES
+ if [ -d $(@D)/debian/patches ]; then \
+ (cd $(@D)/debian/patches && for i in *; \
do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i; \
done; \
); \
- toolchain/patch-kernel.sh $(CVS_DIR) $(CVS_DIR)/debian/patches \*; \
+ toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \
fi
+endef
endif
- touch $@
-
-$(CVS_DIR)/.configured: $(CVS_DIR)/.unpacked
- (cd $(CVS_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- cvs_cv_func_printf_ptr=yes \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- $(DISABLE_LARGEFILE) \
- $(DISABLE_NLS) \
- $(CVS_CONFIGURE_ARGS) \
- )
- touch $@
-
-$(CVS_DIR)/$(CVS_BINARY): $(CVS_DIR)/.configured
- $(MAKE) -C $(CVS_DIR)
-$(TARGET_DIR)/$(CVS_TARGET_BINARY): $(CVS_DIR)/$(CVS_BINARY)
- install -D $(CVS_DIR)/$(CVS_BINARY) $(TARGET_DIR)/$(CVS_TARGET_BINARY)
- $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(CVS_TARGET_BINARY)
+CVS_POST_PATCH_HOOKS += CVS_DEBIAN_PATCHES
-cvs: ncurses $(TARGET_DIR)/$(CVS_TARGET_BINARY)
+define CVS_INSTALL_TARGET_CMDS
+ install -D $(@D)/src/cvs $(TARGET_DIR)/usr/bin/cvs
+endef
-cvs-clean:
- -$(MAKE) -C $(CVS_DIR) clean
- rm -f $(TARGET_DIR)/$(CVS_TARGET_BINARY)
+$(eval $(call AUTOTARGETS,package,cvs))
-cvs-dirclean:
- rm -rf $(CVS_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_CVS),y)
-TARGETS+=cvs
-endif
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] Remove architectures marked as deprecated
From: Thomas Petazzoni @ 2010-09-30 12:44 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=343f480fe2647febe7fc713722d1131242ba20e3
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The Alpha, CRIS, IA64 and Sparc64 architectures have been marked as
deprecated during the previous release cycle. They are not widely used
in embedded systems and/or no longer supported by their manufacturers
and/or not properly supported in Buildroot.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Patch is too large, so refusing to show it
^ permalink raw reply
* [Buildroot] [git commit master 1/1] Remove code specific to removed architectures
From: Thomas Petazzoni @ 2010-09-30 12:44 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=97d8618c6cc2970ea5870ae214344b3bff083883
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
fs/jffs2/Config.in | 4 ++--
package/liboil/liboil.mk | 3 ---
package/ltrace/Config.in | 2 +-
package/openssl/openssl.mk | 3 ---
toolchain/gcc/Config.in | 2 +-
toolchain/toolchain-common.in | 1 -
6 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index b787ec9..de13768 100644
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -95,10 +95,10 @@ config BR2_TARGET_ROOTFS_JFFS2_PADSIZE
choice
prompt "Endianess"
- default BR2_TARGET_ROOTFS_JFFS2_BE if BR2_alpha || BR2_armeb || \
+ default BR2_TARGET_ROOTFS_JFFS2_BE if BR2_armeb || \
BR2_avr32 || BR2_m68k || BR2_mips || \
BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \
- BR2_sh3eb || BR2_sh4eb || BR2_sparc || BR2_sparc64
+ BR2_sh3eb || BR2_sh4eb || BR2_sparc
config BR2_TARGET_ROOTFS_JFFS2_LE
bool "little-endian"
diff --git a/package/liboil/liboil.mk b/package/liboil/liboil.mk
index 1bb412f..44017be 100644
--- a/package/liboil/liboil.mk
+++ b/package/liboil/liboil.mk
@@ -16,9 +16,6 @@ LIBOIL_INSTALL_TARGET = YES
ifeq ($(BR2_avr32),y)
LIBOIL_CONF_ENV = as_cv_unaligned_access=no
endif
-ifeq ($(BR2_cris),y)
-LIBOIL_CONF_ENV = as_cv_unaligned_access=yes
-endif
ifeq ($(BR2_x86_64),y)
LIBOIL_CONF_ENV = as_cv_unaligned_access=yes
endif
diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index 10a0e0a..9e71d82 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LTRACE
bool "ltrace"
- depends on !(BR2_avr32 || BR2_cris || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64 || BR2_xtensa)
+ depends on !(BR2_avr32 || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64 || BR2_xtensa)
select BR2_PACKAGE_LIBELF
help
Debugging program which runs a specified command until it exits.
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index edbfe8b..22b14f2 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -11,9 +11,6 @@ OPENSSL_DEPENDENCIES = zlib
OPENSSL_TARGET_ARCH=generic32
# Some architectures are optimized in OpenSSL
-ifeq ($(ARCH),ia64)
-OPENSSL_TARGET_ARCH=ia64
-endif
ifeq ($(ARCH),powerpc)
OPENSSL_TARGET_ARCH=ppc
endif
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 70d8de9..760bb98 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -93,7 +93,7 @@ config BR2_GCC_SHARED_LIBGCC
bool "Build/install a shared libgcc?"
depends on !BR2_PREFER_STATIC_LIB
default y
- depends on !BR2_sparc && !BR2_sparc64
+ depends on !BR2_sparc
help
Build/install a shared libgcc library
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index ea06ace..f67c30a 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -9,7 +9,6 @@ comment "Common Toolchain Options"
config BR2_LARGEFILE
bool "Enable large file (files > 2 GB) support?"
- depends on !BR2_cris
help
If you are building your own toolchain and you want to
support files larger than 2GB then enable this option.
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] CHANGES: alpha/cris/ia64/sparc64 support removed
From: Peter Korsgaard @ 2010-09-30 12:44 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=9f36bd4976ce4fe0e108611ac82a694e434b1b7c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/CHANGES b/CHANGES
index fad49f6..5910bb7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,8 @@
A convenience Makefile wrapper is created when using
out-of-tree building, similar to how it is done for the kernel.
+ Alpha, Cris, IA64 and Sparc64 architecture support removed.
+
New packages: xz
Updated/fixed packages: acpid, alsa-lib, argus, at, autoconf,
--
1.7.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox