* [Buildroot] [Bug 2647] makedevs package lacks support for 16-bit major/minor numbers
From: bugzilla at busybox.net @ 2010-09-27 10:15 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-2647-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=2647
--- Comment #1 from Matt Fleming <matt@console-pimps.org> ---
Created attachment 2539
--> https://bugs.busybox.net/attachment.cgi?id=2539
patch to handle 16-bit minors
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 2647] New: makedevs package lacks support for 16-bit major/minor numbers
From: bugzilla at busybox.net @ 2010-09-27 10:07 UTC (permalink / raw)
To: buildroot
https://bugs.busybox.net/show_bug.cgi?id=2647
Summary: makedevs package lacks support for 16-bit major/minor
numbers
Product: buildroot
Version: unspecified
Platform: PC
OS/Version: Linux
Status: NEW
Severity: minor
Priority: P5
Component: Other
AssignedTo: unassigned at buildroot.uclibc.org
ReportedBy: matt at console-pimps.org
CC: buildroot at uclibc.org
Estimated Hours: 0.0
The attached patch adds support for creating device nodes with 16-bit
major/minor numbers.
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] Building a package for gdb debugging
From: Thomas Petazzoni @ 2010-09-27 9:00 UTC (permalink / raw)
To: buildroot
In-Reply-To: <0D753D10438DA54287A00B027084269764451B9DB7@AUSP01VMBX24.collaborationhost.net>
On Fri, 24 Sep 2010 13:13:57 -0500
H Hartley Sweeten <hartleys@visionengravers.com> wrote:
> I need to build a package for debugging a segfault with gdb. Is there an
> easy way to pass the -g switch so that gcc compiles the program with
> debugging flags? Also, how can I keep the final executable from being
> stripped?
Enable BR2_ENABLE_DEBUG.
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 1/4] Added new menu item to specify a custom port for /etc/inittab
From: Yegor Yefremov @ 2010-09-27 8:53 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4C9C54A9.20803@visionsystems.de>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
target/generic/Config.in | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/target/generic/Config.in b/target/generic/Config.in
index 54ff1d6..286b0a3 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -102,8 +102,16 @@ config BR2_TARGET_GENERIC_GETTY_TTYCPM2
config BR2_TARGET_GENERIC_GETTY_TTYCPM3
bool "ttyCPM3"
depends on BR2_powerpc
+config BR2_TARGET_GENERIC_GETTY_CUSTOM
+ bool "Select custom port"
+
endchoice
+config BR2_TARGET_GENERIC_GETTY_CUSTOM_PORT
+ string "Port"
+ depends on BR2_TARGET_GENERIC_GETTY_CUSTOM
+ default ""
+
config BR2_TARGET_GENERIC_GETTY_PORT
string
default "#ttyS0" if BR2_TARGET_GENERIC_GETTY_NONE
@@ -134,6 +142,7 @@ config BR2_TARGET_GENERIC_GETTY_PORT
default "ttyCPM1" if BR2_TARGET_GENERIC_GETTY_TTYCPM1
default "ttyCPM2" if BR2_TARGET_GENERIC_GETTY_TTYCPM2
default "ttyCPM3" if BR2_TARGET_GENERIC_GETTY_TTYCPM3
+ default $(BR2_TARGET_GENERIC_GETTY_CUSTOM_PORT) if BR2_TARGET_GENERIC_GETTY_CUSTOM
choice
prompt "Baudrate to use"
^ permalink raw reply related
* [Buildroot] [PATCH] add lzop dependency
From: Yegor Yefremov @ 2010-09-27 8:22 UTC (permalink / raw)
To: buildroot
lzop will be required to compress Linux kernel via lzo compression method.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Index: b/toolchain/dependencies/dependencies.sh
===================================================================
--- a/toolchain/dependencies/dependencies.sh 2010-08-26 16:37:08.000000000 +0200
+++ b/toolchain/dependencies/dependencies.sh 2010-09-27 09:52:29.000000000 +0200
@@ -137,7 +137,7 @@
fi;
# Check that a few mandatory programs are installed
-for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python svn ; do
+for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python svn lzop ; do
if ! which $prog > /dev/null ; then
/bin/echo -e "\nYou must install '$prog' on your build machine";
if test $prog = "makeinfo" ; then
^ permalink raw reply
* [Buildroot] [git commit master 1/1] linux/kernel-headers: bump 2.6.32.x / 2.6.35.x stable versions
From: Peter Korsgaard @ 2010-09-27 7:58 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=7e7fce1b0295c86b5bcbae957db1efa08a386d8f
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
And add missing 2.6.35 patch.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
linux/Config.in | 6 +++---
| 4 ++--
| 0
| 15 +++++++--------
4 files changed, 12 insertions(+), 13 deletions(-)
copy toolchain/kernel-headers/{linux-2.6.32.22-scsi-use-__uX-types-for-headers-exported-to-user-space.patch => linux-2.6.32.23-scsi-use-__uX-types-for-headers-exported-to-user-space.patch} (100%)
rename toolchain/kernel-headers/{linux-2.6.32.22-scsi-use-__uX-types-for-headers-exported-to-user-space.patch => linux-2.6.35.6-scsi-use-__uX-types-for-headers-exported-to-user-space.patch} (87%)
diff --git a/linux/Config.in b/linux/Config.in
index 497a02e..a7109a5 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
default BR2_LINUX_KERNEL_2_6_35
config BR2_LINUX_KERNEL_2_6_35
- bool "2.6.35.5"
+ bool "2.6.35.6"
config BR2_LINUX_KERNEL_SAME_AS_HEADERS
bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
string "Kernel version"
depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
- default "2.6.35.5"
+ default "2.6.35.6"
config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
config BR2_LINUX_KERNEL_VERSION
string
- default "2.6.35.5" if BR2_LINUX_KERNEL_2_6_35
+ default "2.6.35.6" if BR2_LINUX_KERNEL_2_6_35
default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
--git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 025e6a3..bfe6afb 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -60,9 +60,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "2.6.29.6" if BR2_KERNEL_HEADERS_2_6_29
default "2.6.30.10" if BR2_KERNEL_HEADERS_2_6_30
default "2.6.31.14" if BR2_KERNEL_HEADERS_2_6_31
- default "2.6.32.22" if BR2_KERNEL_HEADERS_2_6_32
+ default "2.6.32.23" if BR2_KERNEL_HEADERS_2_6_32
default "2.6.33.7" if BR2_KERNEL_HEADERS_2_6_33
default "2.6.34.7" if BR2_KERNEL_HEADERS_2_6_34
- default "2.6.35.5" if BR2_KERNEL_HEADERS_2_6_35
+ default "2.6.35.6" if BR2_KERNEL_HEADERS_2_6_35
default "2.6" if BR2_KERNEL_HEADERS_SNAP
default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/toolchain/kernel-headers/linux-2.6.32.22-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.32.23-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
similarity index 100%
copy from toolchain/kernel-headers/linux-2.6.32.22-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
copy to toolchain/kernel-headers/linux-2.6.32.23-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
diff --git a/toolchain/kernel-headers/linux-2.6.32.22-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.35.6-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
similarity index 87%
rename from toolchain/kernel-headers/linux-2.6.32.22-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
rename to toolchain/kernel-headers/linux-2.6.35.6-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
index 2fc6176..1089c71 100644
--- a/toolchain/kernel-headers/linux-2.6.32.22-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
+++ b/toolchain/kernel-headers/linux-2.6.35.6-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
@@ -1,4 +1,4 @@
-From 5e0675efcec309617ba2d334c68ddb250ef942b2 Mon Sep 17 00:00:00 2001
+From 877aa0313e7d22b88d04ebef76392e1688fffff9 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 27 Nov 2009 11:20:54 +0100
Subject: [PATCH] scsi: use __uX types for headers exported to user space
@@ -17,14 +17,14 @@ before ???u8???
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
include/scsi/scsi.h | 8 ++++----
- include/scsi/scsi_netlink.h | 20 ++++++++++----------
- 2 files changed, 14 insertions(+), 14 deletions(-)
+ include/scsi/scsi_netlink.h | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
-index 34c46ab..b3cffec 100644
+index 8b4deca..ec3053e 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
-@@ -145,10 +145,10 @@ struct scsi_cmnd;
+@@ -149,10 +149,10 @@ struct scsi_cmnd;
/* defined in T10 SCSI Primary Commands-2 (SPC2) */
struct scsi_varlen_cdb_hdr {
@@ -40,7 +40,7 @@ index 34c46ab..b3cffec 100644
/* service specific data follows */
};
diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
-index 536752c..7445c46 100644
+index 536752c..58ce8fe 100644
--- a/include/scsi/scsi_netlink.h
+++ b/include/scsi/scsi_netlink.h
@@ -105,8 +105,8 @@ struct scsi_nl_host_vendor_msg {
@@ -54,7 +54,6 @@ index 536752c..7445c46 100644
#define SCSI_NL_VID_ID_MASK (~ SCSI_NL_VID_TYPE_MASK)
-
--
-1.6.5
+1.7.0
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] thttpd: don't use parallel make
From: Peter Korsgaard @ 2010-09-27 7:58 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=fa0d2d142ce827736881ba52ba1bfa0c6bce9122
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The thttpd build system isn't safe for parallel makes, as sometimes
match.o isn't built by the time it is referenced.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 4 ++--
package/thttpd/thttpd.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGES b/CHANGES
index 4fa011f..ddace92 100644
--- a/CHANGES
+++ b/CHANGES
@@ -32,8 +32,8 @@
ntfsprogs, ntp, openntpd, openssh, openvpn, oprofile, pango,
pcre, php, prboom, radvd, qt, samba, sdl_mixer, sdl_sound,
shared-mime-info, speex, sqlite, squashfs, strace, taglib,
- tcpdump, tiff, tn5250, udev, udpcast, usbmount, usbutils,
- which, xlib_libX11, zlib
+ tcpdump, thttpd, tiff, tn5250, udev, udpcast, usbmount,
+ usbutils, which, xlib_libX11, zlib
Deprecated packages: hotplug, lzma
diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk
index ca72fae..d32462e 100644
--- a/package/thttpd/thttpd.mk
+++ b/package/thttpd/thttpd.mk
@@ -35,7 +35,7 @@ $(THTTPD_DIR)/.configured: $(THTTPD_DIR)/.unpacked
touch $(THTTPD_DIR)/.configured
$(THTTPD_DIR)/$(THTTPD_BINARY): $(THTTPD_DIR)/.configured
- $(MAKE) -C $(THTTPD_DIR)
+ $(MAKE1) -C $(THTTPD_DIR)
$(TARGET_DIR)/$(THTTPD_TARGET_BINARY): $(THTTPD_DIR)/$(THTTPD_BINARY)
install -D $(THTTPD_DIR)/$(THTTPD_BINARY) $(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
--
1.7.1
^ permalink raw reply related
* [Buildroot] "make menuconfig" possibly broken in git master
From: Bjørn Forsman @ 2010-09-27 7:12 UTC (permalink / raw)
To: buildroot
In-Reply-To: <8762xt7da8.fsf@macbook.be.48ers.dk>
2010/9/25 Peter Korsgaard <jacmet@uclibc.org>:
>>>>>> "Bj?rn" == Bj?rn Forsman <bjorn.forsman@gmail.com> writes:
>
> Hi,
>
> ?Bj?rn> I think I've found the exact issue: package/config/zconf.tab.c wasn't
> ?Bj?rn> being rebuilt.
> ?Bj?rn> I removed that file, it got rebuilt and the issue was gone.
> ?Bj?rn> I think 'make distclean' should clean package/config/zconf.tab.c (and
> ?Bj?rn> all *.o files in
> ?Bj?rn> package/config/) or this issue may appear next time package/config/ is
> ?Bj?rn> synced with upstream.
>
> The distclean does clean everything currently used, but the problem is
> that these files used to exist in package/config, but are now in
> output/build/buildroot-config, and the original makefile gets a bit
> confused when there's old files in package/config.
Ok, so it's already fixed. Good :-)
Best regards,
Bj?rn Forsman
^ permalink raw reply
* [Buildroot] auotgen.sh running before ./configure
From: Lionel Landwerlin @ 2010-09-27 6:10 UTC (permalink / raw)
To: buildroot
In-Reply-To: <AANLkTinXKfGsCB8rESiT7iTMMdcrRkJgKUk7hXWD1VpH@mail.gmail.com>
Le lundi 27 septembre 2010 ? 07:36 +0200, Belisko Marek a ?crit :
> Hi,
>
> I want to add navit package (navigation sw) to buildroot.
> Compilation steps described on navit wiki is:
> 1. run ./autogen.sh
> 2. then ./configure; make ....
>
> How can I add autogen.sh script running before ./configure?
> It is done automatically?
>
> Thanks in advance,
>
> marek
>
Add the following line to your package's makefile, will run the
autoreconf tool at the top of your package source tree :
<PKG_NAME>_AUTORECONF = YES
If you really want to run autogen.sh you'll have to add a custom hook on
the <PKG_NAME>_POST_EXTRACT_HOOKS or <PKG_NAME>_POST_PATCH_HOOKS.
Regards,
--
Lionel Landwerlin
^ permalink raw reply
* [Buildroot] [PATCH RESEND v1] Add pcs-lite package to buildroot.
From: Belisko Marek @ 2010-09-27 5:44 UTC (permalink / raw)
To: buildroot
Combine both patches to one according Thomas request.
^ permalink raw reply
* [Buildroot] auotgen.sh running before ./configure
From: Belisko Marek @ 2010-09-27 5:36 UTC (permalink / raw)
To: buildroot
Hi,
I want to add navit package (navigation sw) to buildroot.
Compilation steps described on navit wiki is:
1. run ./autogen.sh
2. then ./configure; make ....
How can I add autogen.sh script running before ./configure?
It is done automatically?
Thanks in advance,
marek
--
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer
Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
icq: 290551086
web: http://open-nandra.com
^ permalink raw reply
* [Buildroot] [PATCH 05/18] boa: convert to autotargets
From: Peter Korsgaard @ 2010-09-26 22:04 UTC (permalink / raw)
To: buildroot
In-Reply-To: <AANLkTimBPViR_b9ZdSG7Q_WTCiGt2DarLcmcsWfyUB6J@mail.gmail.com>
>>>>> "Martin" == Martin Banky <Martin.Banky@gmail.com> writes:
Martin> Peter,
Martin> ???? Sorry, I missed that when I was putting the patch set together. I meant to
Martin> merge the two, when I was cherry picking them into a new branch. It was the end
Martin> of my night when I put this together.
No problem.
Martin> One question, does the stripping happen automatically for
Martin> gentargets? I was under the impression that you had to specify
Martin> it. I'm still trying to get a grasp on all the different things
Martin> that happen behind the scenes.
Yes, it happens globally just before building the filesystems in the
toplevel Makefile:
target-finalize:
ifeq ($(BR2_HAVE_DEVFILES),y)
( scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
else
rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/aclocal
find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
endif
ifneq ($(BR2_PACKAGE_GDB),y)
rm -rf $(TARGET_DIR)/usr/share/gdb
endif
ifneq ($(BR2_HAVE_DOCUMENTATION),y)
rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/man
rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info
rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc
rm -rf $(TARGET_DIR)/usr/share/gtk-doc
endif
find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] Makefile: generate a Makefile wrapper in $(O)
From: Peter Korsgaard @ 2010-09-26 21:48 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285491372-19364-1-git-send-email-yann.morin.1998@anciens.enib.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@anciens.enib.fr> writes:
Yann> If building out-of-tree, add a Makefile wrapper that calls-out to the real
Yann> Makefile with proper args.
Yann> Avoids having to pass -C and O= every time we call make.
Yann> This is highly inspired from how the Linux kernel does it, and portions of
Yann> it have been used. We can't use exactly the same implementation as the
Yann> kernel does, because:
Yann> - the kernel always overwrites the wrapper at each call: doing so in
Yann> buildroot makes the kconfig stuff be rebuilt every time;
Huh? We do call mkmakefile every time, but you do the extra trick about
.Makefile (why?). I guess the reason why you have the kconfig stuff
rebuilding is that you added the phony outputmake dependency to the
kconfig binaries rather than the phony menuconfig/oldconfig/.. targets.
Yann> - the script writing the wrapper has been expunged of the few lines
Yann> that were too kernel-related: in buildroot we do not need the version
Yann> string in the wrapper, and we do not have a patchlevel version;
Yann> +
Yann> +ifeq ($(NEED_WRAPPER),y)
Yann> +# outputmakefile generates a Makefile in the output directory, if using a
Yann> +# separate output directory. This allows convenient use of make in the
Yann> +# output directory.
Yann> +outputmakefile:
Yann> + $(Q)$(SHELL) $(TOPDIR)/scripts/mkmakefile $(CURDIR) $(O)
Yann> +else
Yann> +outputmakefile:
Yann> + @true
Yann> +endif
A makefile target without any rules is OK, so you could get rid of the
true. We use TOPDIR everywhere else instead of CURDIR, so I would prefer
to use it here. It also makes more sense to make mkmakefile executable
and get rid of the SHELL.
Yann> +
Yann> +if ! cmp $2/.Makefile $2/Makefile >/dev/null 2>&1; then
Yann> + echo " GEN Makefile"
Yann> + rm -f $2/Makefile
Yann> + mv $2/.Makefile $2/Makefile
Yann> +else
Yann> + rm -f $2/.Makefile
Yann> +fi
I would prefer to stick as close as possible to the version in the
kernel sources, so I'll remove this. What is the reason for it? You
already created the Makefile, so it cannot be because of performance.
I've committed a slightly tweaked version of it, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] Makefile: generate a Makefile wrapper in $(O)
From: Peter Korsgaard @ 2010-09-26 21:47 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=aefad5317f2fd1645ace5a62b6b9643143093173
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
If building out-of-tree, add a Makefile wrapper that calls-out to the real
Makefile with proper args.
Avoids having to pass -C and O= every time we call make.
This is highly inspired from how the Linux kernel does it, and portions of
it have been used. We can't use exactly the same implementation as the
kernel does, because:
- the script writing the wrapper has been expunged of the few lines
that were too kernel-related: in buildroot we do not need the version
string in the wrapper, and we do not have a patchlevel version;
- "in-tree build" does not have the same meaning for the kernel and for
buildroot: for the kernel, $(O) point to the $(TOPDIR), while for
buildroot $(O) points to $(TOPDIR)/output.
For more complete explanations, see:
http://lists.busybox.net/pipermail/buildroot/2010-September/037815.html
[Peter: minor tweaks]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 3 +++
Makefile | 45 ++++++++++++++++++++++++++++-----------------
scripts/mkmakefile | 47 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 78 insertions(+), 17 deletions(-)
create mode 100755 scripts/mkmakefile
diff --git a/CHANGES b/CHANGES
index b01da23..4fa011f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,9 @@
Download handling reworked and support for git/svn downloads
added.
+ A convenience Makefile wrapper is created when using
+ out-of-tree building, similar to how it is done for the kernel.
+
New packages: xz
Updated/fixed packages: alsa-lib, at, avahi, axel, berkeleydb,
diff --git a/Makefile b/Makefile
index faa802b..aab346e 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ space:=$(empty) $(empty)
ifneq ("$(origin O)", "command line")
O:=output
CONFIG_DIR:=$(TOPDIR)
+NEED_WRAPPER=
else
# other packages might also support Linux-style out of tree builds
# with the O=<dir> syntax (E.G. Busybox does). As make automatically
@@ -60,6 +61,7 @@ override O:=$(O)
CONFIG_DIR:=$(O)
# we need to pass O= everywhere we call back into the toplevel makefile
EXTRAMAKEARGS = O=$(O)
+NEED_WRAPPER=y
endif
# $(shell find . -name *_defconfig |sed 's/.*\///')
@@ -324,7 +326,7 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf
world: prepare dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL)
-.PHONY: all world dirs clean distclean source \
+.PHONY: all world dirs clean distclean source outputmakefile \
$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
@@ -463,52 +465,52 @@ COMMON_CONFIG_ENV = \
KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \
BUILDROOT_CONFIG=$(CONFIG_DIR)/.config
-xconfig: $(BUILD_DIR)/buildroot-config/qconf
+xconfig: $(BUILD_DIR)/buildroot-config/qconf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@if ! $(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN); then \
test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \
fi
-gconfig: $(BUILD_DIR)/buildroot-config/gconf
+gconfig: $(BUILD_DIR)/buildroot-config/gconf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@if ! $(COMMON_CONFIG_ENV) srctree=$(TOPDIR) \
$< $(CONFIG_CONFIG_IN); then \
test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \
fi
-menuconfig: $(BUILD_DIR)/buildroot-config/mconf
+menuconfig: $(BUILD_DIR)/buildroot-config/mconf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@if ! $(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN); then \
test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \
fi
-nconfig: $(BUILD_DIR)/buildroot-config/nconf
+nconfig: $(BUILD_DIR)/buildroot-config/nconf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@if ! $(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN); then \
test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \
fi
-config: $(BUILD_DIR)/buildroot-config/conf
+config: $(BUILD_DIR)/buildroot-config/conf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)
-oldconfig: $(BUILD_DIR)/buildroot-config/conf
+oldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
mkdir -p $(BUILD_DIR)/buildroot-config
@$(COMMON_CONFIG_ENV) $< --oldconfig $(CONFIG_CONFIG_IN)
-randconfig: $(BUILD_DIR)/buildroot-config/conf
+randconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@$(COMMON_CONFIG_ENV) $< --randconfig $(CONFIG_CONFIG_IN)
-allyesconfig: $(BUILD_DIR)/buildroot-config/conf
+allyesconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@$(COMMON_CONFIG_ENV) $< --allyesconfig $(CONFIG_CONFIG_IN)
-allnoconfig: $(BUILD_DIR)/buildroot-config/conf
+allnoconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@$(COMMON_CONFIG_ENV) $< --allnoconfig $(CONFIG_CONFIG_IN)
-randpackageconfig: $(BUILD_DIR)/buildroot-config/conf
+randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg
@$(COMMON_CONFIG_ENV) \
@@ -516,7 +518,7 @@ randpackageconfig: $(BUILD_DIR)/buildroot-config/conf
$< --randconfig $(CONFIG_CONFIG_IN)
@rm -f $(CONFIG_DIR)/.config.nopkg
-allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf
+allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg
@$(COMMON_CONFIG_ENV) \
@@ -524,7 +526,7 @@ allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf
$< --allyesconfig $(CONFIG_CONFIG_IN)
@rm -f $(CONFIG_DIR)/.config.nopkg
-allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf
+allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg
@$(COMMON_CONFIG_ENV) \
@@ -532,19 +534,19 @@ allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf
$< --allnoconfig $(CONFIG_CONFIG_IN)
@rm -f $(CONFIG_DIR)/.config.nopkg
-silentoldconfig: $(BUILD_DIR)/buildroot-config/conf
+silentoldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
$(COMMON_CONFIG_ENV) $< --silentoldconfig $(CONFIG_CONFIG_IN)
-defconfig: $(BUILD_DIR)/buildroot-config/conf
+defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@$(COMMON_CONFIG_ENV) $< --defconfig $(CONFIG_CONFIG_IN)
-%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(TOPDIR)/configs/%_defconfig
+%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(TOPDIR)/configs/%_defconfig outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@$(COMMON_CONFIG_ENV) $< --defconfig=$(TOPDIR)/configs/$@ $(CONFIG_CONFIG_IN)
-savedefconfig: $(BUILD_DIR)/buildroot-config/conf
+savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
@mkdir -p $(BUILD_DIR)/buildroot-config
@$(COMMON_CONFIG_ENV) $< --savedefconfig=$(TOPDIR)/defconfig $(CONFIG_CONFIG_IN)
@@ -559,6 +561,15 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
# Cleanup and misc junk
#
#############################################################
+
+# outputmakefile generates a Makefile in the output directory, if using a
+# separate output directory. This allows convenient use of make in the
+# output directory.
+outputmakefile:
+ifeq ($(NEED_WRAPPER),y)
+ $(Q)$(TOPDIR)/scripts/mkmakefile $(TOPDIR) $(O)
+endif
+
clean:
rm -rf $(STAGING_DIR) $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
$(STAMP_DIR) $(BUILD_DIR) $(TOOLCHAIN_DIR)
diff --git a/scripts/mkmakefile b/scripts/mkmakefile
new file mode 100755
index 0000000..38d8268
--- /dev/null
+++ b/scripts/mkmakefile
@@ -0,0 +1,47 @@
+#!/bin/sh
+# Generates a small Makefile used in the root of the output
+# directory, to allow make to be started from there.
+# The Makefile also allow for more convinient build of external modules
+
+# Usage
+# $1 - Kernel src directory
+# $2 - Output directory
+
+
+test ! -r $2/Makefile -o -O $2/Makefile || exit 0
+# Only overwrite automatically generated Makefiles
+# (so we do not overwrite buildroot Makefile)
+if test -e $2/Makefile && ! grep -q Automatically $2/Makefile
+then
+ exit 0
+fi
+if [ "${quiet}" != "silent_" ]; then
+ echo " GEN $2/Makefile"
+fi
+
+cat << EOF > $2/Makefile
+# Automatically generated by $0: don't edit
+
+lastword = \$(word \$(words \$(1)),\$(1))
+makedir := \$(dir \$(call lastword,\$(MAKEFILE_LIST)))
+
+MAKEARGS := -C $1
+MAKEARGS += O=\$(if \$(patsubst /%,,\$(makedir)),\$(CURDIR)/)\$(patsubst %/,%,\$(makedir))
+
+MAKEFLAGS += --no-print-directory
+
+.PHONY: all \$(MAKECMDGOALS)
+
+all := \$(filter-out all Makefile,\$(MAKECMDGOALS))
+
+all:
+ \$(MAKE) \$(MAKEARGS) \$(all)
+
+Makefile:;
+
+\$(all): all
+ @:
+
+%/: all
+ @:
+EOF
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 05/18] boa: convert to autotargets
From: Martin Banky @ 2010-09-26 21:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87sk0w46v4.fsf@macbook.be.48ers.dk>
Peter,
Sorry, I missed that when I was putting the patch set together. I meant
to merge the two, when I was cherry picking them into a new branch. It was
the end of my night when I put this together. One question, does the
stripping happen automatically for gentargets? I was under the impression
that you had to specify it. I'm still trying to get a grasp on all the
different things that happen behind the scenes.
Martin
On Sun, Sep 26, 2010 at 12:55 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
> >>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
>
> Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
> Martin> ---
> Martin> package/boa/boa.mk | 38 +++-----------------------------------
>
> Ahh, missed this one - Would probably have made more sense if you had
> merged it with the gentargets one.
>
> --
> Bye, Peter Korsgaard
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100926/f4af7583/attachment.html>
^ permalink raw reply
* [Buildroot] [PATCH 02/18] axel: convert to gentargets and bump to 2.4
From: Peter Korsgaard @ 2010-09-26 21:12 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-2-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>
Thanks, committed with small tweaks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] axel: convert to gentargets and bump to 2.4
From: Peter Korsgaard @ 2010-09-26 21:11 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=0f9da87c1d18598f308ed129d027f65cdffcde77
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: fix build with locale, pass LDFLAGS, simplify install]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 4 +-
package/axel/Config.in | 2 +
package/axel/axel.mk | 78 +++++++++++++++++++++--------------------------
3 files changed, 39 insertions(+), 45 deletions(-)
diff --git a/CHANGES b/CHANGES
index 33299a0..b01da23 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,8 +17,8 @@
New packages: xz
- Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind,
- bmon, boa, bridge-utils, bsdiff, busybox, dbus, dmraid,
+ Updated/fixed packages: alsa-lib, at, avahi, axel, berkeleydb,
+ bind, bmon, boa, bridge-utils, bsdiff, busybox, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
freetype, gawk, gvfs, haserl, hostapd, hwdata, ifplugd, iperf,
iproute2, iptables, jpeg, kexec, kismet, less, libcurl,
diff --git a/package/axel/Config.in b/package/axel/Config.in
index c706d4c..cb9af32 100644
--- a/package/axel/Config.in
+++ b/package/axel/Config.in
@@ -1,5 +1,7 @@
config BR2_PACKAGE_AXEL
bool "axel"
+ select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+ select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
help
HTTP/FTP download accelerator.
diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index 8891795..1bf4d81 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -3,53 +3,45 @@
# axel
#
#############################################################
-AXEL_VERSION:=1.1
-AXEL_SOURCE:=axel-$(AXEL_VERSION).tar.gz
-AXEL_SITE:=http://alioth.debian.org/frs/download.php/2287
-AXEL_CAT:=$(ZCAT)
-AXEL_DIR:=$(BUILD_DIR)/axel-$(AXEL_VERSION)
-AXEL_BINARY:=axel
-AXEL_TARGET_BINARY:=usr/bin/axel
-
-$(DL_DIR)/$(AXEL_SOURCE):
- $(call DOWNLOAD,$(AXEL_SITE),$(AXEL_SOURCE))
-
-axel-source: $(DL_DIR)/$(AXEL_SOURCE)
-
-$(AXEL_DIR)/.unpacked: $(DL_DIR)/$(AXEL_SOURCE)
- $(AXEL_CAT) $(DL_DIR)/$(AXEL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- #toolchain/patch-kernel.sh $(AXEL_DIR) package/axel axel\*.patch
- touch $@
-
-$(AXEL_DIR)/Makefile.settings: $(AXEL_DIR)/.unpacked
- (cd $(AXEL_DIR); \
- ./configure --i18n=0 --prefix=/usr \
- )
- touch $@
+AXEL_VERSION = 2.4
+AXEL_SOURCE = axel-$(AXEL_VERSION).tar.gz
+AXEL_SITE = https://alioth.debian.org/frs/download.php/3015
-$(AXEL_DIR)/$(AXEL_BINARY): $(AXEL_DIR)/Makefile.settings
- $(MAKE) CC="$(TARGET_CC)" STRIP="$(TARGET_STRIP)" -C $(AXEL_DIR)
+AXEL_LDFLAGS = -lpthread
-$(TARGET_DIR)/$(AXEL_TARGET_BINARY): $(AXEL_DIR)/$(AXEL_BINARY)
- $(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-bin
-ifeq ($(BR2_HAVE_DOCUMENTATION),y)
- $(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-man
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+AXEL_DEPENDENCIES += gettext libintl
+AXEL_LDFLAGS += -lintl
endif
-axel: $(TARGET_DIR)/$(AXEL_TARGET_BINARY)
+ifneq ($(BR2_ENABLE_LOCALE),y)
+AXEL_DISABLE_I18N=--i18n=0
+endif
-axel-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) uninstall
- -$(MAKE) -C $(AXEL_DIR) clean
+define AXEL_CONFIGURE_CMDS
+ (cd $(@D); \
+ ./configure \
+ --prefix=/usr \
+ --debug=1 \
+ $(AXEL_DISABLE_I18N) \
+ )
+endef
-axel-dirclean:
- rm -rf $(AXEL_DIR)
+define AXEL_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ LFLAGS="$(TARGET_LDFLAGS) $(AXEL_LDFLAGS)" -C $(@D)
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_AXEL),y)
-TARGETS+=axel
-endif
+define AXEL_INSTALL_TARGET_CMDS
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
+
+define AXEL_UNINSTALL_TARGET_CMDS
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
+endef
+
+define AXEL_CLEAN_CMDS
+ -$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(call GENTARGETS,package,axel))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 18/18] logrotate: convert to gentargets and bump to 3.7.9
From: Peter Korsgaard @ 2010-09-26 20:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-18-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>
Thanks, committed with small tweaks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] logrotate: convert to gentargets and bump to 3.7.9
From: Peter Korsgaard @ 2010-09-26 20:53 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=f09275968cac629ea964474b7184be2dad3f1a36
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: pass LDFLAGS, remove manpages, get rid _BINARY vars only used once]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 8 ++--
package/logrotate/logrotate.mk | 62 ++++++++++++++++++----------------------
2 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/CHANGES b/CHANGES
index 4f6ed1e..33299a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,10 +24,10 @@
iproute2, iptables, jpeg, kexec, kismet, less, libcurl,
libdnet, libevent, libglade, libgtk2, libiconv, libidn,
libmms, libnl, liboil, libpcap, libpng, libungif, libxml2,
- libxslt, lighttpd, lite, m4, mdadm, metacity, mtd-utils,
- mysql_client, nano, nbd, ncftp, neon, netperf, ntfsprogs, ntp,
- openntpd, openssh, openvpn, oprofile, pango, pcre, php,
- prboom, radvd, qt, samba, sdl_mixer, sdl_sound,
+ libxslt, lighttpd, lite, logrotate, m4, mdadm, metacity,
+ mtd-utils, mysql_client, nano, nbd, ncftp, neon, netperf,
+ ntfsprogs, ntp, openntpd, openssh, openvpn, oprofile, pango,
+ pcre, php, prboom, radvd, qt, samba, sdl_mixer, sdl_sound,
shared-mime-info, speex, sqlite, squashfs, strace, taglib,
tcpdump, tiff, tn5250, udev, udpcast, usbmount, usbutils,
which, xlib_libX11, zlib
diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index 337fd8e..0e41d6a 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -1,42 +1,36 @@
-LOGROTATE_VERSION:=3.7.7
-LOGROTATE_SOURCE:=logrotate-$(LOGROTATE_VERSION).tar.gz
-LOGROTATE_SITE:=https://fedorahosted.org/releases/l/o/logrotate/
-LOGROTATE_DIR:=$(BUILD_DIR)/logrotate-$(LOGROTATE_VERSION)
-LOGROTATE_BINARY:=logrotate
-LOGROTATE_TARGET_BINARY:=usr/sbin/$(LOGROTATE_BINARY)
-
-$(DL_DIR)/$(LOGROTATE_SOURCE):
- $(call DOWNLOAD,$(LOGROTATE_SITE),$(LOGROTATE_SOURCE))
-
-$(LOGROTATE_DIR)/.source: $(DL_DIR)/$(LOGROTATE_SOURCE)
- $(ZCAT) $(DL_DIR)/$(LOGROTATE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LOGROTATE_DIR) package/logrotate/ logrotate\*.patch
- touch $@
-
-$(LOGROTATE_DIR)/$(LOGROTATE_BINARY): $(LOGROTATE_DIR)/.source
- $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS)" -C $(LOGROTATE_DIR)
-
-$(TARGET_DIR)/$(LOGROTATE_TARGET_BINARY): $(LOGROTATE_DIR)/$(LOGROTATE_BINARY)
- $(MAKE) PREFIX=$(TARGET_DIR) -C $(LOGROTATE_DIR) install
+#############################################################
+#
+# logrotate
+#
+#############################################################
+LOGROTATE_VERSION = 3.7.9
+LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
+LOGROTATE_SITE = https://fedorahosted.org/releases/l/o/logrotate/
+
+LOGROTATE_DEPENDENCIES = popt
+
+define LOGROTATE_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS)" LDFLAGS="$(LDFLAGS)" -C $(@D)
+endef
+
+define LOGROTATE_INSTALL_TARGET_CMDS
+ $(MAKE) PREFIX=$(TARGET_DIR) -C $(@D) install
if [ ! -f $(TARGET_DIR)/etc/logrotate.conf ]; then \
$(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf; \
fi
$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d
+endef
-logrotate: popt $(TARGET_DIR)/$(LOGROTATE_TARGET_BINARY)
-
-logrotate-source: $(DL_DIR)/$(LOGROTATE_SOURCE)
-
-logrotate-clean:
- rm -f $(TARGET_DIR)/$(LOGROTATE_TARGET_BINARY)
+define LOGROTATE_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/logrotate
rm -f $(TARGET_DIR)/etc/logrotate.conf
- -rmdir $(TARGET_DIR)/etc/logrotate.d
- -$(MAKE) -C $(LOGROTATE_DIR) clean
-
-logrotate-dirclean:
- rm -rf $(LOGROTATE_DIR)
+ rm -f $(TARGET_DIR)/usr/man/man5/logrotate.conf.5
+ rm -f $(TARGET_DIR)/usr/man/man8/logrotate.8
+ rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/etc/logrotate.d
+endef
-ifeq ($(BR2_PACKAGE_LOGROTATE),y)
-TARGETS+=logrotate
-endif
+define LOGROTATE_CLEAN_CMDS
+ -$(MAKE) -C $(@D) clean
+endef
+$(eval $(call GENTARGETS,package,logrotate))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] hwdata: convert to gentargets and bump to 0.230
From: Peter Korsgaard @ 2010-09-26 20:53 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=231449e1d5615f7092b49fab65a88f898bc16de3
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: get rid of unused vars, use install -D]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 +-
package/hwdata/hwdata.mk | 51 ++++++++++------------------------------------
2 files changed, 12 insertions(+), 41 deletions(-)
diff --git a/CHANGES b/CHANGES
index 26c17e7..4f6ed1e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,7 +20,7 @@
Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind,
bmon, boa, bridge-utils, bsdiff, busybox, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
- freetype, gawk, gvfs, haserl, hostapd, ifplugd, iperf,
+ freetype, gawk, gvfs, haserl, hostapd, hwdata, ifplugd, iperf,
iproute2, iptables, jpeg, kexec, kismet, less, libcurl,
libdnet, libevent, libglade, libgtk2, libiconv, libidn,
libmms, libnl, liboil, libpcap, libpng, libungif, libxml2,
diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk
index ed81cd7..7a0cef8 100644
--- a/package/hwdata/hwdata.mk
+++ b/package/hwdata/hwdata.mk
@@ -3,48 +3,19 @@
# hwdata
#
#############################################################
-HWDATA_VERSION:=0.191
-HWDATA_SOURCE:=hwdata_$(HWDATA_VERSION).orig.tar.gz
-HWDATA_PATCH:=hwdata_$(HWDATA_VERSION)-1.diff.gz
-HWDATA_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/h/hwdata/
-HWDATA_CAT:=$(ZCAT)
-HWDATA_DIR:=$(BUILD_DIR)/hwdata-$(HWDATA_VERSION)
-HWDATA_BINARY:=pci.ids
-HWDATA_TARGET_BINARY:=usr/share/hwdata/pci.ids
+HWDATA_VERSION = 0.230
+HWDATA_SOURCE = hwdata_$(HWDATA_VERSION).orig.tar.gz
+HWDATA_PATCH = hwdata_$(HWDATA_VERSION)-1.diff.gz
+HWDATA_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/h/hwdata/
-$(DL_DIR)/$(HWDATA_SOURCE):
- $(call DOWNLOAD,$(HWDATA_SITE),$(HWDATA_SOURCE))
+define HWDATA_INSTALL_TARGET_CMDS
+ install -D -m 644 $(@D)/pci.ids $(TARGET_DIR)/usr/share/hwdata/pci.ids
+ install -D -m 644 $(@D)/usb.ids $(TARGET_DIR)/usr/share/hwdata/usb.ids
+endef
-$(DL_DIR)/$(HWDATA_PATCH):
- $(call DOWNLOAD,$(HWDATA_SITE),$(HWDATA_PATCH))
-
-hwdata-source: $(DL_DIR)/$(HWDATA_SOURCE) $(DL_DIR)/$(HWDATA_PATCH)
-
-$(HWDATA_DIR)/.unpacked: $(DL_DIR)/$(HWDATA_SOURCE) $(DL_DIR)/$(HWDATA_PATCH)
- $(HWDATA_CAT) $(DL_DIR)/$(HWDATA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(HWDATA_DIR) $(DL_DIR) $(HWDATA_PATCH)
- touch $(HWDATA_DIR)/.unpacked
-
-$(TARGET_DIR)/$(HWDATA_TARGET_BINARY): $(HWDATA_DIR)/.unpacked
- mkdir -p -m 755 $(TARGET_DIR)/usr/share/hwdata
- cp -a $(HWDATA_DIR)/pci.ids $(TARGET_DIR)/usr/share/hwdata
- cp -a $(HWDATA_DIR)/usb.ids $(TARGET_DIR)/usr/share/hwdata
- -touch -c $(TARGET_DIR)/usr/share/hwdata/*
-
-hwdata: $(TARGET_DIR)/$(HWDATA_TARGET_BINARY)
-
-hwdata-clean:
+define HWDATA_UNINSTALL_TARGET_CMDS
rm -rf $(TARGET_DIR)/usr/share/hwdata
rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
+endef
-hwdata-dirclean:
- rm -rf $(HWDATA_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_HWDATA),y)
-TARGETS+=hwdata
-endif
+$(eval $(call GENTARGETS,package,hwdata))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 14/18] hwdata: convert to gentargets and bump to 0.230
From: Peter Korsgaard @ 2010-09-26 20:35 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-14-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 small tweaks, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 07/18] dosfstools: convert to gentargets and bump to 3.0.10
From: Peter Korsgaard @ 2010-09-26 20:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-7-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] boa: convert to autotargets
From: Peter Korsgaard @ 2010-09-26 20:25 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=85fac9e0c8bfa2230ecfaa96b765adec62315ca0
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Based on Martin's patch to convert to gentargets.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 +-
package/boa/boa-config.site-i386 | 1 -
package/boa/boa.mk | 98 ++++++++------------------------------
3 files changed, 21 insertions(+), 80 deletions(-)
delete mode 100644 package/boa/boa-config.site-i386
diff --git a/CHANGES b/CHANGES
index 82e2bd1..4a0ed4f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,7 +18,7 @@
New packages: xz
Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind,
- bmon, bridge-utils, busybox, dbus, dmraid, docker, dropbear,
+ bmon, boa, bridge-utils, busybox, dbus, dmraid, docker, dropbear,
e2fsprogs, expat, ezxml, fbset, freetype, gawk, gvfs, haserl,
hostapd, ifplugd, iperf, iproute2, iptables, jpeg, kexec,
kismet, less, libcurl, libdnet, libevent, libglade, libgtk2,
diff --git a/package/boa/boa-config.site-i386 b/package/boa/boa-config.site-i386
deleted file mode 100644
index 425d948..0000000
--- a/package/boa/boa-config.site-i386
+++ /dev/null
@@ -1 +0,0 @@
-ac_cv_func_setvbuf_reversed=no
diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index a51de96..702193d 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -3,84 +3,26 @@
# boa
#
#############################################################
-
-BOA_VERSION=0.94.14rc21
-
-# Don't alter below this line unless you (think) you know
-# what you are doing! Danger, Danger!
-
-BOA_SOURCE=boa-$(BOA_VERSION).tar.gz
-BOA_CAT:=$(ZCAT)
-BOA_SITE=http://www.boa.org/
-BOA_DIR=$(BUILD_DIR)/boa-$(BOA_VERSION)
-BOA_WORKDIR=$(BUILD_DIR)/boa_workdir
-
-$(DL_DIR)/$(BOA_SOURCE):
- $(call DOWNLOAD,$(BOA_SITE),$(BOA_SOURCE))
-
-$(BOA_DIR)/.unpacked: $(DL_DIR)/$(BOA_SOURCE)
- $(BOA_CAT) $(DL_DIR)/$(BOA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(BOA_DIR)/.unpacked
-
-$(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked
- rm -f $(BOA_WORKDIR)/Makefile
- mkdir -p $(BOA_WORKDIR)
- #CONFIG_SITE=package/boa/boa-config.site-$(ARCH)
- (cd $(BOA_WORKDIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- $(BOA_DIR)/configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- $(DISABLE_NLS) \
- )
- touch $(BOA_WORKDIR)/Makefile
-
-$(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer: $(BOA_WORKDIR)/Makefile
- rm -f $@
- $(MAKE) -C $(BOA_WORKDIR)
-
-$(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer
- mkdir -p $(TARGET_DIR)/usr/sbin
- cp -f $(BOA_WORKDIR)/src/boa $(TARGET_DIR)/usr/sbin/boa
- mkdir -p $(TARGET_DIR)/usr/lib/boa
- cp -f $(BOA_WORKDIR)/src/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer
- mkdir -p $(TARGET_DIR)/etc/boa
- cp -f package/boa/boa.conf $(TARGET_DIR)/etc/boa
- cp -f package/boa/mime.types $(TARGET_DIR)/etc/mime.types
- $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer
- touch $(BOA_WORKDIR)/.installed
-
-boa: $(BOA_WORKDIR)/.installed
-
-boa-source: $(DL_DIR)/$(BOA_SOURCE)
-
-boa-clean:
- -$(MAKE) -C $(BOA_WORKDIR) clean
+BOA_VERSION = 0.94.14rc21
+BOA_SOURCE = boa-$(BOA_VERSION).tar.gz
+BOA_SITE = http://www.boa.org/
+
+define BOA_INSTALL_TARGET_CMDS
+ install -D -m 755 $(@D)/src/boa $(TARGET_DIR)/usr/sbin/boa
+ install -D -m 755 $(@D)/src/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer
+ install -D -m 644 package/boa/boa.conf $(TARGET_DIR)/etc/boa/boa.conf
+ install -D -m 644 package/boa/mime.types $(TARGET_DIR)/etc/mime.types
+endef
+
+define BOA_UNINSTALL_STAGING_CMDS
+ # autotools calls uninstall-staging even if staging install
+ # isn't enabled
+endef
+
+define BOA_UNINSTALL_TARGET_CMDS
rm -rf $(TARGET_DIR)/usr/sbin/boa \
- $(TARGET_DIR)/usr/lib/boa/boa_indexer \
+ $(TARGET_DIR)/usr/lib/boa/ \
$(TARGET_DIR)/etc/mime.types $(TARGET_DIR)/etc/boa
+endef
-boa-dirclean:
- rm -rf $(BOA_DIR) $(BOA_WORKDIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_BOA),y)
-TARGETS+=boa
-endif
+$(eval $(call AUTOTARGETS,package,boa))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] bsdiff: convert to gentargets
From: Peter Korsgaard @ 2010-09-26 20:25 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=d4f1332110075f7c1eca5e333c906cb274f89407
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: cleanup build, install and uninstall targets]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 24 +++++++-------
package/bsdiff/bsdiff.mk | 75 ++++++++++++++++------------------------------
2 files changed, 38 insertions(+), 61 deletions(-)
diff --git a/CHANGES b/CHANGES
index 4a0ed4f..3d9f738 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,18 +18,18 @@
New packages: xz
Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind,
- bmon, boa, bridge-utils, busybox, dbus, dmraid, docker, dropbear,
- e2fsprogs, expat, ezxml, fbset, freetype, gawk, gvfs, haserl,
- hostapd, ifplugd, iperf, iproute2, iptables, jpeg, kexec,
- kismet, less, libcurl, libdnet, libevent, libglade, libgtk2,
- libiconv, libidn, libmms, libnl, liboil, libpcap, libpng,
- libungif, libxml2, libxslt, lighttpd, lite, m4, mdadm,
- metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon,
- netperf, ntfsprogs, ntp, openntpd, openssh, openvpn, oprofile,
- pango, pcre, php, prboom, radvd, qt, samba, sdl_mixer,
- sdl_sound, shared-mime-info, speex, sqlite, squashfs, strace,
- taglib, tcpdump, tiff, tn5250, udev, udpcast, usbmount,
- usbutils, which, xlib_libX11, zlib
+ bmon, boa, bridge-utils, bsdiff, busybox, dbus, dmraid,
+ docker, dropbear, e2fsprogs, expat, ezxml, fbset, freetype,
+ gawk, gvfs, haserl, hostapd, ifplugd, iperf, iproute2,
+ iptables, jpeg, kexec, kismet, less, libcurl, libdnet,
+ libevent, libglade, libgtk2, libiconv, libidn, libmms, libnl,
+ liboil, libpcap, libpng, libungif, libxml2, libxslt, lighttpd,
+ lite, m4, mdadm, metacity, mtd-utils, mysql_client, nano, nbd,
+ ncftp, neon, netperf, ntfsprogs, ntp, openntpd, openssh,
+ openvpn, oprofile, pango, pcre, php, prboom, radvd, qt, samba,
+ sdl_mixer, sdl_sound, shared-mime-info, speex, sqlite,
+ squashfs, strace, taglib, tcpdump, tiff, tn5250, udev,
+ udpcast, usbmount, usbutils, which, xlib_libX11, zlib
Deprecated packages: lzma
diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk
index 62608e9..276c6be 100644
--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -3,52 +3,29 @@
# bsdiff
#
#############################################################
-BSDIFF_VERSION:=4.3
-BSDIFF_SOURCE:=bsdiff-$(BSDIFF_VERSION).tar.gz
-BSDIFF_SITE:=http://www.daemonology.net/bsdiff
-BSDIFF_DIR:=$(BUILD_DIR)/bsdiff-$(BSDIFF_VERSION)
-BSDIFF_BINARY:=bsdiff
-BSDIFF_TARGET_BINARY:=usr/bin/bsdiff
-BSDIFF_ZCAT=$(ZCAT)
-
-$(DL_DIR)/$(BSDIFF_SOURCE):
- $(call DOWNLOAD,$(BSDIFF_SITE),$(BSDIFF_SOURCE))
-
-$(BSDIFF_DIR)/.source: $(DL_DIR)/$(BSDIFF_SOURCE)
- $(BSDIFF_ZCAT) $(DL_DIR)/$(BSDIFF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(BSDIFF_DIR)/.source
-
-$(BSDIFF_DIR)/$(BSDIFF_BINARY): $(BSDIFF_DIR)/.source
- (cd $(BSDIFF_DIR); \
- $(TARGET_CONFIGURE_ARGS) \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CC) -L $(STAGING_DIR)/lib -lbz2 \
- $(TARGET_CFLAGS) bsdiff.c -o bsdiff; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CC) -L $(STAGING_DIR)/lib -lbz2 \
- $(TARGET_CFLAGS) bspatch.c -o bspatch; \
- )
-
-$(TARGET_DIR)/$(BSDIFF_TARGET_BINARY): $(BSDIFF_DIR)/$(BSDIFF_BINARY)
- cp -dpf $(BSDIFF_DIR)/bsdiff $(TARGET_DIR)/usr/bin/.
- cp -dpf $(BSDIFF_DIR)/bspatch $(TARGET_DIR)/usr/bin/.
-
-bsdiff: bzip2 $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY)
-
-bsdiff-source: $(DL_DIR)/$(BSDIFF_SOURCE)
-
-bsdiff-clean:
- -rm $(TARGET_DIR)/usr/bin/{bsdiff,bspatch}
- -rm $(BSDIFF_DIR)/{bsdiff,bspatch}
-
-bsdiff-dirclean:
- rm -rf $(BSDIFF_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_BSDIFF),y)
-TARGETS+=bsdiff
-endif
+BSDIFF_VERSION = 4.3
+BSDIFF_SOURCE = bsdiff-$(BSDIFF_VERSION).tar.gz
+BSDIFF_SITE = http://www.daemonology.net/bsdiff
+BSDIFF_DEPENDENCIES = bzip2
+
+define BSDIFF_BUILD_CMDS
+ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -lbz2 \
+ $(@D)/bsdiff.c -o $(@D)/bsdiff
+ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -lbz2 \
+ $(@D)/bspatch.c -o $(@D)/bspatch
+endef
+
+define BSDIFF_INSTALL_TARGET_CMDS
+ install -D -m 755 $(@D)/bsdiff $(TARGET_DIR)/usr/bin/bsdiff
+ install -D -m 755 $(@D)/bspatch $(TARGET_DIR)/usr/bin/bspatch
+endef
+
+define BSDIFF_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/bsdiff $(TARGET_DIR)/usr/bin/bspatch
+endef
+
+define BSDIFF_CLEAN_CMDS
+ rm -f $(@D)/bsdiff $(@D)/bspatch
+endef
+
+$(eval $(call GENTARGETS,package,bsdiff))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] fbset: convert to gentargets
From: Peter Korsgaard @ 2010-09-26 20:25 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=b850ce811fa6749cc14123fe72bb20a85e6f8bd5
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 | 22 +++++++++---------
package/fbset/fbset.mk | 59 +++++++++++++----------------------------------
2 files changed, 28 insertions(+), 53 deletions(-)
diff --git a/CHANGES b/CHANGES
index fc5dad8..82e2bd1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,17 +19,17 @@
Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind,
bmon, bridge-utils, busybox, dbus, dmraid, docker, dropbear,
- e2fsprogs, expat, ezxml, freetype, gawk, gvfs, haserl, hostapd,
- ifplugd, iperf, iproute2, iptables, jpeg, kexec, kismet, less,
- libcurl, libdnet, libevent, libglade, libgtk2, libiconv, libidn,
- libmms, libnl, liboil, libpcap, libpng, libungif, libxml2,
- libxslt, lighttpd, lite, m4, mdadm, metacity, mtd-utils,
- mysql_client, nano, nbd, ncftp, neon, netperf, ntfsprogs, ntp,
- openntpd, openssh, openvpn, oprofile, pango, pcre, php,
- prboom, radvd, qt, samba, sdl_mixer, sdl_sound,
- shared-mime-info, speex, sqlite, squashfs, strace, taglib,
- tcpdump, tiff, tn5250, udev, udpcast, usbmount, usbutils,
- which, xlib_libX11, zlib
+ e2fsprogs, expat, ezxml, fbset, freetype, gawk, gvfs, haserl,
+ hostapd, ifplugd, iperf, iproute2, iptables, jpeg, kexec,
+ kismet, less, libcurl, libdnet, libevent, libglade, libgtk2,
+ libiconv, libidn, libmms, libnl, liboil, libpcap, libpng,
+ libungif, libxml2, libxslt, lighttpd, lite, m4, mdadm,
+ metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon,
+ netperf, ntfsprogs, ntp, openntpd, openssh, openvpn, oprofile,
+ pango, pcre, php, prboom, radvd, qt, samba, sdl_mixer,
+ sdl_sound, shared-mime-info, speex, sqlite, squashfs, strace,
+ taglib, tcpdump, tiff, tn5250, udev, udpcast, usbmount,
+ usbutils, which, xlib_libX11, zlib
Deprecated packages: lzma
diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
index 32ab4b8..748920d 100644
--- a/package/fbset/fbset.mk
+++ b/package/fbset/fbset.mk
@@ -3,49 +3,24 @@
# fbset
#
#############################################################
-FBSET_VERSION:=2.1
-FBSET_SOURCE:=fbset-$(FBSET_VERSION).tar.gz
-FBSET_SITE:=http://users.telenet.be/geertu/Linux/fbdev
-FBSET_DIR:=$(BUILD_DIR)/fbset-$(FBSET_VERSION)
-FBSET_CAT:=$(ZCAT)
-FBSET_BINARY:=fbset
-FBSET_TARGET_BINARY:=usr/sbin/$(FBSET_BINARY)
-
-$(DL_DIR)/$(FBSET_SOURCE):
- $(call DOWNLOAD,$(FBSET_SITE),$(FBSET_SOURCE))
-
-$(FBSET_DIR)/.unpacked: $(DL_DIR)/$(FBSET_SOURCE)
- $(FBSET_CAT) $(DL_DIR)/$(FBSET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FBSET_DIR) package/fbset/ \
- fbset-$(FBSET_VERSION)\*.patch \
- fbset-$(FBSET_VERSION)\*.patch.$(ARCH)
- touch $@
-
-$(FBSET_DIR)/$(FBSET_BINARY): $(FBSET_DIR)/.unpacked
- $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(FBSET_DIR)
- touch -c $@
-
-$(TARGET_DIR)/$(FBSET_TARGET_BINARY): $(FBSET_DIR)/$(FBSET_BINARY)
- $(INSTALL) -m 755 $(FBSET_DIR)/$(FBSET_BINARY) $(TARGET_DIR)/$(FBSET_TARGET_BINARY)
+FBSET_VERSION = 2.1
+FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz
+FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
+FBSET_BINARY = fbset
+FBSET_TARGET_BINARY = usr/sbin/$(FBSET_BINARY)
+
+define FBSET_BUILD_CMDS
+ $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define FBSET_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 755 $(@D)/$(FBSET_BINARY) $(TARGET_DIR)/$(FBSET_TARGET_BINARY)
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBSET_TARGET_BINARY)
- touch -c $@
-
-fbset: $(TARGET_DIR)/$(FBSET_TARGET_BINARY)
-
-fbset-source: $(DL_DIR)/$(FBSET_SOURCE)
+endef
-fbset-clean:
+define FBSET_CLEAN_CMDS
rm -f $(TARGET_DIR)/$(FBSET_TARGET_BINARY)
- -$(MAKE) -C $(FBSET_DIR) clean
+ -$(MAKE) -C $(@D) clean
+endef
-fbset-dirclean:
- rm -rf $(FBSET_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_FBSET),y)
-TARGETS+=fbset
-endif
+$(eval $(call GENTARGETS,package,fbset))
--
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