* [Buildroot] PATCH [1/1] fix building QT with uclibc 0.9.31
From: Sagaert Johan @ 2010-06-14 10:10 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87bpbef1un.fsf@macbook.be.48ers.dk>
Hi Peter
Did you build the JavaScriptCore and Multimedia module ?
I had a build error : pthread_getattr_np is not defined in uclibc,
there was a workaround for uclibc 0.9.30.x but not for 0.9.31.
Snippet from the patch.
#if __UCLIBC_MAJOR__ == 0 && \
(__UCLIBC_MINOR__ < 9 || \
- (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 30))
+ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))
#define UCLIBC_USE_PROC_SELF_MAPS 1
#include <stdio_ext.h>
-----Oorspronkelijk bericht-----
Van: Peter Korsgaard [mailto:jacmet at gmail.com] Namens Peter Korsgaard
Verzonden: maandag 14 juni 2010 10:36
Aan: Sagaert Johan
CC: buildroot at busybox.net
Onderwerp: Re: PATCH [1/1] fix building QT with uclibc 0.9.31
>>>>> "Sagaert" == Sagaert Johan <sagaert.johan@skynet.be> writes:
Sagaert> diff -rupN
buildroot-2010.05/package/qt/qt-4.6.2-pthread_getattr_np.patch
What does this fix? I've build qt-4.6.2 several times with uclibc 0.9.31 /
gcc 4.4.4 without problems?
--
Bye, Peter Korsgaard
-------------- next part --------------
A non-text attachment was scrubbed...
Name: qt-4.6.2-pthread_getattr_np.patch
Type: application/octet-stream
Size: 3819 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100614/b970cfeb/attachment.obj>
^ permalink raw reply
* [Buildroot] [PATCH 3/4] ffmpeg: allow customization of codecs, (de)muxers and other components
From: Luca Ceresoli @ 2010-06-14 10:00 UTC (permalink / raw)
To: buildroot
Peter Korsgaard wrote:
> >>>>> "Luca" == Luca Ceresoli <luca@lucaceresoli.net> writes:
>
> Hi,
>
> Luca> +ifneq ($(BR2_PACKAGE_FFMPEG_DECODERS),"all")
> >>
> >> I would suggest you use qstrip + strip here as well, so it doesn't break if the
> >> user accidently added extra spaces or so.
>
> Luca> How can foreach break with extra spaces? I've been trying things as:
> >> BR2_PACKAGE_FFMPEG_ENCODERS=" vorbis flac "
> Luca> and they work ok.
>
> Not the foreach, but the ifneq (....,"all") would break if the user
> ended up setting it to "all " or " all" or similar.
Sorry, now I got what you mean.
Why do you say qstrip+strip anyway? qstrip does strip itself:
> # Strip quotes and then whitespaces
> qstrip=$(strip $(subst ",,$(1)))
> #"))
So I would do:
-ifneq ($(BR2_PACKAGE_FFMPEG_ENCODERS),"all")
+ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_ENCODERS)),all)
If that's ok, it will be in the re-submitted patches.
>
> --
> Bye, Peter Korsgaard
>
Luca
^ permalink raw reply
* [Buildroot] [PATCH 3/4] ffmpeg: allow customization of codecs, (de)muxers and other components
From: Peter Korsgaard @ 2010-06-14 9:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <L3ZXW6$DC1420A5D64F3A5EE742F2128E2CC026@aruba.it>
>>>>> "Luca" == Luca Ceresoli <luca@lucaceresoli.net> writes:
Hi,
Luca> +ifneq ($(BR2_PACKAGE_FFMPEG_DECODERS),"all")
>>
>> I would suggest you use qstrip + strip here as well, so it doesn't break if the
>> user accidently added extra spaces or so.
Luca> How can foreach break with extra spaces? I've been trying things as:
>> BR2_PACKAGE_FFMPEG_ENCODERS=" vorbis flac "
Luca> and they work ok.
Not the foreach, but the ifneq (....,"all") would break if the user
ended up setting it to "all " or " all" or similar.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 3/4] ffmpeg: allow customization of codecs, (de)muxers and other components
From: Luca Ceresoli @ 2010-06-14 8:50 UTC (permalink / raw)
To: buildroot
Peter Korsgaard wrote:
> >>>>> "Luca" == Luca Ceresoli <luca@lucaceresoli.net> writes:
>
> Luca> Add the option to customize the list of decoders, encoders,
> Luca> muxers, demuxers, parsers, protocols, bsfs and filters to be
> Luca> built into ffmpeg, and to compile or exclude input and output
> Luca> devices.
>
> Luca> +++ b/package/multimedia/ffmpeg/ffmpeg.mk
> Luca> @@ -49,6 +49,58 @@ else
> Luca> FFMPEG_CONF_OPT += --disable-ffserver
> Luca> endif
>
> Luca> +ifneq ($(BR2_PACKAGE_FFMPEG_ENCODERS),"all")
> Luca> +FFMPEG_CONF_OPT += --disable-encoders \
> Luca> + $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_ENCODERS)),--enable-encoder=$(x))
> Luca> +endif
> Luca> +
> Luca> +ifneq ($(BR2_PACKAGE_FFMPEG_DECODERS),"all")
>
> I would suggest you use qstrip + strip here as well, so it doesn't break if the
> user accidently added extra spaces or so.
How can foreach break with extra spaces? I've been trying things as:
> BR2_PACKAGE_FFMPEG_ENCODERS=" vorbis flac "
and they work ok.
BTW, that was with GNU make. Relevant?
>
> --
> Bye, Peter Korsgaard
>
Luca
^ permalink raw reply
* [Buildroot] [PATCH 1/4] ffmpeg: add new package
From: Luca Ceresoli @ 2010-06-14 8:45 UTC (permalink / raw)
To: buildroot
Peter Korsgaard wrote:
> >>>>> "Luca" == Luca Ceresoli <luca@lucaceresoli.net> writes:
>
> Luca> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>
> Looks good - A few comments though:
Ok with almost all. See below.
>
> Luca> ---
> Luca> CHANGES | 2 +-
> Luca> package/multimedia/Config.in | 1 +
> Luca> package/multimedia/ffmpeg/Config.in | 25 +++++++++++
> Luca> package/multimedia/ffmpeg/ffmpeg.mk | 79 +++++++++++++++++++++++++++++++++++
> Luca> 4 files changed, 106 insertions(+), 1 deletions(-)
> Luca> create mode 100644 package/multimedia/ffmpeg/Config.in
> Luca> create mode 100644 package/multimedia/ffmpeg/ffmpeg.mk
>
> Luca> diff --git a/CHANGES b/CHANGES
> Luca> index 3ba7195..6ca4fc9 100644
> Luca> --- a/CHANGES
> Luca> +++ b/CHANGES
> Luca> @@ -4,7 +4,7 @@
>
> Luca> New GTK-based configurator, usable using 'make gconfig'.
>
> Luca> - New packages: cgilua, copas, coxpcall, luafilesystem,
> Luca> + New packages: cgilua, copas, coxpcall, ffmpeg, luafilesystem,
> Luca> luasocket, rings, wsapi, xavante
>
> I would prefer if patches don't edit CHANGES - There's too high risk for
> merge conflicts.
>
> Luca> +config BR2_PACKAGE_FFMPEG_GPL
> Luca> + bool "Enable GPL code"
> Luca> + default n
> Luca> +config BR2_PACKAGE_FFMPEG_NONFREE
> Luca> + bool "Enable nonfree code"
> Luca> + default n
>
> 'n' is default, so there's no need for those lines.
>
> Luca> +ifeq ($(BR2_INET_IPV6),y)
> Luca> +FFMPEG_CONF_OPT += --enable-ipv6
> Luca> +else
> Luca> +FFMPEG_CONF_OPT += --disable-ipv6
> Luca> +endif
>
> We do have a generic DISABLE_IPV6 if ffmpeg detects ipv6 support
> automatically even if --enable-ipv6 isn' passed.
>
> Luca> +# Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
> Luca> +define FFMPEG_CONFIGURE_CMDS
> Luca> + (cd $(FFMPEG_SRCDIR) && rm -rf config.cache && \
> Luca> + $(TARGET_CONFIGURE_OPTS) \
> Luca> + $(TARGET_CONFIGURE_ARGS) \
> Luca> + $(TARGET_CONFIGURE_ENV) \
> Luca> + $(FFMPEG_CONF_ENV) \
> Luca> + ./configure \
> Luca> + --enable-cross-compile \
> Luca> + --cross-prefix=$(TARGET_CROSS) \
> Luca> + --sysroot=$(STAGING_DIR) \
> Luca> + --host-cc=$(HOSTCC) \
> Luca> + --cc=$(TARGET_CC) \
> Luca> + --arch=$(BR2_ARCH) \
> Luca> + --extra-cflags=-fPIC \
> Luca> + $(DISABLE_NLS) \
> Luca> + $(DISABLE_LARGEFILE) \
> Luca> + $(DISABLE_IPV6) \
> Luca> + $(FFMPEG_CONF_OPT) \
>
> Does ffmpeg configure handle the -q (quiet) flag? If so, please add
> $(QUIET) as well.
It doesn't.
>
> Is --cc needed? Doesn't it just use the CC environment variable? If not,
> what about TARGET_CFLAGS / TARGET_LDFLAGS?
>
> Luca> + )
> Luca> +endef
> Luca> +
> Luca> +# Override FFMPEG_INSTALL_TARGET_OPT: FFmpeg does not support install-strip
> Luca> +FFMPEG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
>
> FYI, in the future I would like to get rid of the 'make install vs make
> install-strip', but for now this is fine.
>
> --
> Bye, Peter Korsgaard
>
Luca
^ permalink raw reply
* [Buildroot] Annoying... nothing work at all :-(
From: Will Moore @ 2010-06-14 8:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1276442348.14503.5.camel@localhost>
> -----Original Message-----
> From: buildroot-bounces at busybox.net [mailto:buildroot-bounces at busybox.net]
> On Behalf Of sani.broyeur
> Sent: 13 June 2010 16:19
> To: buildroot at busybox.net
> Subject: Re: [Buildroot] Annoying... nothing work at all :-(
>
> OK thanks Thomas, let's be more accurate, step by step:
>
> 0) My experience is not an "insult", juste a "result" :-)
>
> 1) tar -xvzf buildroot-2010.05.tar.gz --> OK.
>
> 2) cd buildroot-2010.05 --> OK.
>
> 3) make menuconfig
> - no changes at all made to default options
> - save on exit
>
> 4) make --> OK. rootfs.ext2 created in output/images
>
> 5) make menuconfig again to ask for a kernel
> - kernel type -> advanced configuration
> linux kernel version -> latest
> patch -> no
> linux kernel configuration -> Run make ARCH=$(ARCH) [xconfig|
> menuconfig] before build
> kernel binary -> bZimage
> destination -> copy kernel to root file
> - save on exit
>
> 6) make
>
> make[1]: *** [insmod.static] Erreur 1
> make[1]: *** Attente des t?ches non termin?es....
> make[1]: quittant le r?pertoire
> ? /devel/buildroot-2010.05/output/toolchain/module-init-tools-3.2.2 ?
> make: ***
> [/devel/buildroot-2010.05/output/toolchain/module-init-tools-3.2.2/depmod]
> Erreur 2
> [root at hercules buildroot-2010.05]#
>
> -> Message means "waiting for unfinished tasks": the "-j 2" option in
> make invocation (defaut = 2) is perhaps the cause. Relaunch!
>
> 7) make again
>
> rm -rf /devel/buildroot-2010.05/output/build/buildroot-config
> mkdir -p /devel/buildroot-2010.05/output/build
> cp -dpRf
> package/config/buildroot-config /devel/buildroot-
> 2010.05/output/build/buildroot-config
> /usr/bin/make -j2
> -C /devel/buildroot-2010.05/output/toolchain/module-init-tools-3.2.2
> make[1]: entrant dans le r?pertoire
> ? /devel/buildroot-2010.05/output/toolchain/module-init-tools-3.2.2 ?
> /usr/lib64/ccache/gcc -g -O2 -Wunused -Wall -o lsmod lsmod.o
> /usr/lib64/ccache/gcc -g -O2 -Wunused -Wall -o insmod insmod.o
> /usr/lib64/ccache/gcc -g -O2 -Wunused -Wall -o rmmod rmmod.o
> /usr/lib64/ccache/gcc -g -O2 -Wunused -Wall -o modprobe modprobe.o
> zlibsupport.o
> /usr/lib64/ccache/gcc -g -O2 -Wunused -Wall -o depmod depmod.o
> moduleops.o tables.o zlibsupport.o
> /usr/lib64/ccache/gcc -g -O2 -Wunused -Wall -o modinfo modinfo.o
> zlibsupport.o
> /usr/lib64/ccache/gcc -g -O2 -Wunused -Wall -o insmod.static -static
> insmod.o
> /usr/bin/ld: cannot find -lc
> collect2: ld a retourn? 1 code d'?tat d'ex?cution
> make[1]: *** [insmod.static] Erreur 1
> make[1]: quittant le r?pertoire
> ? /devel/buildroot-2010.05/output/toolchain/module-init-tools-3.2.2 ?
> make: ***
> [/devel/buildroot-2010.05/output/toolchain/module-init-tools-3.2.2/depmod]
> Erreur 2
>
> -> ld perhaps invoked with an empty variable leading to syntax mismatch,
> option taken for parameter or missing one, or something alike. Relaunch!
>
> 8) make again
>
> This time, "linux26-menuconfig" is automagically invoked as expected.
> - Just changed: SMP support [disable] / CPU type [ATOM]
> - No optimization nor kernel tayloring for the embedded x86 target.
> Let's make it simple :-)
> - save changes on exit
> make goes on, generating all the regular stuff.
> [...] MODPOST 1975 modules
> [...]
> Root device is (8, 2)
> Setup is 13516 bytes (padded to 13824 bytes).
> System is 3183 kB
> CRC f8992a55
> Kernel: arch/x86/boot/bzImage is ready (#1)
> [...]
> /devel/buildroot-2010.05/output/target/boot/bzImage -> OK a kernel is
> generated.
> [...]
> >>> Generating root filesystem image rootfs.ext2
> rm -f /devel/buildroot-2010.05/output/build/_fakeroot.fs
> touch /devel/buildroot-2010.05/output/build/.fakeroot.00000
> cat /devel/buildroot-2010.05/output/build/.fakeroot*
> > /devel/buildroot-2010.05/output/build/_fakeroot.fs
> echo "chown -R 0:0 /devel/buildroot-2010.05/output/target"
> >> /devel/buildroot-2010.05/output/build/_fakeroot.fs
> echo "/devel/buildroot-2010.05/output/host/usr/bin/makedevs -d
> target/generic/device_table.txt /devel/buildroot-2010.05/output/target"
> >> /devel/buildroot-2010.05/output/build/_fakeroot.fs
> echo "
> PATH="/devel/buildroot-2010.05/output/toolchain/bin:/devel/buildroot-
> 2010.05/output/host/bin:/devel/buildroot-
> 2010.05/output/host/usr/bin:/devel/buildroot-
> 2010.05/output/host/usr/sbin/:/devel/buildroot-
> 2010.05/output/staging/bin:/devel/buildroot-
> 2010.05/output/staging/usr/bin:/usr/lib64/qt-
> 3.3/bin:/usr/kerberos/sbin:/usr/kerberos/bin:/usr/lib64/ccache:/usr/local/
> sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin"
> fs/ext2/genext2fs.sh -d /devel/buildroot-2010.05/output/target -U
> /devel/buildroot-2010.05/output/images/rootfs.ext2" >> /devel/buildroot-
> 2010.05/output/build/_fakeroot.fs
> chmod a+x /devel/buildroot-2010.05/output/build/_fakeroot.fs
> /devel/buildroot-2010.05/output/host/usr/bin/fakeroot
> -- /devel/buildroot-2010.05/output/build/_fakeroot.fs
> rootdir=/devel/buildroot-2010.05/output/target
> table='target/generic/device_table.txt'
> genext2fs: couldn't allocate a block (no free space)
> make: *** [/devel/buildroot-2010.05/output/images/rootfs.ext2] Erreur 1
>
> -> KO the ext2 fs is NOT generated.
>
> Of course, there is plenty of Gb available on disk, this error is
> surprising.
>
> 9) trying to generate something else, i.e cramfs, squashfs and
> initramfs:
> - make menuconfig -> target filesystem option
> ENABLED cramfs
> ENABLED squashfs
> ENABLED initramfs
> DISABLED ext2
> - save on exit
>
> 10) make again
> - building of cramfs
> [...]
> >>> Generating root filesystem image rootfs.cramfs
> warning: estimate of required size (upper bound) is 661MB, but maximum
> image size is 272MB, we might die prematurely
> mkcramfs: filesystem too big
> make: *** [/devel/buildroot-2010.05/output/images/rootfs.cramfs] Erreur
> 8
>
> 11) let see what we got after attempting to generate either a root fs
> and the corresponding kernel:
>
> [root at hercules buildroot-2010.05]# ll output/images/
> total 7156
> -rw-r--r-- 1 root root 3272576 juin 13 15:50 bzImage
> -rw-r--r-- 1 root root 0 juin 13 15:50 rootfs.cramfs
> -rw-r--r-- 1 root root 3645440 juin 13 14:08 rootfs.ext2
> -rw-r--r-- 1 root root 394744 juin 13 15:49 rootfs.initramfs
>
> - kernel seems to be generated (no evidence it will load at this time)
> - rootfs.cramfs isn't generated
> - rootfs.ext2 seems to be generated BUT is not (error above at point 8)
> - rootfs.initramfs is only a text file without any CPIO content:
>
> [root at hercules buildroot-2010.05]# head output/images/rootfs.initramfs
>
> #####################
> # /devel/buildroot-2010.05/output/target
> # Last modified: 1276436908.0000000000
>
> dir /bin 775 0 0
> slink /bin/dmesg busybox 777 0 0
> slink /bin/tar busybox 777 0 0
> slink /bin/watch busybox 777 0 0
> slink /bin/zcat busybox 777 0 0
>
> [root at hercules buildroot-2010.05]# tail output/images/rootfs.initramfs
> slink /usr/sbin/rdate ../../bin/busybox 777 0 0
> slink /usr/sbin/readprofile ../../bin/busybox 777 0 0
> slink /usr/sbin/setlogcons ../../bin/busybox 777 0 0
> slink /usr/sbin/dnsd ../../bin/busybox 777 0 0
> slink /usr/sbin/chroot ../../bin/busybox 777 0 0
> dir /usr/share 775 0 0
> dir /usr/share/udhcpc 775 0 0
> file /usr/share/udhcpc/default.script /devel/buildroot-
> 2010.05/output/target/usr/share/udhcpc/default.script 755 0 0
> dir /home 775 0 0
> dir /home/default 2755 1000 1000
> [root at hercules buildroot-2010.05]#
>
> This "rootfs.initramfs" is NOT an initramfs as expected but something
> else I cannot state on.
>
> 12) additional investigations:
> - asking for a bootloader without kernel prevent errors in target
> filesystems generation, since the size issue is avoided.
> - asking a bootloader in make menuconfig lead to strange things:
> -> grub only create a /boot/grub subdir in target, but doesn't
> create
> menu.lst nor invoque root (hd0,0) nor setup (hd0,0). Doing it manually
> afterwards is refused.
> -> sysconfig is an external bootloader, your're right, so
> including it
> in menuconfig could be understood as "prepare a subdir in output/image
> with all the relevant stuff configured, that is: bzImage+ldlinux.sys
> +rootfs.cramfs+syslinux.cfg. Nothing this way is done. What means
> "syslinux" in menuconfig?
>
> 13) Pending questions...
> - Is buildroot suitable at this time to create tiny x86 embedded
> systems, either by regular filesystem on a disk (ext2) or ramdisk in a
> flashcard (syslinux+initrd) ?
I believe it is, yes.
I have used various versions of buildroot since early 2009 to generate cross
tools, build Linux kernel and a tar of a rootfs for both vortex86SX (486SX)
and vortex86dx (486DX) PC104 embedded X86 boards. I use the host's syslinux
to generate a Linux boot partition on an IDE flash disk then copy the kernel
across. I am not sure what you would term tiny, but I am generating tar
rootfs in the order of 2.3MB MB which I then copy across to an ext2 format
partition on the flash disk.
> - Why is there so many unrecoverable errors as I used default presets ?
> - Is there rock-solid examples of bootable x86 systems generated, or
> only "I sware it works, I was aware of an alien CPU card using it long
> time ago in a distant galaxy" :-)))
Yes. Naturally I have a number of rock-solid examples of configurations for
bootable x86 systems generated by buildroot, as above. I am running ICOP
VSX-6154 and ICOP VSX-6354 PC104 cards.
>
> Please remember: this not an "insult", just a "result" ;-)
>
> Best regards.
>
>
>
> Le dimanche 13 juin 2010 ? 11:19 +0200, Thomas Petazzoni a ?crit :
> > Hello,
> >
> > On Sun, 13 Jun 2010 05:13:14 +0200
> > "sani.broyeur" <sani.broyeur@free.fr> wrote:
> >
> > > - When invoking "make menuconfig && make" an ext2 image is created. OK
> > > but unbootable, without bootloader nor kernel.
> >
> > We've made the choice by default to only build a toolchain + a simple
> > root filesystem image with only Busybox in it. So that's expected.
> >
> > > - When asking to add a bootloader, grub doesn't install properly on
> > > target image, config is not done. This part is broken.
> >
> > What do you expect exactly ? How would you want grub to be installed ?
> > If you're not more specific about what you expect, it's going to be
> > hard to help you.
> >
> > (FYI: I'm currently doing a fairly big bootloader code cleanup, for
> > which I've sent a 49 patches patch set yesterday on this list. At least
> > with this patch set applied, Grub compiles properly. However, I'm not
> > sure what to do with the resulting binaries.)
> >
> > > - When asking to add a CF/FAT16 bootloader, syslinux doesn't install
> > > at all on target image, this part is also broken since it does really
> > > nothing on the image :-)
> >
> > What do you call "target image" ? The ext2 filesystem ? Then it is
> > expected that syslinux isn't installed *in* it. However, the syslinux
> > image is supposed to be available in output/images/.
> >
> > But again, I know syslinux builds properly with my bootloaders-cleanup
> > branch applied. The bootloader code in Buildroot hasn't been
> > unmaintained for quite some time, so he doesn't surprise me that you
> > encounter issues.
> >
> > Another thing is that Buildroot is used a lot for non-x86 architectures
> > (ARM, PowerPC, etc.), and for these architectures, the bootloader is
> > never *in* the root filesystem image. The fact the bootloader is *in*
> > the root filesystem image is a x86-specific thing, and as we haven't
> > had a lot of x86-related contributions lately, it may well be that
> > we're not doing what should be done for this specific architecture.
> >
> > > - When asking a kernel, attempts lead often to cryptic make errors and
> > > the whole buildroot tree has to be recreated from .tar.gz without
> > > kernel generation. The "kernel" menu in menuconfig is broken, and no
> > > kernel config is invoked at build or within menuconfig.
> >
> > Please provide detailed reproduction steps, because ? attemps lead
> > often to cryptic make errors ? is by no means an useful description of
> > what's happening.
> >
> > FWIW :
> >
> > * I've built succesfully a kernel yesterday with Buildroot, both ARM
> > and PowerPC.
> >
> > * I'm working on a big cleanup of the linux compilation code in
> > Buildroot, because the current code is way too complicated.
> >
> > > - When invoking linux26-menuconfig (I'v found that one time), either
> > > nothing, or make errors, this one is also broken.
> >
> > Be more specific ?
> >
> > > All produced forms of "target" are either incomplete, or unusable, or
> > > unbootable, when the commands are not ending with errors!
> >
> > Be more specific ?
> >
> > > Is there somewhere an USABLE documentation?
> >
> > The only documentation we have so far is
> > http://buildroot.org/downloads/buildroot.html. Patches welcome.
> >
> > > I'm not a newbie to linux, but this "buildroot project" seems for sure
> > > not usable before years of improvements...
> >
> > We certainly have rough edges, particularly in the area of
> > bootloader/kernel compilation, which haven't seen any
> > cleanup/refactoring since a very, very long time.
> >
> > I'm sorry, but your message is by no means useful :
> >
> > * You're not giving an appropriate level of precision that would give
> > us the opportunity to understand and solve the problems you're
> > facing. For each problem: the .config file that allows to produce
> > the issue, the behaviour that you see, and the behaviour that you
> > would expect Buildroot to have.
> >
> > * You're insulting the work done by the developers on the Buildroot
> > project, reducing their incentive to help you and to solve your
> > problems.
> >
> > 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
^ permalink raw reply
* [Buildroot] PATCH [1/1] fix building QT with uclibc 0.9.31
From: Peter Korsgaard @ 2010-06-14 8:35 UTC (permalink / raw)
To: buildroot
In-Reply-To: <AC75A538105F448E979110FFB6C1D3B9@apexjs>
>>>>> "Sagaert" == Sagaert Johan <sagaert.johan@skynet.be> writes:
Sagaert> diff -rupN buildroot-2010.05/package/qt/qt-4.6.2-pthread_getattr_np.patch
What does this fix? I've build qt-4.6.2 several times with uclibc 0.9.31
/ gcc 4.4.4 without problems?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] PATCH [1/1] fix building QT with uclibc 0.9.31
From: Thomas Petazzoni @ 2010-06-14 8:25 UTC (permalink / raw)
To: buildroot
In-Reply-To: <AC75A538105F448E979110FFB6C1D3B9@apexjs>
Hello Sagaert,
Your patch is unfortunately word-wrapped. Can you configure your e-mail
client not to word-wrap patches ?
Moreover, this patch needs a description: what is it fixing ?
Thanks!
Thomas
On Mon, 14 Jun 2010 10:19:45 +0200
"Sagaert Johan" <sagaert.johan@skynet.be> wrote:
> diff -rupN
> buildroot-2010.05/package/qt/qt-4.6.2-pthread_getattr_np.patch
> buildroot/package/qt/qt-4.6.2-pthread_getattr_np.patch ---
> buildroot-2010.05/package/qt/qt-4.6.2-pthread_getattr_np.patch
> 1970-01-01 01:00:00.000000000 +0100 +++
> buildroot/package/qt/qt-4.6.2-pthread_getattr_np.patch 2010-06-13
> 19:10:16.000000000 +0200 @@ -0,0 +1,104 @@
> +---
> qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCor
> e/runtime/Collector.cpp 2010-02-11 16:55:20.000000000 +0100
> ++++
> qt-everywhere-opensource-src-4.6.2JS/src/3rdparty/javascriptcore/JavaScriptC
> ore/runtime/Collector.cpp 2010-05-23 10:49:29.000000000 +0200
> +@@ -74,6 +74,22 @@
> + #endif
> + #include <unistd.h>
> +
> ++#if defined(QT_LINUXBASE)
> ++#include <dlfcn.h>
> ++#endif
> ++
> ++#if defined(__UCLIBC__)
> ++// versions of uClibc 0.9.28 and below do not have
> ++// pthread_getattr_np or pthread_attr_getstack.
> ++#if __UCLIBC_MAJOR__ == 0 && \
> ++ (__UCLIBC_MINOR__ < 9 || \
> ++ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))
> ++#define UCLIBC_USE_PROC_SELF_MAPS 1
> ++#include <stdio_ext.h>
> ++extern int *__libc_stack_end;
> ++#endif
> ++#endif
> ++
> + #if PLATFORM(SOLARIS)
> + #include <thread.h>
> + #else
> +@@ -667,16 +683,59 @@ static inline void* currentThreadStackBa
> + get_thread_info(find_thread(NULL), &threadInfo);
> + return threadInfo.stack_end;
> + #elif PLATFORM(UNIX)
> ++#ifdef UCLIBC_USE_PROC_SELF_MAPS
> ++ // Read /proc/self/maps and locate the line whose address
> ++ // range contains __libc_stack_end.
> ++ FILE *file = fopen("/proc/self/maps", "r");
> ++ if (!file)
> ++ return 0;
> ++ __fsetlocking(file, FSETLOCKING_BYCALLER);
> ++ char *line = NULL;
> ++ size_t lineLen = 0;
> ++ while (!feof_unlocked(file)) {
> ++ if (getdelim(&line, &lineLen, '\n', file) <= 0)
> ++ break;
> ++
> ++ long from;
> ++ long to;
> ++ if (sscanf (line, "%lx-%lx", &from, &to) != 2)
> ++ continue;
> ++ if (from <= (long)__libc_stack_end &&
> (long)__libc_stack_end < to) {
> ++ fclose(file);
> ++ free(line);
> ++#ifdef _STACK_GROWS_UP
> ++ return (void *)from;
> ++#else
> ++ return (void *)to;
> ++#endif
> ++ }
> ++ }
> ++ fclose(file);
> ++ free(line);
> ++ return 0;
> ++ #else
> + static void* stackBase = 0;
> + static size_t stackSize = 0;
> + static pthread_t stackThread;
> + pthread_t thread = pthread_self();
> + if (stackBase == 0 || thread != stackThread) {
> ++
> ++#if defined(QT_LINUXBASE)
> ++ // LinuxBase is missing pthread_getattr_np - resolve it
> once at runtime instead
> ++ // see http://bugs.linuxbase.org/show_bug.cgi?id=2364
> ++ typedef int (*GetAttrPtr)(pthread_t, pthread_attr_t *);
> ++ static int (*pthread_getattr_np_ptr)(pthread_t,
> pthread_attr_t *) = 0;
> ++ if (!pthread_getattr_np_ptr)
> ++ *(void **)&pthread_getattr_np_ptr = dlsym(RTLD_DEFAULT,
> "pthread_getattr_np");
> ++#endif
> + pthread_attr_t sattr;
> + pthread_attr_init(&sattr);
> + #if HAVE(PTHREAD_NP_H) || PLATFORM(NETBSD)
> + // e.g. on FreeBSD 5.4, neundorf at kde.org
> + pthread_attr_get_np(thread, &sattr);
> ++#elif defined(QT_LINUXBASE)
> ++ if (pthread_getattr_np_ptr)
> ++ pthread_getattr_np_ptr(thread, &sattr);
> + #else
> + // FIXME: this function is non-portable; other POSIX
> systems may have different np alternatives
> + pthread_getattr_np(thread, &sattr);
> +@@ -688,6 +747,7 @@ static inline void* currentThreadStackBa
> + stackThread = thread;
> + }
> + return static_cast<char*>(stackBase) + stackSize;
> ++#endif
> + #elif PLATFORM(WINCE)
> + if (g_stackBase)
> + return g_stackBase;
> +---
> qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/runtim
> e/Collector.cpp 2010-02-11 16:55:17.000000000 +0100
> ++++
> qt-everywhere-opensource-src-4.6.2JS/src/3rdparty/webkit/JavaScriptCore/runt
> ime/Collector.cpp 2010-05-23 01:41:06.000000000 +0200
> +@@ -83,7 +83,7 @@
> + // pthread_getattr_np or pthread_attr_getstack.
> + #if __UCLIBC_MAJOR__ == 0 && \
> + (__UCLIBC_MINOR__ < 9 || \
> +- (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 30))
> ++ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))
> + #define UCLIBC_USE_PROC_SELF_MAPS 1
> + #include <stdio_ext.h>
> + extern int *__libc_stack_end;
>
--
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/1] fix building QT with uclibc 0.9.31
From: Sagaert Johan @ 2010-06-14 8:19 UTC (permalink / raw)
To: buildroot
diff -rupN buildroot-2010.05/package/qt/qt-4.6.2-pthread_getattr_np.patch
buildroot/package/qt/qt-4.6.2-pthread_getattr_np.patch
--- buildroot-2010.05/package/qt/qt-4.6.2-pthread_getattr_np.patch
1970-01-01 01:00:00.000000000 +0100
+++ buildroot/package/qt/qt-4.6.2-pthread_getattr_np.patch 2010-06-13
19:10:16.000000000 +0200
@@ -0,0 +1,104 @@
+---
qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCor
e/runtime/Collector.cpp 2010-02-11 16:55:20.000000000 +0100
++++
qt-everywhere-opensource-src-4.6.2JS/src/3rdparty/javascriptcore/JavaScriptC
ore/runtime/Collector.cpp 2010-05-23 10:49:29.000000000 +0200
+@@ -74,6 +74,22 @@
+ #endif
+ #include <unistd.h>
+
++#if defined(QT_LINUXBASE)
++#include <dlfcn.h>
++#endif
++
++#if defined(__UCLIBC__)
++// versions of uClibc 0.9.28 and below do not have
++// pthread_getattr_np or pthread_attr_getstack.
++#if __UCLIBC_MAJOR__ == 0 && \
++ (__UCLIBC_MINOR__ < 9 || \
++ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))
++#define UCLIBC_USE_PROC_SELF_MAPS 1
++#include <stdio_ext.h>
++extern int *__libc_stack_end;
++#endif
++#endif
++
+ #if PLATFORM(SOLARIS)
+ #include <thread.h>
+ #else
+@@ -667,16 +683,59 @@ static inline void* currentThreadStackBa
+ get_thread_info(find_thread(NULL), &threadInfo);
+ return threadInfo.stack_end;
+ #elif PLATFORM(UNIX)
++#ifdef UCLIBC_USE_PROC_SELF_MAPS
++ // Read /proc/self/maps and locate the line whose address
++ // range contains __libc_stack_end.
++ FILE *file = fopen("/proc/self/maps", "r");
++ if (!file)
++ return 0;
++ __fsetlocking(file, FSETLOCKING_BYCALLER);
++ char *line = NULL;
++ size_t lineLen = 0;
++ while (!feof_unlocked(file)) {
++ if (getdelim(&line, &lineLen, '\n', file) <= 0)
++ break;
++
++ long from;
++ long to;
++ if (sscanf (line, "%lx-%lx", &from, &to) != 2)
++ continue;
++ if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to)
{
++ fclose(file);
++ free(line);
++#ifdef _STACK_GROWS_UP
++ return (void *)from;
++#else
++ return (void *)to;
++#endif
++ }
++ }
++ fclose(file);
++ free(line);
++ return 0;
++ #else
+ static void* stackBase = 0;
+ static size_t stackSize = 0;
+ static pthread_t stackThread;
+ pthread_t thread = pthread_self();
+ if (stackBase == 0 || thread != stackThread) {
++
++#if defined(QT_LINUXBASE)
++ // LinuxBase is missing pthread_getattr_np - resolve it once at
runtime instead
++ // see http://bugs.linuxbase.org/show_bug.cgi?id=2364
++ typedef int (*GetAttrPtr)(pthread_t, pthread_attr_t *);
++ static int (*pthread_getattr_np_ptr)(pthread_t, pthread_attr_t *)
= 0;
++ if (!pthread_getattr_np_ptr)
++ *(void **)&pthread_getattr_np_ptr = dlsym(RTLD_DEFAULT,
"pthread_getattr_np");
++#endif
+ pthread_attr_t sattr;
+ pthread_attr_init(&sattr);
+ #if HAVE(PTHREAD_NP_H) || PLATFORM(NETBSD)
+ // e.g. on FreeBSD 5.4, neundorf@kde.org
+ pthread_attr_get_np(thread, &sattr);
++#elif defined(QT_LINUXBASE)
++ if (pthread_getattr_np_ptr)
++ pthread_getattr_np_ptr(thread, &sattr);
+ #else
+ // FIXME: this function is non-portable; other POSIX systems may
have different np alternatives
+ pthread_getattr_np(thread, &sattr);
+@@ -688,6 +747,7 @@ static inline void* currentThreadStackBa
+ stackThread = thread;
+ }
+ return static_cast<char*>(stackBase) + stackSize;
++#endif
+ #elif PLATFORM(WINCE)
+ if (g_stackBase)
+ return g_stackBase;
+---
qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/runtim
e/Collector.cpp 2010-02-11 16:55:17.000000000 +0100
++++
qt-everywhere-opensource-src-4.6.2JS/src/3rdparty/webkit/JavaScriptCore/runt
ime/Collector.cpp 2010-05-23 01:41:06.000000000 +0200
+@@ -83,7 +83,7 @@
+ // pthread_getattr_np or pthread_attr_getstack.
+ #if __UCLIBC_MAJOR__ == 0 && \
+ (__UCLIBC_MINOR__ < 9 || \
+- (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 30))
++ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))
+ #define UCLIBC_USE_PROC_SELF_MAPS 1
+ #include <stdio_ext.h>
+ extern int *__libc_stack_end;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100614/9af9720a/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: br_qt.patch
Type: application/octet-stream
Size: 4268 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100614/9af9720a/attachment-0001.obj>
^ permalink raw reply
* [Buildroot] PATCH [1/1] New package ebtables
From: Sagaert Johan @ 2010-06-14 8:16 UTC (permalink / raw)
To: buildroot
Hi
Added ebtables to the buildroot system
ebtables is the bridge filetering tool.
--- buildroot-2010.05/package/Config.in 2010-05-30 22:24:10.000000000 +0200
+++ buildroot/package/Config.in 2010-06-13 19:06:17.000000000 +0200
@@ -354,6 +354,7 @@ source "package/dhcp/Config.in"
endif
source "package/dnsmasq/Config.in"
source "package/dropbear/Config.in"
+source "package/ebtables/Config.in"
source "package/ethtool/Config.in"
source "package/hostapd/Config.in"
source "package/ifplugd/Config.in"
diff -rupN buildroot-2010.05/package/ebtables/Config.in
buildroot/package/ebtables/Config.in
--- buildroot-2010.05/package/ebtables/Config.in 1970-01-01
01:00:00.000000000 +0100
+++ buildroot/package/ebtables/Config.in 2010-06-13 19:10:16.000000000 +0200
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_EBTABLES
+ bool "ebtables"
+ help
+ Linux kernel bridge filtering tools.
+ http://sourceforge.net/projects/ebtables/
diff -rupN buildroot-2010.05/package/ebtables/ebtables.mk
buildroot/package/ebtables/ebtables.mk
--- buildroot-2010.05/package/ebtables/ebtables.mk 1970-01-01
01:00:00.000000000 +0100
+++ buildroot/package/ebtables/ebtables.mk 2010-06-13 19:10:16.000000000
+0200
@@ -0,0 +1,28 @@
+#############################################################
+#
+# ebtables
+#
+#############################################################
+EBTABLES_VERSION = v2.0.9-2
+EBTABLES_SOURCE = ebtables-$(EBTABLES_VERSION).tar.gz
+EBTABLES_SITE =
http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-2-0-9-2
+
+define EBTABLES_BUILD_CMDS
+ $(MAKE) CC=$(TARGET_CC) LD=$(TARGET_LD) -C $(@D) all
+endef
+
+define EBTABLES_INSTALL_TARGET_CMDS
+ mkdir -p $(TARGET_DIR)/usr/lib
+ cp -dpf $(@D)/ebtables $(TARGET_DIR)/usr/bin
+ cp -dpf $(@D)/ebtables-restore $(TARGET_DIR)/usr/bin
+ cp -dpf $(@D)/*.so $(TARGET_DIR)/usr/lib
+ cp -dpf $(@D)/extensions/*.so $(TARGET_DIR)/usr/lib
+endef
+
+define EBTABLES_INSTALL_STAGING_CMDS
+ cp -dpf $(@D)/include/*.h $(STAGING_DIR)/usr/include
+ cp -dpf $(@D)/*.so $(STAGING_DIR)/usr/lib/
+ cp -dpf $(@D)/extensions/*.so $(STAGING_DIR)/usr/lib/
+endef
+
+$(eval $(call GENTARGETS,package,ebtables))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100614/be50dabd/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ebtables.patch
Type: application/octet-stream
Size: 2054 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100614/be50dabd/attachment.obj>
^ permalink raw reply
* [Buildroot] [git commit master 1/1] busybox: bump 1.16.x version
From: Peter Korsgaard @ 2010-06-14 7:47 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=6ed87eac98833db52fc76abbee70809a6adeafbf
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 7 +-
package/busybox/Config.in | 2 +-
package/busybox/busybox-1.16.1-ash.patch | 15 ---
package/busybox/busybox-1.16.1-cpio.patch | 51 ---------
package/busybox/busybox-1.16.1-dhcpd.patch | 12 --
package/busybox/busybox-1.16.1-dnsd.patch | 48 --------
package/busybox/busybox-1.16.1-hwclock.patch | 152 --------------------------
package/busybox/busybox-1.16.1-sed.patch | 89 ---------------
8 files changed, 5 insertions(+), 371 deletions(-)
delete mode 100644 package/busybox/busybox-1.16.1-ash.patch
delete mode 100644 package/busybox/busybox-1.16.1-cpio.patch
delete mode 100644 package/busybox/busybox-1.16.1-dhcpd.patch
delete mode 100644 package/busybox/busybox-1.16.1-dnsd.patch
delete mode 100644 package/busybox/busybox-1.16.1-hwclock.patch
delete mode 100644 package/busybox/busybox-1.16.1-sed.patch
diff --git a/CHANGES b/CHANGES
index a7fb6b3..bd35ac5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,9 +7,10 @@
New packages: cgilua, copas, coxpcall, luafilesystem,
luasocket, rings, wsapi, xavante
- Updated/fixed packages: cdrkit, file, gawk, gstreamer, intltool,
- ipsec-tools, iptables, libidn, lmbench, netperf, openssl, php,
- qt, sqlite, tn5250, usbutils, xkeyboard-config
+ Updated/fixed packages: busybox, cdrkit, file, gawk,
+ gstreamer, intltool, ipsec-tools, iptables, libidn, lmbench,
+ netperf, openssl, php, qt, sqlite, tn5250, usbutils,
+ xkeyboard-config
Removed packages: modutils
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 68abf16..9e957e1 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -45,7 +45,7 @@ config BR2_BUSYBOX_VERSION
default "1.13.4" if BR2_BUSYBOX_VERSION_1_13_X
default "1.14.4" if BR2_BUSYBOX_VERSION_1_14_X
default "1.15.3" if BR2_BUSYBOX_VERSION_1_15_X
- default "1.16.1" if BR2_BUSYBOX_VERSION_1_16_X
+ default "1.16.2" if BR2_BUSYBOX_VERSION_1_16_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Run BusyBox's own full installation"
diff --git a/package/busybox/busybox-1.16.1-ash.patch b/package/busybox/busybox-1.16.1-ash.patch
deleted file mode 100644
index 629874e..0000000
--- a/package/busybox/busybox-1.16.1-ash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urpN busybox-1.16.1/shell/ash.c busybox-1.16.1-ash/shell/ash.c
---- busybox-1.16.1/shell/ash.c 2010-03-28 19:44:04.000000000 +0200
-+++ busybox-1.16.1-ash/shell/ash.c 2010-04-26 14:18:36.000000000 +0200
-@@ -5424,7 +5424,11 @@ rmescapes(char *str, int flag)
- size_t fulllen = len + strlen(p) + 1;
-
- if (flag & RMESCAPE_GROW) {
-+ int strloc = str - (char *)stackblock();
- r = makestrspace(fulllen, expdest);
-+ /* p and str may be invalidated by makestrspace */
-+ str = (char *)stackblock() + strloc;
-+ p = str + len;
- } else if (flag & RMESCAPE_HEAP) {
- r = ckmalloc(fulllen);
- } else {
diff --git a/package/busybox/busybox-1.16.1-cpio.patch b/package/busybox/busybox-1.16.1-cpio.patch
deleted file mode 100644
index e8282bd..0000000
--- a/package/busybox/busybox-1.16.1-cpio.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urpN busybox-1.16.1/archival/cpio.c busybox-1.16.1-cpio/archival/cpio.c
---- busybox-1.16.1/archival/cpio.c 2010-03-20 03:58:07.000000000 +0100
-+++ busybox-1.16.1-cpio/archival/cpio.c 2010-04-27 08:15:37.000000000 +0200
-@@ -424,7 +424,7 @@ int cpio_main(int argc UNUSED_PARAM, cha
- if (archive_handle->cpio__blocks != (off_t)-1
- && !(opt & CPIO_OPT_QUIET)
- ) {
-- printf("%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
-+ fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
- }
-
- return EXIT_SUCCESS;
-diff -urpN busybox-1.16.1/testsuite/cpio.tests busybox-1.16.1-cpio/testsuite/cpio.tests
---- busybox-1.16.1/testsuite/cpio.tests 2010-03-28 19:59:59.000000000 +0200
-+++ busybox-1.16.1-cpio/testsuite/cpio.tests 2010-04-27 08:15:37.000000000 +0200
-@@ -32,7 +32,7 @@ rm -rf cpio.testdir cpio.testdir2 2>/dev
- # testing "test name" "command" "expected result" "file input" "stdin"
-
- testing "cpio extracts zero-sized hardlinks" \
--"$ECHO -ne '$hexdump' | bzcat | cpio -i; echo \$?;
-+"$ECHO -ne '$hexdump' | bzcat | cpio -i 2>&1; echo \$?;
- ls -ln cpio.testdir | $FILTER_LS" \
- "\
- 1 blocks
-@@ -45,7 +45,7 @@ ls -ln cpio.testdir | $FILTER_LS" \
-
- test x"$SKIP_KNOWN_BUGS" = x"" && {
- # Currently fails. Numerous buglets: "1 blocks" versus "1 block",
--# "1 block" must go to stderr, does not list cpio.testdir/x and cpio.testdir/y
-+# does not list cpio.testdir/x and cpio.testdir/y
- testing "cpio lists hardlinks" \
- "$ECHO -ne '$hexdump' | bzcat | cpio -t 2>&1; echo \$?" \
- "\
-@@ -70,7 +70,7 @@ ln cpio.testdir/nonempty cpio.testdir/no
- mkdir cpio.testdir2
-
- testing "cpio extracts zero-sized hardlinks 2" \
--"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i); echo \$?;
-+"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i 2>&1); echo \$?;
- ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
- "\
- 2 blocks
-@@ -87,7 +87,7 @@ ls -ln cpio.testdir2/cpio.testdir | $FIL
- # Was trying to create "/usr/bin", correct is "usr/bin".
- rm -rf cpio.testdir
- testing "cpio -p with absolute paths" \
--"echo /usr/bin | cpio -dp cpio.testdir; echo \$?;
-+"echo /usr/bin | cpio -dp cpio.testdir 2>&1; echo \$?;
- ls cpio.testdir" \
- "\
- 1 blocks
diff --git a/package/busybox/busybox-1.16.1-dhcpd.patch b/package/busybox/busybox-1.16.1-dhcpd.patch
deleted file mode 100644
index 6867e24..0000000
--- a/package/busybox/busybox-1.16.1-dhcpd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpN busybox-1.16.1/networking/udhcp/leases.c busybox-1.16.1-dhcpd/networking/udhcp/leases.c
---- busybox-1.16.1/networking/udhcp/leases.c 2010-03-28 19:43:36.000000000 +0200
-+++ busybox-1.16.1-dhcpd/networking/udhcp/leases.c 2010-05-15 20:47:08.000000000 +0200
-@@ -64,6 +64,8 @@ struct dyn_lease* FAST_FUNC add_lease(
- oldest->hostname[0] = '\0';
- if (hostname) {
- char *p;
-+
-+ hostname_len++; /* include NUL */
- if (hostname_len > sizeof(oldest->hostname))
- hostname_len = sizeof(oldest->hostname);
- p = safe_strncpy(oldest->hostname, hostname, hostname_len);
diff --git a/package/busybox/busybox-1.16.1-dnsd.patch b/package/busybox/busybox-1.16.1-dnsd.patch
deleted file mode 100644
index bbcd116..0000000
--- a/package/busybox/busybox-1.16.1-dnsd.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urpN busybox-1.16.1/include/platform.h busybox-1.16.1-dnsd/include/platform.h
---- busybox-1.16.1/include/platform.h 2010-03-28 19:43:35.000000000 +0200
-+++ busybox-1.16.1-dnsd/include/platform.h 2010-04-14 19:06:10.000000000 +0200
-@@ -291,10 +291,12 @@ typedef unsigned smalluint;
- #if 1 /* if needed: !defined(arch1) && !defined(arch2) */
- # define ALIGN1 __attribute__((aligned(1)))
- # define ALIGN2 __attribute__((aligned(2)))
-+# define ALIGN4 __attribute__((aligned(4)))
- #else
- /* Arches which MUST have 2 or 4 byte alignment for everything are here */
- # define ALIGN1
- # define ALIGN2
-+# define ALIGN4
- #endif
-
-
-diff -urpN busybox-1.16.1/networking/dnsd.c busybox-1.16.1-dnsd/networking/dnsd.c
---- busybox-1.16.1/networking/dnsd.c 2010-03-28 19:43:36.000000000 +0200
-+++ busybox-1.16.1-dnsd/networking/dnsd.c 2010-04-26 14:20:25.000000000 +0200
-@@ -44,10 +44,15 @@ struct dns_head {
- uint16_t nauth;
- uint16_t nadd;
- };
-+/* Structure used to access type and class fields.
-+ * They are totally unaligned, but gcc 4.3.4 thinks that pointer of type uint16_t*
-+ * is 16-bit aligned and replaces 16-bit memcpy (in move_from_unaligned16 macro)
-+ * with aligned halfword access on arm920t!
-+ * Oh well. Slapping PACKED everywhere seems to help: */
- struct dns_prop {
-- uint16_t type;
-- uint16_t class;
--};
-+ uint16_t type PACKED;
-+ uint16_t class PACKED;
-+} PACKED;
- /* element of known name, ip address and reversed ip address */
- struct dns_entry {
- struct dns_entry *next;
-@@ -459,7 +464,8 @@ int dnsd_main(int argc UNUSED_PARAM, cha
- unsigned lsa_size;
- int udps, opts;
- uint16_t port = 53;
-- uint8_t buf[MAX_PACK_LEN + 1];
-+ /* Ensure buf is 32bit aligned (we need 16bit, but 32bit can't hurt) */
-+ uint8_t buf[MAX_PACK_LEN + 1] ALIGN4;
-
- opts = getopt32(argv, "vi:c:t:p:d", &listen_interface, &fileconf, &sttl, &sport);
- //if (opts & 0x1) // -v
diff --git a/package/busybox/busybox-1.16.1-hwclock.patch b/package/busybox/busybox-1.16.1-hwclock.patch
deleted file mode 100644
index 63350ae..0000000
--- a/package/busybox/busybox-1.16.1-hwclock.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff -urpN busybox-1.16.1/util-linux/hwclock.c busybox-1.16.1-hwclock/util-linux/hwclock.c
---- busybox-1.16.1/util-linux/hwclock.c 2010-03-19 19:58:07.000000000 -0700
-+++ busybox-1.16.1-hwclock/util-linux/hwclock.c 2010-04-14 09:29:37.889208237 -0700
-@@ -109,10 +109,53 @@ static void to_sys_clock(const char **pp
-
- static void from_sys_clock(const char **pp_rtcname, int utc)
- {
--#define TWEAK_USEC 200
-- struct tm tm_time;
-+#if 1
- struct timeval tv;
-+ struct tm tm_time;
-+ int rtc;
-+
-+ rtc = rtc_xopen(pp_rtcname, O_WRONLY);
-+ gettimeofday(&tv, NULL);
-+ /* Prepare tm_time */
-+ if (sizeof(time_t) == sizeof(tv.tv_sec)) {
-+ if (utc)
-+ gmtime_r((time_t*)&tv.tv_sec, &tm_time);
-+ else
-+ localtime_r((time_t*)&tv.tv_sec, &tm_time);
-+ } else {
-+ time_t t = tv.tv_sec;
-+ if (utc)
-+ gmtime_r(&t, &tm_time);
-+ else
-+ localtime_r(&t, &tm_time);
-+ }
-+#else
-+/* Bloated code which tries to set hw clock with better precision.
-+ * On x86, even though code does set hw clock within <1ms of exact
-+ * whole seconds, apparently hw clock (at least on some machines)
-+ * doesn't reset internal fractional seconds to 0,
-+ * making all this a pointless excercise.
-+ */
-+ /* If we see that we are N usec away from whole second,
-+ * we'll sleep for N-ADJ usecs. ADJ corrects for the fact
-+ * that CPU is not infinitely fast.
-+ * On infinitely fast CPU, next wakeup would be
-+ * on (exactly_next_whole_second - ADJ). On real CPUs,
-+ * this difference between current time and whole second
-+ * is less than ADJ (assuming system isn't heavily loaded).
-+ */
-+ /* Small value of 256us gives very precise sync for 2+ GHz CPUs.
-+ * Slower CPUs will fail to sync and will go to bigger
-+ * ADJ values. qemu-emulated armv4tl with ~100 MHz
-+ * performance ends up using ADJ ~= 4*1024 and it takes
-+ * 2+ secs (2 tries with successively larger ADJ)
-+ * to sync. Even straced one on the same qemu (very slow)
-+ * takes only 4 tries.
-+ */
-+#define TWEAK_USEC 256
- unsigned adj = TWEAK_USEC;
-+ struct tm tm_time;
-+ struct timeval tv;
- int rtc = rtc_xopen(pp_rtcname, O_WRONLY);
-
- /* Try to catch the moment when whole second is close */
-@@ -124,55 +167,64 @@ static void from_sys_clock(const char **
-
- t = tv.tv_sec;
- rem_usec = 1000000 - tv.tv_usec;
-- if (rem_usec < 1024) {
-- /* Less than 1ms to next second. Good enough */
-+ if (rem_usec < adj) {
-+ /* Close enough */
- small_rem:
- t++;
- }
-
-- /* Prepare tm */
-+ /* Prepare tm_time from t */
- if (utc)
- gmtime_r(&t, &tm_time); /* may read /etc/xxx (it takes time) */
- else
- localtime_r(&t, &tm_time); /* same */
-- tm_time.tm_isdst = 0;
-+
-+ if (adj >= 32*1024) {
-+ break; /* 32 ms diff and still no luck?? give up trying to sync */
-+ }
-
- /* gmtime/localtime took some time, re-get cur time */
- gettimeofday(&tv, NULL);
-
-- if (tv.tv_sec < t /* may happen if rem_usec was < 1024 */
-- || (tv.tv_sec == t && tv.tv_usec < 1024)
-+ if (tv.tv_sec < t /* we are still in old second */
-+ || (tv.tv_sec == t && tv.tv_usec < adj) /* not too far into next second */
- ) {
-- /* We are not too far into next second. Good. */
-- break;
-- }
-- adj += 32; /* 2^(10-5) = 2^5 = 32 iterations max */
-- if (adj >= 1024) {
-- /* Give up trying to sync */
-- break;
-+ break; /* good, we are in sync! */
- }
-
-- /* Try to sync up by sleeping */
- rem_usec = 1000000 - tv.tv_usec;
-- if (rem_usec < 1024) {
-- goto small_rem; /* already close, don't sleep */
-+ if (rem_usec < adj) {
-+ t = tv.tv_sec;
-+ goto small_rem; /* already close to next sec, don't sleep */
- }
-- /* Need to sleep.
-- * Note that small adj on slow processors can make us
-- * to always overshoot tv.tv_usec < 1024 check on next
-- * iteration. That's why adj is increased on each iteration.
-- * This also allows it to be reused as a loop limiter.
-- */
-- usleep(rem_usec - adj);
-- }
-
-- xioctl(rtc, RTC_SET_TIME, &tm_time);
-+ /* Try to sync up by sleeping */
-+ usleep(rem_usec - adj);
-
-- /* Debug aid to find "good" TWEAK_USEC.
-+ /* Jump to 1ms diff, then increase fast (x2): EVERY loop
-+ * takes ~1 sec, people won't like slowly converging code here!
-+ */
-+ //bb_error_msg("adj:%d tv.tv_usec:%d", adj, (int)tv.tv_usec);
-+ if (adj < 512)
-+ adj = 512;
-+ /* ... and if last "overshoot" does not look insanely big,
-+ * just use it as adj increment. This makes convergence faster.
-+ */
-+ if (tv.tv_usec < adj * 8) {
-+ adj += tv.tv_usec;
-+ continue;
-+ }
-+ adj *= 2;
-+ }
-+ /* Debug aid to find "optimal" TWEAK_USEC with nearly exact sync.
- * Look for a value which makes tv_usec close to 999999 or 0.
-- * for 2.20GHz Intel Core 2: TWEAK_USEC ~= 200
-+ * For 2.20GHz Intel Core 2: optimal TWEAK_USEC ~= 200
- */
-- //bb_error_msg("tv.tv_usec:%d adj:%d", (int)tv.tv_usec, adj);
-+ //bb_error_msg("tv.tv_usec:%d", (int)tv.tv_usec);
-+#endif
-+
-+ tm_time.tm_isdst = 0;
-+ xioctl(rtc, RTC_SET_TIME, &tm_time);
-
- if (ENABLE_FEATURE_CLEAN_UP)
- close(rtc);
diff --git a/package/busybox/busybox-1.16.1-sed.patch b/package/busybox/busybox-1.16.1-sed.patch
deleted file mode 100644
index 0376cc9..0000000
--- a/package/busybox/busybox-1.16.1-sed.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urpN busybox-1.16.1/editors/sed.c busybox-1.16.1-sed/editors/sed.c
---- busybox-1.16.1/editors/sed.c 2010-03-28 19:43:35.000000000 +0200
-+++ busybox-1.16.1-sed/editors/sed.c 2010-05-12 01:46:57.000000000 +0200
-@@ -487,7 +487,7 @@ static const char *parse_cmd_args(sed_cm
- static void add_cmd(const char *cmdstr)
- {
- sed_cmd_t *sed_cmd;
-- int temp;
-+ unsigned len, n;
-
- /* Append this line to any unfinished line from last time. */
- if (G.add_cmd_line) {
-@@ -496,12 +496,14 @@ static void add_cmd(const char *cmdstr)
- cmdstr = G.add_cmd_line = tp;
- }
-
-- /* If this line ends with backslash, request next line. */
-- temp = strlen(cmdstr);
-- if (temp && cmdstr[--temp] == '\\') {
-+ /* If this line ends with unescaped backslash, request next line. */
-+ n = len = strlen(cmdstr);
-+ while (n && cmdstr[n-1] == '\\')
-+ n--;
-+ if ((len - n) & 1) { /* if odd number of trailing backslashes */
- if (!G.add_cmd_line)
- G.add_cmd_line = xstrdup(cmdstr);
-- G.add_cmd_line[temp] = '\0';
-+ G.add_cmd_line[len-1] = '\0';
- return;
- }
-
-@@ -936,7 +938,15 @@ static void process_files(void)
- /* Skip blocks of commands we didn't match */
- if (sed_cmd->cmd == '{') {
- if (sed_cmd->invert ? matched : !matched) {
-- while (sed_cmd->cmd != '}') {
-+ unsigned nest_cnt = 0;
-+ while (1) {
-+ if (sed_cmd->cmd == '{')
-+ nest_cnt++;
-+ if (sed_cmd->cmd == '}') {
-+ nest_cnt--;
-+ if (nest_cnt == 0)
-+ break;
-+ }
- sed_cmd = sed_cmd->next;
- if (!sed_cmd)
- bb_error_msg_and_die("unterminated {");
-@@ -1031,7 +1041,7 @@ static void process_files(void)
- case 'c':
- /* Only triggers on last line of a matching range. */
- if (!sed_cmd->in_match)
-- sed_puts(sed_cmd->string, NO_EOL_CHAR);
-+ sed_puts(sed_cmd->string, '\n');
- goto discard_line;
-
- /* Read file, append contents to output */
-diff -urpN busybox-1.16.1/testsuite/sed.tests busybox-1.16.1-sed/testsuite/sed.tests
---- busybox-1.16.1/testsuite/sed.tests 2010-03-20 03:58:07.000000000 +0100
-+++ busybox-1.16.1-sed/testsuite/sed.tests 2010-05-12 01:46:57.000000000 +0200
-@@ -248,4 +248,28 @@ testing "sed beginning (^) matches only
- ">/usr</>lib<\n" "" \
- "/usr/lib\n"
-
-+testing "sed c" \
-+ "sed 'crepl'" \
-+ "repl\nrepl\n" "" \
-+ "first\nsecond\n"
-+
-+testing "sed nested {}s" \
-+ "sed '/asd/ { p; /s/ { s/s/c/ }; p; q }'" \
-+ "qwe\nasd\nacd\nacd\n" "" \
-+ "qwe\nasd\nzxc\n"
-+
-+testing "sed a cmd ended by double backslash" \
-+ "sed -e '/| one /a \\
-+ | three \\\\' -e '/| one-/a \\
-+ | three-* \\\\'" \
-+' | one \\
-+ | three \\
-+ | two \\
-+' '' \
-+' | one \\
-+ | two \\
-+'
-+
-+# testing "description" "arguments" "result" "infile" "stdin"
-+
- exit $FAILCOUNT
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] busybox: add 1.16.2 devmem fix for access to the highest page
From: Peter Korsgaard @ 2010-06-14 7:47 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=f4b7efe504a028035dd121e38caff2c781183ef9
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
From busybox git.
Devmem used to always map 2 pages in case the access would cross a page
boundary, which fails if you try to access the highest page.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/busybox/busybox-1.16.2-devmem.patch | 76 +++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 0 deletions(-)
create mode 100644 package/busybox/busybox-1.16.2-devmem.patch
diff --git a/package/busybox/busybox-1.16.2-devmem.patch b/package/busybox/busybox-1.16.2-devmem.patch
new file mode 100644
index 0000000..f7d1d1d
--- /dev/null
+++ b/package/busybox/busybox-1.16.2-devmem.patch
@@ -0,0 +1,76 @@
+From 351ef7188a1a2e2f154bbda6f703c2d3f4af6d79 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Wed, 14 Apr 2010 13:37:25 -0700
+Subject: [PATCH] devmem: map two pages only if it is necessary
+
+function old new delta
+devmem_main 463 469 +6
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ miscutils/devmem.c | 21 ++++++++++++++-------
+ 1 files changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/miscutils/devmem.c b/miscutils/devmem.c
+index e13dedc..39b5808 100644
+--- a/miscutils/devmem.c
++++ b/miscutils/devmem.c
+@@ -13,9 +13,9 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
+ uint64_t read_result;
+ uint64_t writeval = writeval; /* for compiler */
+ off_t target;
+- unsigned page_size = getpagesize();
++ unsigned page_size, mapped_size, offset_in_page;
+ int fd;
+- int width = 8 * sizeof(int);
++ unsigned width = 8 * sizeof(int);
+
+ /* devmem ADDRESS [WIDTH [VALUE]] */
+ // TODO: options?
+@@ -50,15 +50,22 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
+ if (argv[3])
+ writeval = bb_strtoull(argv[3], NULL, 0);
+ } else { /* argv[2] == NULL */
+- /* make argv[3] to be a valid thing to use */
++ /* make argv[3] to be a valid thing to fetch */
+ argv--;
+ }
+ if (errno)
+- bb_show_usage(); /* bb_strtouXX failed */
++ bb_show_usage(); /* one of bb_strtouXX failed */
+
+ fd = xopen("/dev/mem", argv[3] ? (O_RDWR | O_SYNC) : (O_RDONLY | O_SYNC));
++ mapped_size = page_size = getpagesize();
++ offset_in_page = (unsigned)target & (page_size - 1);
++ if (offset_in_page + width > page_size) {
++ /* This access spans pages.
++ * Must map two pages to make it possible: */
++ mapped_size *= 2;
++ }
+ map_base = mmap(NULL,
+- page_size * 2 /* in case value spans page */,
++ mapped_size,
+ argv[3] ? (PROT_READ | PROT_WRITE) : PROT_READ,
+ MAP_SHARED,
+ fd,
+@@ -68,7 +75,7 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
+
+ // printf("Memory mapped at address %p.\n", map_base);
+
+- virt_addr = (char*)map_base + (target & (page_size - 1));
++ virt_addr = (char*)map_base + offset_in_page;
+
+ if (!argv[3]) {
+ switch (width) {
+@@ -119,7 +126,7 @@ int devmem_main(int argc UNUSED_PARAM, char **argv)
+ }
+
+ if (ENABLE_FEATURE_CLEAN_UP) {
+- if (munmap(map_base, page_size * 2) == -1)
++ if (munmap(map_base, mapped_size) == -1)
+ bb_perror_msg_and_die("munmap");
+ close(fd);
+ }
+--
+1.7.1
+
--
1.7.1
^ permalink raw reply related
* [Buildroot] [pull request] Pull request for branch linux-cleanup
From: Paul Jones @ 2010-06-14 1:50 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1276454802.git.thomas.petazzoni@free-electrons.com>
> -----Original Message-----
> From: buildroot-bounces at busybox.net [mailto:buildroot-
> bounces at busybox.net] On Behalf Of Thomas Petazzoni
> Sent: Monday, 14 June 2010 4:50 AM
> To: buildroot at uclibc.org
> Cc: Thomas Petazzoni
> Subject: [Buildroot] [pull request] Pull request for branch linux-cleanup
>
> Hello,
>
> Here is a set of 10 patches that completely rewrites the Linux kernel
> compilation process in Buildroot. It is supposed to be applied on top of
the
> bootloaders-cleanup branch I've sent yesterday.
>
> I've fairly drastically reduced the number of options to configure the
kernel,
> and particulary removed the horrible mess of version selection. See the
first
> commit in this branch for what remains in terms of configuration options
for
> the kernel. As I've removed quite a few things, I'm interested to know how
> you're using Buildroot to build your kernel, and whether this proposal
still
> matches your use cases.
Looks good to me. The only comment I have is I liked the old automatic
kernel patching from kernel.org, but now you need to know what the latest
version is. No big deal though.
Cheers,
Paul.
^ permalink raw reply
* [Buildroot] [Bug 2035] ipsec-tools-0.7.2 fails to build with gcc-4.4.x
From: bugzilla at busybox.net @ 2010-06-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-2035-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=2035
Peter Korsgaard <jacmet@uclibc.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |FIXED
--- Comment #1 from Peter Korsgaard <jacmet@uclibc.org> ---
Fixed in git, thanks
--
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] [git commit master 1/1] ipsec-tools: bump version, convert to autotools format and simplify Config.in
From: Peter Korsgaard @ 2010-06-13 21:46 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=dff1d590b2a0fadf58b6eed60029b2ecbab7c710
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Closes #2035
- Remove -Werror from CFLAGS
- Always enable ipv6 support if available in toolchain
- Always install into staging
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 5 +-
package/ipsec-tools/Config.in | 26 +------
package/ipsec-tools/ipsec-tools.mk | 151 +++++++-----------------------------
3 files changed, 34 insertions(+), 148 deletions(-)
diff --git a/CHANGES b/CHANGES
index 3ba7195..a7fb6b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,8 +8,8 @@
luasocket, rings, wsapi, xavante
Updated/fixed packages: cdrkit, file, gawk, gstreamer, intltool,
- iptables, libidn, lmbench, netperf, openssl, php, qt, sqlite,
- tn5250, usbutils, xkeyboard-config
+ ipsec-tools, iptables, libidn, lmbench, netperf, openssl, php,
+ qt, sqlite, tn5250, usbutils, xkeyboard-config
Removed packages: modutils
@@ -31,6 +31,7 @@
#1957: Bump sqlite to 3.6.23.1
#1987: intltool: Fix spelling mistake
#1999: Typo in path checking
+ #2035: ipsec-tools-0.7.2 fails to build with gcc-4.4.x
2010.05, Released May 30th, 2010:
diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index d29cb86..8a5f3d1 100644
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -6,16 +6,16 @@ config BR2_PACKAGE_IPSEC_TOOLS
help
This package is required to support IPSec for Linux 2.6+
+if BR2_PACKAGE_IPSEC_TOOLS
+
config BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT
default y
- depends on BR2_PACKAGE_IPSEC_TOOLS
bool "Enable racoonctl(8)."
help
Lets racoon to listen to racoon admin port, which is to
be contacted by racoonctl(8).
config BR2_PACKAGE_IPSEC_TOOLS_NATT
- depends on BR2_PACKAGE_IPSEC_TOOLS
bool "Enable NAT-Traversal"
help
This needs kernel support, which is available on Linux. On
@@ -27,9 +27,7 @@ config BR2_PACKAGE_IPSEC_TOOLS_NATT
live in a country where software patents are legal, using
NAT-Traversal might infringe a patent.
-
config BR2_PACKAGE_IPSEC_TOOLS_FRAG
- depends on BR2_PACKAGE_IPSEC_TOOLS
bool "Enable IKE fragmentation."
help
Enable IKE fragmentation, which is a workaround for
@@ -37,32 +35,12 @@ config BR2_PACKAGE_IPSEC_TOOLS_FRAG
config BR2_PACKAGE_IPSEC_TOOLS_STATS
default y
- depends on BR2_PACKAGE_IPSEC_TOOLS
bool "Enable statistics logging function."
-config BR2_PACKAGE_IPSEC_TOOLS_IPV6
- default y
- depends on BR2_PACKAGE_IPSEC_TOOLS && BR2_INET_IPV6
- bool "Enable IPv6 support"
- help
- This option has no effect if uClibc has been compiled without
- IPv6 support.
-
config BR2_PACKAGE_IPSEC_TOOLS_READLINE
- depends on BR2_PACKAGE_IPSEC_TOOLS
select BR2_PACKAGE_READLINE
bool "Enable readline input support if available."
-config BR2_PACKAGE_IPSEC_TOOLS_LIBS
- bool "Install IPSec libraries under staging_dir/lib"
- default y
- depends on BR2_PACKAGE_IPSEC_TOOLS
- help
- Install libipsec.a and libracoon.a under staging_dir/lib for further
- development on a host machine.
-
-if BR2_PACKAGE_IPSEC_TOOLS
-
choice
prompt "Security context"
default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index 911da7c..eddc7ce 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -4,158 +4,65 @@
#
#############################################################
-IPSEC_TOOLS_VERSION:=0.7.2
-IPSEC_TOOLS_SOURCE:=ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
-IPSEC_TOOLS_CAT:=$(BZCAT)
-IPSEC_TOOLS_DIR:=$(BUILD_DIR)/ipsec-tools-$(IPSEC_TOOLS_VERSION)
+IPSEC_TOOLS_VERSION = 0.7.3
+IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
+IPSEC_TOOLS_SITE = http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.7/
+IPSEC_TOOLS_INSTALL_STAGING = YES
+IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
-IPSEC_TOOLS_BINARY_SETKEY:=src/setkey/setkey
-IPSEC_TOOLS_BINARY_RACOON:=src/racoon/racoon
-IPSEC_TOOLS_BINARY_RACOONCTL:=src/racoon/racoonctl
+# configure hardcodes -Werror, so override CFLAGS on make invocation
+IPSEC_TOOLS_MAKE_OPT = CFLAGS='$(TARGET_CFLAGS)'
-IPSEC_TOOLS_TARGET_BINARY_SETKEY:=usr/sbin/setkey
-IPSEC_TOOLS_TARGET_BINARY_RACOON:=usr/sbin/racoon
-IPSEC_TOOLS_TARGET_BINARY_RACOONCTL:=usr/sbin/racoonctl
-IPSEC_TOOLS_SITE=http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.7/
+IPSEC_TOOLS_CONF_OPT = \
+ --disable-hybrid \
+ --without-libpam \
+ --disable-gssapi \
+ --with-kernel-headers=$(STAGING_DIR)/usr/include
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-adminport
+IPSEC_TOOLS_CONF_OPT+= --enable-adminport
else
-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-adminport
+IPSEC_TOOLS_CONF_OPT+= --disable-adminport
endif
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_NATT), y)
-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-natt
+IPSEC_TOOLS_CONF_OPT+= --enable-natt
else
-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-natt
+IPSEC_TOOLS_CONF_OPT+= --disable-natt
endif
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_FRAG), y)
-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-frag
+IPSEC_TOOLS_CONF_OPT+= --enable-frag
else
-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-frag
+IPSEC_TOOLS_CONF_OPT+= --disable-frag
endif
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_STATS), y)
-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-stats
+IPSEC_TOOLS_CONF_OPT+= --enable-stats
else
-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-stats
+IPSEC_TOOLS_CONF_OPT+= --disable-stats
endif
ifeq ($(BR2_INET_IPV6),y)
-
-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_IPV6), y)
-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-ipv6
+IPSEC_TOOLS_CONF_OPT+= --enable-ipv6
else
-IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6)
-endif
-
-else # ignore user's choice if it doesn't
-IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6)
+IPSEC_TOOLS_CONF_OPT+= --disable-ipv6
endif
ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_READLINE), y)
-IPSEC_TOOLS_CONFIG_FLAGS+= --without-readline
+IPSEC_TOOLS_CONF_OPT+= --without-readline
+else
+IPSEC_DEPENDENCIES += readline
endif
ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-security-context=no
+IPSEC_TOOLS_CONF_OPT+= --enable-security-context=no
endif
ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y)
-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-security-context=yes
+IPSEC_TOOLS_CONF_OPT+= --enable-security-context=yes
endif
ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-security-context=kernel
-endif
-
-$(DL_DIR)/$(IPSEC_TOOLS_SOURCE):
- $(call DOWNLOAD,$(IPSEC_TOOLS_SITE),$(IPSEC_TOOLS_SOURCE))
-
-$(IPSEC_TOOLS_DIR)/.patched: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)
- $(IPSEC_TOOLS_CAT) $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(IPSEC_TOOLS_DIR) package/ipsec-tools ipsec-tools-$(IPSEC_TOOLS_VERSION)\*.patch
- $(CONFIG_UPDATE) $(IPSEC_TOOLS_DIR)
- touch $@
-
-$(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.patched
- ( cd $(IPSEC_TOOLS_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --disable-hybrid \
- --without-libpam \
- --disable-gssapi \
- --with-kernel-headers=$(STAGING_DIR)/usr/include \
- $(IPSEC_TOOLS_CONFIG_FLAGS) \
- )
- # simpler than patching that cruft..
- (echo '#undef bzero'; \
- echo '#define bzero(a, b) memset((a), 0, (b))'; \
- echo '#undef bcopy'; \
- echo '#define bcopy(src, dest, len) memmove(dest, src, len)'; \
- echo '#undef index'; \
- echo '#define index(a, b) strchr(a, b)'; \
- ) >> $(IPSEC_TOOLS_DIR)/config.h
- touch $@
-
-$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_SETKEY) \
-$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOON) \
-$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL): \
- $(IPSEC_TOOLS_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(IPSEC_TOOLS_DIR)
-
-$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
-$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
-$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL): \
- $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_SETKEY) \
- $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOON) \
- $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL)
- $(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) install
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(REMOVE_SECTION_COMMENT) \
- $(REMOVE_SECTION_NOTE) \
- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_LIBS), y)
- install -D $(addprefix $(IPSEC_TOOLS_DIR)/src/, \
- libipsec/.libs/libipsec.a libipsec/.libs/libipsec.la \
- racoon/.libs/libracoon.a racoon/.libs/libracoon.la) \
- $(STAGING_DIR)/lib
-endif
-ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
- rm -f $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
-endif
-
-IPSEC_TOOLS_PROGS= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON)
-
-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
-IPSEC_TOOLS_PROGS+= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
+IPSEC_TOOLS_CONF_OPT+= --enable-security-context=kernel
endif
-ipsec-tools: openssl flex host-flex $(IPSEC_TOOLS_PROGS)
-
-ipsec-tools-source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)
-
-ipsec-tools-uninstall:
-
-ipsec-tools-clean:
- -$(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) uninstall
- -$(MAKE) -C $(IPSEC_TOOLS_DIR) clean
-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_LIBS),y)
- rm -f $(addprefix $(STAGING_DIR)/lib/, \
- libipsec.a libipsec.la libracoon.a libracoon.la)
-endif
- rm -f $(IPSEC_TOOLS_DIR)/.configured
-
-ipsec-tools-dirclean:
- rm -rf $(IPSEC_TOOLS_DIR)
-
-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS), y)
-TARGETS+=ipsec-tools
-endif
+$(eval $(call AUTOTARGETS,package,ipsec-tools))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] vpnc: remove unused legacy patches
From: Peter Korsgaard @ 2010-06-13 21:46 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=5485120b474aebcfb924bc4b6aadc89d3f3671fc
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/vpnc/vpnc-0.4.0.patch | 12 ------------
package/vpnc/vpnc-0.5.1-susv3-legacy.patch | 12 ------------
2 files changed, 0 insertions(+), 24 deletions(-)
delete mode 100644 package/vpnc/vpnc-0.4.0.patch
delete mode 100644 package/vpnc/vpnc-0.5.1-susv3-legacy.patch
diff --git a/package/vpnc/vpnc-0.4.0.patch b/package/vpnc/vpnc-0.4.0.patch
deleted file mode 100644
index 9520c3f..0000000
--- a/package/vpnc/vpnc-0.4.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN vpnc-0.4.0-0rig/Makefile vpnc-0.4.0/Makefile
---- vpnc-0.4.0-0rig/Makefile 2007-02-19 21:51:12.000000000 +0100
-+++ vpnc-0.4.0/Makefile 2007-07-17 19:59:53.000000000 +0200
-@@ -35,7 +35,7 @@
- RELEASE_VERSION := $(shell cat VERSION)
-
- CC=gcc
--CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g
-+CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g -I$(INCLUDE)
- CPPFLAGS = -DVERSION=\"$(VERSION)\"
- LDFLAGS = -g $(shell libgcrypt-config --libs)
- CFLAGS += $(shell libgcrypt-config --cflags)
diff --git a/package/vpnc/vpnc-0.5.1-susv3-legacy.patch b/package/vpnc/vpnc-0.5.1-susv3-legacy.patch
deleted file mode 100644
index 2e577e3..0000000
--- a/package/vpnc/vpnc-0.5.1-susv3-legacy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rdup vpnc-0.5.1.oorig/config.c vpnc-0.5.1/config.c
---- vpnc-0.5.1.oorig/config.c 2007-09-10 22:39:48.000000000 +0200
-+++ vpnc-0.5.1/config.c 2007-09-19 14:19:46.000000000 +0200
-@@ -538,7 +538,7 @@ static char *get_config_filename(const c
- {
- char *realname;
-
-- asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
-+ asprintf(&realname, "%s%s%s", strchr(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
- return realname;
- }
-
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 10/10] linux: add support for initramfs
From: Thomas Petazzoni @ 2010-06-13 18:50 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1276454802.git.thomas.petazzoni@free-electrons.com>
In Buildroot, the kernel is built and installed *before* the root
filesystems are built. This allows the root filesystem to correctly
contain the kernel modules that have been installed.
However, in the initramfs case, the root filesystem is part of the
kernel. Therefore, the kernel should be built *after* the root
filesystem (which, in the initramfs case simply builds a text file
listing all files/directories/devices/symlinks that should be part of
the initramfs). However, this isn't possible as the initramfs text
file would lack all kernel modules.
So, the solution choosen here is to keep the normal order: kernel is
built before the root filesystem is generated, and to add a little
quirk to retrigger a kernel compilation after the root filesystem
generation.
To do so, we add a ROOTFS_$(FSTYPE)_POST_TARGETS variable to the
fs/common.mk infrastructure. This allows individual filesystems to set
a target name that we should depend on *after* generating the root
filesystem itself (contrary to normal ROOTFS_$(FSTYPE)_DEPENDENCIES,
on which we depend *before* generating the root filesystem).
The initramfs code in fs/initramfs/initramfs.mk uses this to add a
dependency on 'linux26-rebuild-with-initramfs'.
In linux/linux.mk, we do various things :
* If BR2_TARGET_ROOTFS_INITRAMFS is enabled (i.e if initramfs is
enabled as a root filesystem type), then we create an empty
rootfs.initramfs file (remember that at this point, the root
filesystem hasn't been generated) and we adjust the kernel
configuration to include an initramfs. Of course, in the initial
kernel build, this initramfs will be empty.
* In the linux26-rebuild-with-initramfs target, we retrigger a
compilation of the kernel image, after removing the initramfs in
the kernel sources to make sure it gets properly rebuilt (we've
experienced cases were modifying the rootfs.initramfs file wouldn't
retrigger the generation of the initramfs at the kernel level).
This is fairly quirky, but initramfs really is a special case, so in
one way or another, we need a little quirk to solve its specialness.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
fs/common.mk | 6 +++++-
fs/initramfs/initramfs.mk | 2 ++
linux/linux.mk | 33 +++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/fs/common.mk b/fs/common.mk
index 50dc974..74e9ce0 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -19,6 +19,10 @@
# ROOTFS_$(FSTYPE)_POST_GEN_HOOKS, a list of hooks to call after
# generating the filesystem image
#
+# ROOTFS_$(FSTYPE)_POST_TARGETS, the list of targets that should be
+# run after running the main filesystem target. This is useful for
+# initramfs, to rebuild the kernel once the initramfs is generated.
+#
# In terms of configuration option, this macro assumes that the
# BR2_TARGET_ROOTFS_$(FSTYPE) config option allows to enable/disable
# the generation of a filesystem image of a particular type. If
@@ -60,7 +64,7 @@ endif
$(1)-root-show-depends:
@echo $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
-$(1)-root: $(BINARIES_DIR)/rootfs.$(1)
+$(1)-root: $(BINARIES_DIR)/rootfs.$(1) $(ROOTFS_$(2)_POST_TARGETS)
ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
TARGETS += $(1)-root
diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index 3e81567..e6d004e 100644
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -23,4 +23,6 @@ define ROOTFS_INITRAMFS_CMD
$(SHELL) fs/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $$@
endef
+ROOTFS_INITRAMFS_POST_TARGETS += linux26-rebuild-with-initramfs
+
$(eval $(call ROOTFS_TARGET,initramfs))
\ No newline at end of file
diff --git a/linux/linux.mk b/linux/linux.mk
index 05a95af..1c32c86 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -101,6 +101,19 @@ ifeq ($(BR2_INET_IPV6),y)
else
$(call KCONFIG_DISABLE_OPT,CONFIG_IPV6,$(@D)/.config)
endif
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+ # As the kernel gets compiled before root filesystems are
+ # built, we create a fake initramfs file list. It'll be
+ # replaced later by the real list, and the kernel will be
+ # rebuilt using the linux26-rebuild-with-initramfs target.
+ touch $(BINARIES_DIR)/rootfs.initramfs
+ $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.initramfs\",$(@D)/.config)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config)
+else
+ $(call KCONFIG_DISABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"\",$(@D)/.config)
+endif
yes "" | $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig 2>&1 >/dev/null
$(Q)touch $@
@@ -131,6 +144,26 @@ linux26: host-module-init-tools $(LINUX26_DEPENDENCIES) $(LINUX26_DIR)/.stamp_in
linux26-menuconfig linux26-xconfig linux26-gconfig: $(LINUX26_DIR)/.stamp_configured
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(subst linux26-,,$@)
+# Support for rebuilding the kernel after the initramfs file list has
+# been generated in $(BINARIES_DIR)/rootfs.initramfs.
+$(LINUX26_DIR)/.stamp_initramfs_rebuilt: $(LINUX26_DIR)/.stamp_installed $(BINARIES_DIR)/rootfs.initramfs
+ @$(call MESSAGE,"Rebuilding kernel with initramfs")
+ # Remove the previously generated initramfs which was empty,
+ # to make sure the kernel will actually regenerate it.
+ $(RM) -f $(@D)/usr/initramfs_data.cpio.*
+ # Build the kernel.
+ $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D)
+ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y)
+ $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) uImage
+endif
+ # Copy the kernel image to its final destination
+ cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)
+ $(Q)touch $@
+
+# The initramfs building code must make sure this target gets called
+# after it generated the initramfs list of files.
+linux26-rebuild-with-initramfs: $(LINUX26_DIR)/.stamp_initramfs_rebuilt
+
ifeq ($(BR2_LINUX_KERNEL),y)
TARGETS+=linux26
endif
\ No newline at end of file
--
1.7.0.4
^ permalink raw reply related
* [Buildroot] [PATCH 09/10] linux: add support for linux26-{menuconfig, xconfig, gconfig} targets
From: Thomas Petazzoni @ 2010-06-13 18:50 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1276454802.git.thomas.petazzoni@free-electrons.com>
These targets allow the user to customize the configuration of the
Linux kernel. After changing the kernel configuration, the next time
the user runs "make", the kernel is rebuilt to take into account the
new configuration (not rebuilt from scratch).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
linux/linux.mk | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index 4cdc304..05a95af 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -104,8 +104,9 @@ endif
yes "" | $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig 2>&1 >/dev/null
$(Q)touch $@
-# Compilation
-$(LINUX26_DIR)/.stamp_compiled: $(LINUX26_DIR)/.stamp_configured
+# Compilation. We make sure the kernel gets rebuilt when the
+# configuration has changed.
+$(LINUX26_DIR)/.stamp_compiled: $(LINUX26_DIR)/.stamp_configured $(LINUX26_DIR)/.config
@$(call MESSAGE,"Compiling kernel")
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D)
ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y)
@@ -127,6 +128,9 @@ $(LINUX26_DIR)/.stamp_installed: $(LINUX26_DIR)/.stamp_compiled
linux26: host-module-init-tools $(LINUX26_DEPENDENCIES) $(LINUX26_DIR)/.stamp_installed
+linux26-menuconfig linux26-xconfig linux26-gconfig: $(LINUX26_DIR)/.stamp_configured
+ $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(subst linux26-,,$@)
+
ifeq ($(BR2_LINUX_KERNEL),y)
TARGETS+=linux26
endif
\ No newline at end of file
--
1.7.0.4
^ permalink raw reply related
* [Buildroot] [PATCH 08/10] linux: adjust kernel config according to the Buildroot configuration
From: Thomas Petazzoni @ 2010-06-13 18:50 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1276454802.git.thomas.petazzoni@free-electrons.com>
We only adjust the configuration or ARM EABI and IPv6. The (more
complicated) initramfs case is handled in a separate commit. The user
is expected to take care of all other configuration details (like
having Netfilter enabled to make iptables work, etc.)
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
linux/linux.mk | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index d3a583e..4cdc304 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -90,6 +90,18 @@ else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM),y)
cp $(BR2_LINUX_KERNEL_CUSTOM_FILE) $(@D)/.config
yes "" | $(MAKE1) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
endif
+ifeq ($(BR2_ARM_EABI),y)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config)
+ $(call KCONFIG_DISABLE_OPT,CONFIG_OABI_COMPAT,$(@D)/.config)
+else
+ $(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config)
+endif
+ifeq ($(BR2_INET_IPV6),y)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_IPV6,$(@D)/.config)
+else
+ $(call KCONFIG_DISABLE_OPT,CONFIG_IPV6,$(@D)/.config)
+endif
+ yes "" | $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig 2>&1 >/dev/null
$(Q)touch $@
# Compilation
--
1.7.0.4
^ permalink raw reply related
* [Buildroot] [PATCH 07/10] Add generic functions to enable/set/disable options in kconfig files
From: Thomas Petazzoni @ 2010-06-13 18:50 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1276454802.git.thomas.petazzoni@free-electrons.com>
The KCONFIG_ENABLE_OPT, KCONFIG_SET_OPT and KCONFIG_DISABLE_OPT are
new make functions to respectively enable, set and disable options in
Kconfig-like files (as used by the kernel, uClibc or Busybox).
They can be used as follows :
$(call KCONFIG_ENABLE_OPT,CONFIG_FOOBAR,/path/to/.config)
$(call KCONFIG_SET_OPT,CONFIG_BARFOO,foobar,/path/to/.config)
$(call KCONFIG_DISABLE_OPT,CONFIG_FARBOO,/path/to/.config)
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.package.in | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index cdf49f8..b702c49 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -40,6 +40,21 @@ UPPERCASE = $(strip $(eval __tmp := $1) \
$(__tmp)))) \
$(__tmp))
+define KCONFIG_ENABLE_OPT
+ $(SED) "/$(1)/d" $(2)
+ echo "$(1)=y" >> $(2)
+endef
+
+define KCONFIG_SET_OPT
+ $(SED) "/$(1)/d" $(3)
+ echo "$(1)=$(2)" >> $(3)
+endef
+
+define KCONFIG_DISABLE_OPT
+ $(SED) "/$(1)/d" $(2)
+ echo "# $(1) is not set" >> $(2)
+endef
+
# Define extrators for different archive suffixes
INFLATE.bz2 = $(BZCAT)
INFLATE.gz = $(ZCAT)
--
1.7.0.4
^ permalink raw reply related
* [Buildroot] [PATCH 06/10] linux: Add dependency on host-module-init-tools
From: Thomas Petazzoni @ 2010-06-13 18:50 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1276454802.git.thomas.petazzoni@free-electrons.com>
In order to not depend on module init tools being installed on the
development environment of the Buildroot user, let's build module init
tools for the host.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
linux/linux.mk | 2 +-
package/module-init-tools/module-init-tools.mk | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index 39abdea..d3a583e 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -113,7 +113,7 @@ $(LINUX26_DIR)/.stamp_installed: $(LINUX26_DIR)/.stamp_compiled
rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION_PROBED)/source
$(Q)touch $@
-linux26: $(LINUX26_DEPENDENCIES) $(LINUX26_DIR)/.stamp_installed
+linux26: host-module-init-tools $(LINUX26_DEPENDENCIES) $(LINUX26_DIR)/.stamp_installed
ifeq ($(BR2_LINUX_KERNEL),y)
TARGETS+=linux26
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index 3e8b06b..ea7c014 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -17,3 +17,5 @@ MODULE_INIT_TOOLS_AUTORECONF=YES
HOST_MODULE_INIT_TOOLS_AUTORECONF=YES
$(eval $(call AUTOTARGETS,package,module-init-tools))
+$(eval $(call AUTOTARGETS,package,module-init-tools,host))
+
--
1.7.0.4
^ permalink raw reply related
* [Buildroot] [PATCH 05/10] module-init-tools: bump version + convert to autotools
From: Thomas Petazzoni @ 2010-06-13 18:50 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1276454802.git.thomas.petazzoni@free-electrons.com>
The "remove-index" patch is no longer needed, the newer version of
module-init-tools correctly uses strchr().
The "module-init-tools" patch, whose main purpose was to disable the
generation of man pages (it requires docbook2man), is replaced by a
simpler implementation,
module-init-tools-3.11-add-manpages-config-option.patch.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...nit-tools-3.11-add-manpages-config-option.patch | 47 ++++++++++++
.../module-init-tools-remove-index.patch | 12 ---
package/module-init-tools/module-init-tools.mk | 80 +++-----------------
package/module-init-tools/module-init-tools.patch | 77 -------------------
4 files changed, 57 insertions(+), 159 deletions(-)
create mode 100644 package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch
delete mode 100644 package/module-init-tools/module-init-tools-remove-index.patch
delete mode 100644 package/module-init-tools/module-init-tools.patch
diff --git a/package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch b/package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch
new file mode 100644
index 0000000..28f51de
--- /dev/null
+++ b/package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch
@@ -0,0 +1,47 @@
+Disable manual pages generation when docbook2man is not available.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.am | 7 ++++++-
+ configure.ac | 7 +++----
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+Index: module-init-tools-3.11/Makefile.am
+===================================================================
+--- module-init-tools-3.11.orig/Makefile.am
++++ module-init-tools-3.11/Makefile.am
+@@ -39,7 +39,12 @@
+ MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5
+ MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
+ SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
+-dist_man_MANS = $(MAN5) $(MAN8)
++
++if HAVE_DOCBOOKTOMAN
++MANPAGES = $(MAN5) $(MAN8)
++endif
++dist_man_MANS = $(MANPAGES)
++
+ # If they haven't overridden mandir, fix it (never /man!)
+ mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
+
+Index: module-init-tools-3.11/configure.ac
+===================================================================
+--- module-init-tools-3.11.orig/configure.ac
++++ module-init-tools-3.11/configure.ac
+@@ -29,13 +29,12 @@
+ AC_PROG_CC
+ AC_PROG_RANLIB
+
+-AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, [no],)
+-if test x"$DOCBOOKTOMAN" = xno
++AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man)
++if test x"$DOCBOOKTOMAN" = x
+ then
+ AC_MSG_WARN([docbook2man not found])
+- # fail with a meaningfull error if $DOCBOOKTOMAN called by the makefile
+- DOCBOOKTOMAN=docbook2man
+ fi
++AM_CONDITIONAL([HAVE_DOCBOOKTOMAN], [test "x$DOCBOOKTOMAN" != "x"])
+
+ # Delay adding the zlib_flags until after AC_PROG_CC, so we can distinguish
+ # between a broken cc and a working cc but missing libz.a.
diff --git a/package/module-init-tools/module-init-tools-remove-index.patch b/package/module-init-tools/module-init-tools-remove-index.patch
deleted file mode 100644
index 1a2da28..0000000
--- a/package/module-init-tools/module-init-tools-remove-index.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur module-init-tools-3.2.2/modprobe.c module-init-tools-3.2.2-patched/modprobe.c
---- module-init-tools-3.2.2/modprobe.c 2005-12-01 17:42:09.000000000 -0600
-+++ module-init-tools-3.2.2-patched/modprobe.c 2006-12-04 19:50:50.353237649 -0600
-@@ -270,7 +270,7 @@
- char *modname;
-
- /* Ignore lines without : or which start with a # */
-- ptr = index(line, ':');
-+ ptr = strchr(line, ':');
- if (ptr == NULL || line[strspn(line, "\t ")] == '#')
- return 0;
-
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index 8adb684..3e8b06b 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -3,77 +3,17 @@
# module-init-tools
#
#############################################################
-MODULE_INIT_TOOLS_VERSION=3.2.2
+MODULE_INIT_TOOLS_VERSION=3.11
MODULE_INIT_TOOLS_SOURCE=module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2
-MODULE_INIT_TOOLS_CAT:=$(BZCAT)
MODULE_INIT_TOOLS_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/
-MODULE_INIT_TOOLS_DIR=$(BUILD_DIR)/module-init-tools-$(MODULE_INIT_TOOLS_VERSION)
-MODULE_INIT_TOOLS_DIR2=$(TOOLCHAIN_DIR)/module-init-tools-$(MODULE_INIT_TOOLS_VERSION)
-MODULE_INIT_TOOLS_BINARY=depmod
-MODULE_INIT_TOOLS_TARGET_BINARY=$(TARGET_DIR)/sbin/$(MODULE_INIT_TOOLS_BINARY)
+MODULE_INIT_TOOLS_CONF_OPT = \
+ --disable-static-utils \
+ --disable-builddir \
+ --program-transform-name=''
-STRIPPROG=$(STRIPCMD)
+# module-init-tools-3.11-add-manpages-config-option.patch is modifying
+# configure.ac and Makefile.am
+MODULE_INIT_TOOLS_AUTORECONF=YES
+HOST_MODULE_INIT_TOOLS_AUTORECONF=YES
-$(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE):
- $(call DOWNLOAD,$(MODULE_INIT_TOOLS_SITE),$(MODULE_INIT_TOOLS_SOURCE))
-
-$(MODULE_INIT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
- $(MODULE_INIT_TOOLS_CAT) $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
- toolchain/patch-kernel.sh $(MODULE_INIT_TOOLS_DIR) package/module-init-tools \*.patch
- $(CONFIG_UPDATE) $(MODULE_INIT_TOOLS_DIR)
- touch $(MODULE_INIT_TOOLS_DIR)/.unpacked
-
-$(MODULE_INIT_TOOLS_DIR)/.configured: $(MODULE_INIT_TOOLS_DIR)/.unpacked
- (cd $(MODULE_INIT_TOOLS_DIR); rm -f config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- INSTALL=$(MODULE_INIT_TOOLS_DIR)/install-sh \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/ \
- --sysconfdir=/etc \
- --program-transform-name='' \
- )
- touch $(MODULE_INIT_TOOLS_DIR)/.configured
-
-$(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY): $(MODULE_INIT_TOOLS_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(MODULE_INIT_TOOLS_DIR)
- touch -c $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY)
-
-ifeq ($(BR2_PACKAGE_MODUTILS),y)
-$(MODULE_INIT_TOOLS_TARGET_BINARY): \
- $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY) \
- modutils
-else
-$(MODULE_INIT_TOOLS_TARGET_BINARY): \
- $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY)
-endif
-ifeq ($(BR2_PACKAGE_MODUTILS),y)
- $(MAKE) prefix=$(TARGET_DIR) -C $(MODULE_INIT_TOOLS_DIR) moveold
-endif
- STRIPPROG='$(STRIPPROG)' \
- $(MAKE) prefix=$(TARGET_DIR) -C $(MODULE_INIT_TOOLS_DIR) install-exec
- rm -Rf $(TARGET_DIR)/usr/man
- rm -f $(TARGET_DIR)/sbin/generate-modprobe.conf
- rm -f $(TARGET_DIR)/sbin/insmod.static
- touch -c $(MODULE_INIT_TOOLS_TARGET_BINARY)
-
-module-init-tools: $(MODULE_INIT_TOOLS_TARGET_BINARY)
-
-module-init-tools-clean:
- $(MAKE) prefix=$(TARGET_DIR)/usr -C $(MODULE_INIT_TOOLS_DIR) uninstall
- -$(MAKE) -C $(MODULE_INIT_TOOLS_DIR) clean
-
-module-init-tools-dirclean:
- rm -rf $(MODULE_INIT_TOOLS_DIR)
-
-#############################################################
-#
-## Toplevel Makefile options
-#
-##############################################################
-ifeq ($(BR2_PACKAGE_MODULE_INIT_TOOLS),y)
-TARGETS+=module-init-tools
-endif
+$(eval $(call AUTOTARGETS,package,module-init-tools))
diff --git a/package/module-init-tools/module-init-tools.patch b/package/module-init-tools/module-init-tools.patch
deleted file mode 100644
index 456ef10..0000000
--- a/package/module-init-tools/module-init-tools.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -aur module-init-tools-3.1~orig/Makefile.in module-init-tools-3.1~patched/Makefile.in
---- module-init-tools-3.1~orig/Makefile.in 2004-11-15 01:59:48.000000000 +0100
-+++ module-init-tools-3.1~patched/Makefile.in 2005-03-22 22:10:26.843808464 +0100
-@@ -613,7 +613,7 @@
- check-am: all-am
- $(MAKE) $(AM_MAKEFLAGS) check-TESTS
- check: check-am
--all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS)
-+all-am: Makefile $(PROGRAMS) $(SCRIPTS)
-
- installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir)
-@@ -760,17 +760,10 @@
-
- release: check clean tarball testsuite
-
--moveold: check-for-sbin check-for-old move-old-targets
--
--check-for-sbin:
-- if [ "`echo $(DESTDIR)$(sbindir) | tr -s / /`" = /sbin ]; then :; \
-- else \
-- echo moveold usually only makes sense when installing into /sbin; \
-- exit 1; \
-- fi
-+moveold: move-old-targets
-
- check-for-old:
-- if [ -f /sbin/lsmod.old ]; then \
-+ if [ -f $(sbindir)/lsmod.old ]; then \
- echo Someone already moved old versions. >&2; exit 1; \
- fi
-
-@@ -778,27 +771,28 @@
- # RedHat 8.0 doesn't ship with readlink by default. Use ls -l.
- # Also, make symlink from /bin to /sbin for lsmod (FHS compliant).
- move-old-targets:
-+ if [ ! -f $(sbindir)/lsmod.old ]; then \
- for f in lsmod modprobe rmmod depmod insmod modinfo; do \
-- if [ -L /sbin/$$f ]; then \
-- ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f; \
-+ if [ -L $(sbindir)/$$f ]; then \
-+ ln -sf `ls -l $(sbindir)/$$f | sed 's/.* -> //'`.old $(sbindir)/$$f; \
- fi; \
-- mv /sbin/$$f /sbin/$$f.old; \
-- if [ -f /usr/share/man/man8/$$f.8.gz ]; then \
-- mv /usr/share/man/man8/$$f.8.gz \
-- /usr/share/man/man8/$$f.old.8.gz; \
-- elif [ -f /usr/share/man/man8/$$f.8.bz2 ]; then \
-- mv /usr/share/man/man8/$$f.8.bz2 \
-- /usr/share/man/man8/$$f.old.8.bz2; \
-- else \
-- mv /usr/share/man/man8/$$f.8 /usr/share/man/man8/$$f.old.8; \
-+ mv $(sbindir)/$$f $(sbindir)/$$f.old; \
-+ if [ -f $(prefix)/usr/share/man/man8/$$f.8.gz ]; then \
-+ mv $(prefix)/usr/share/man/man8/$$f.8.gz \
-+ $(prefix)/usr/share/man/man8/$$f.old.8.gz; \
-+ elif [ -f $(prefix)/usr/share/man/man8/$$f.8.bz2 ]; then \
-+ mv $(prefix)/usr/share/man/man8/$$f.8.bz2 \
-+ $(prefix)/usr/share/man/man8/$$f.old.8.bz2; \
-+ elif [ -f $(prefix)/usr/share/man/man8/$$f.8 ]; then \
-+ mv $(prefix)/usr/share/man/man8/$$f.8 /usr/share/man/man8/$$f.old.8; \
- fi; \
-- done
-+ done; \
- for f in kallsyms ksyms; do \
-- if [ -L /sbin/$$f ]; then \
-- ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f; \
-+ if [ -L $(sbindir)/$$f ]; then \
-+ ln -sf `ls -l $(sbindir)/$$f | sed 's/.* -> //'`.old $(sbindir)/$$f; \
- fi; \
-- done
-- ln -s /sbin/lsmod.old /bin/lsmod.old
-+ done; \
-+ fi
-
- # For installs in /usr/local/sbin
- links:
--
1.7.0.4
^ permalink raw reply related
* [Buildroot] [PATCH 04/10] module-init-tools: remove support for cross-depmod
From: Thomas Petazzoni @ 2010-06-13 18:50 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1276454802.git.thomas.petazzoni@free-electrons.com>
The new infrastructure to build the Linux kernel doesn't use a
cross-depmod. This isn't needed with modern module-init-tools that
most distros include perfectly handle this.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/module-init-tools/module-init-tools.mk | 44 ------------------------
1 files changed, 0 insertions(+), 44 deletions(-)
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index 129770e..8adb684 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -70,50 +70,6 @@ module-init-tools-dirclean:
rm -rf $(MODULE_INIT_TOOLS_DIR)
#############################################################
-
-
-$(MODULE_INIT_TOOLS_DIR2)/.source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
- $(MODULE_INIT_TOOLS_CAT) $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(TOOLCHAIN_DIR) -xvf -
- toolchain/patch-kernel.sh $(MODULE_INIT_TOOLS_DIR2) package/module-init-tools \*.patch
- $(CONFIG_UPDATE) $(MODULE_INIT_TOOLS_DIR2)
- touch $(MODULE_INIT_TOOLS_DIR2)/.source
-
-$(MODULE_INIT_TOOLS_DIR2)/.configured: $(MODULE_INIT_TOOLS_DIR2)/.source
- (cd $(MODULE_INIT_TOOLS_DIR2); \
- CC="$(HOSTCC)" \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_HOST_NAME) \
- --build=$(GNU_HOST_NAME) \
- --sysconfdir=/etc \
- --program-transform-name='' \
- )
- touch $(MODULE_INIT_TOOLS_DIR2)/.configured
-
-$(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY): $(MODULE_INIT_TOOLS_DIR2)/.configured
- $(MAKE) -C $(MODULE_INIT_TOOLS_DIR2)
- touch -c $(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY)
-
-
-$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26: $(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY)
- $(INSTALL) -D $(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY) $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26
-
-cross-depmod26: $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26
-
-module-init-tools-source cross-depmod26-source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
-
-cross-depmod26-clean:
- rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26
- -$(MAKE) -C $(MODULE_INIT_TOOLS_DIR2) clean
-
-cross-depmod26-dirclean:
- rm -rf $(MODULE_INIT_TOOLS_DIR2)
-
-ifeq ($(BR2_PACKAGE_LINUX),y)
-HOST_SOURCE+=module-init-tools-source
-endif
-
-#############################################################
#
## Toplevel Makefile options
#
--
1.7.0.4
^ permalink raw reply related
* [Buildroot] [PATCH 03/10] iso9660: take into account the linux changes
From: Thomas Petazzoni @ 2010-06-13 18:50 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1276454802.git.thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
fs/iso9660/Config.in | 4 ++--
fs/iso9660/iso9660.mk | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/iso9660/Config.in b/fs/iso9660/Config.in
index 7830581..5f7cdf4 100644
--- a/fs/iso9660/Config.in
+++ b/fs/iso9660/Config.in
@@ -1,7 +1,7 @@
config BR2_TARGET_ROOTFS_ISO9660
bool "iso image"
depends on BR2_i386
- depends on !BR2_KERNEL_none
+ depends on BR2_LINUX_KERNEL
select BR2_TARGET_ROOTFS_EXT2
select BR2_TARGET_GRUB
help
@@ -13,4 +13,4 @@ config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
default "fs/iso9660/menu.lst"
comment "iso image requires a Linux kernel to be built"
- depends on BR2_i386 && BR2_KERNEL_none
+ depends on BR2_i386 && !BR2_LINUX_KERNEL
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 66e2de2..6f60893 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -15,14 +15,14 @@ ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y)
ISO9660_OPTS+=-U
endif
-$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot $(LINUX_KERNEL) $(BINARIES_DIR)/rootfs.ext2 grub
+$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 ext2-root grub
@$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
mkdir -p $(ISO9660_TARGET_DIR)
mkdir -p $(ISO9660_TARGET_DIR)/boot/grub
cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/
cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst
- cp $(LINUX_KERNEL) $(ISO9660_TARGET_DIR)/kernel
- cp $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd
+ cp $(LINUX26_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel
+ cp $(BINARIES_DIR)/rootfs.ext2 $(ISO9660_TARGET_DIR)/initrd
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(FAKEROOT_SCRIPT)
touch $(BUILD_DIR)/.fakeroot.00000
--
1.7.0.4
^ permalink raw reply related
* [Buildroot] [PATCH 02/10] Remove old Linux infrastructure
From: Thomas Petazzoni @ 2010-06-13 18:50 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1276454802.git.thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Makefile | 4 -
target/Makefile.in | 16 --
target/linux/Config.in | 33 ---
target/linux/Config.in.advanced | 463 --------------------------------
target/linux/Config.in.versions | 62 -----
target/linux/Makefile.in | 250 -----------------
target/linux/Makefile.in.advanced | 532 -------------------------------------
7 files changed, 0 insertions(+), 1360 deletions(-)
delete mode 100644 target/linux/Config.in
delete mode 100644 target/linux/Config.in.advanced
delete mode 100644 target/linux/Config.in.versions
delete mode 100644 target/linux/Makefile.in
delete mode 100644 target/linux/Makefile.in.advanced
diff --git a/Makefile b/Makefile
index a72dc80..d04c6e3 100644
--- a/Makefile
+++ b/Makefile
@@ -308,10 +308,6 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
include toolchain/*/*.mk
endif
-ifeq ($(BR2_PACKAGE_LINUX),y)
-TARGETS+=linux26-modules
-endif
-
include package/*/*.mk
TARGETS+=target-finalize
diff --git a/target/Makefile.in b/target/Makefile.in
index 8feb564..9a75116 100644
--- a/target/Makefile.in
+++ b/target/Makefile.in
@@ -1,7 +1,3 @@
-BR2_PACKAGE_LINUX_FORMAT:=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT))
-BR2_PACKAGE_LINUX_KCONFIG:=$(call qstrip,$(BR2_PACKAGE_LINUX_KCONFIG))
-
-
# COPY_FILE absolute_path_to_file, target_directory, filename
ifneq ($(call qstrip,$(BUILDROOT_COPYTO)),) # Use shell definition
define COPY_FILE
@@ -56,16 +52,4 @@ include target/generic/Makefile.in
include target/device/Makefile.in
include target/xtensa/Makefile.in
-# kernel rules
-# We already did add the kernel target to TARGETS and now just pull in the rules
-# to actually build this target.
-
-ifeq ($(BR2_KERNEL_LINUX),y)
-include target/linux/Makefile.in
-endif
-
-ifeq ($(BR2_KERNEL_LINUX_ADVANCED),y)
-include target/linux/Makefile.in.advanced
-endif
-
include target/device/Makefile.in.linux
diff --git a/target/linux/Config.in b/target/linux/Config.in
deleted file mode 100644
index c79fca2..0000000
--- a/target/linux/Config.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#comment "Linux kernel options"
-
-if BR2_KERNEL_LINUX
-config BR2_PACKAGE_LINUX_KCONFIG
- string ".config file"
- depends on BR2_PACKAGE_LINUX
- default ""
- help
- kernel's .config to use to build a kernel for the target.
-
- If the above setting is empty, you can change the default
- board-imposed value by passing LINUX26_KCONFIG=<path> to
- make.
-
-config BR2_PACKAGE_LINUX_FORMAT
- string "kernel binary format"
- depends on BR2_PACKAGE_LINUX
- default ""
- help
- kernel binary format.
- Popular values include:
- - bzImage
- - zImage
- and other, architecture dependant formats.
-
- Note that the default format is supposed to be set by your
- board-description, if any.
- i386 and compatible default to bzImage if nothing was given
- above.
- If the above setting is empty, you can change the default
- board-imposed value by passing LINUX26_FORMAT=<string> to
- make.
-endif
diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
deleted file mode 100644
index 645ed2e..0000000
--- a/target/linux/Config.in.advanced
+++ /dev/null
@@ -1,463 +0,0 @@
-if BR2_KERNEL_LINUX_ADVANCED
-# --- "Linux kernel options"
-# This file exports the following symbols for use by Makefile's
-#
-# BR2_PACKAGE_LINUX
-#
-# BR2_KERNEL_SITE
-# BR2_DOWNLOAD_LINUX26_VERSION
-# BR2_LINUX26_VERSION
-#
-# BR2_KERNEL_PATCH_SITE
-# BR2_KERNEL_PATCH
-#
-# BR2_LINUX26_CUSTOM
-# BR2_CUSTOM_LINUX26_PATCH_SITE
-# BR2_CUSTOM_LINUX26_PATCH
-#
-# BR2_LINUX_BSP_PATCH
-#
-# BR2_PACKAGE_LINUX_USE_KCONFIG
-# BR2_PACKAGE_LINUX_USE_DEFCONFIG
-# BR2_PACKAGE_LINUX_USE_XCONFIG
-# BR2_PACKAGE_LINUX_KCONFIG
-#
-# BR2_PACKAGE_LINUX_FORMAT
-#
-# BR2_LINUX_COPYTO_ROOTFS
-# BR2_LINUX_COPYTO_TFTPBOOT
-# BR2_LINUX_COPYTO
-#
-
-source "target/linux/Config.in.versions"
-
-config BR2_KERNEL_PATCH_LEVEL
- string
- default $(BR2_KERNEL_LATEST_2_6_33) if BR2_LINUX_2_6_33 && BR2_KERNEL_ADD_LATEST_MINORPATCH
- default $(BR2_KERNEL_LATEST_2_6_32) if BR2_LINUX_2_6_32 && BR2_KERNEL_ADD_LATEST_MINORPATCH
- default $(BR2_KERNEL_LATEST_2_6_31) if BR2_LINUX_2_6_31 && BR2_KERNEL_ADD_LATEST_MINORPATCH
- default $(BR2_KERNEL_LATEST_2_6_30) if BR2_LINUX_2_6_30 && BR2_KERNEL_ADD_LATEST_MINORPATCH
- default $(BR2_KERNEL_LATEST_2_6_29) if BR2_LINUX_2_6_29 && BR2_KERNEL_ADD_LATEST_MINORPATCH
- default $(BR2_KERNEL_LATEST_2_6_28) if BR2_LINUX_2_6_28 && BR2_KERNEL_ADD_LATEST_MINORPATCH
- default $(BR2_KERNEL_LATEST_2_6_27) if BR2_LINUX_2_6_27 && BR2_KERNEL_ADD_LATEST_MINORPATCH
- default "$(BR2_KERNEL_MINORLEVEL)" if BR2_KERNEL_ADD_MINORPATCH
-
-config BR2_KERNEL_NEXT_VERSION
- string
- default "2.6.34" if BR2_LINUX_2_6_33
- default "2.6.33" if BR2_LINUX_2_6_32
- default "2.6.32" if BR2_LINUX_2_6_31
- default "2.6.31" if BR2_LINUX_2_6_30
- default "2.6.30" if BR2_LINUX_2_6_29
- default "2.6.29" if BR2_LINUX_2_6_28
- default "2.6.28" if BR2_LINUX_2_6_27
-
-config BR2_KERNEL_THIS_VERSION
- string
- default "2.6.33" if BR2_LINUX_2_6_33
- default "2.6.32" if BR2_LINUX_2_6_32
- default "2.6.31" if BR2_LINUX_2_6_31
- default "2.6.30" if BR2_LINUX_2_6_30
- default "2.6.29" if BR2_LINUX_2_6_29
- default "2.6.28" if BR2_LINUX_2_6_28
- default "2.6.27" if BR2_LINUX_2_6_27
-
-config BR2_KERNEL_SITE
- string
- default "http://ftp.kernel.org/pub/linux/kernel/v2.6"
-
-config BR2_KERNEL_PATCH_SITE
- string
- default "$(BR2_KERNEL_SITE)" if BR2_KERNEL_ADD_LATEST_MINORPATCH
- default "$(BR2_KERNEL_SITE)" if BR2_KERNEL_ADD_MINORPATCH
- default "$(BR2_KERNEL_SITE)/testing" if BR2_KERNEL_ADD_LATEST_RC_PATCH
- default "$(BR2_KERNEL_SITE)/testing" if BR2_KERNEL_ADD_RC_PATCH
- default "$(BR2_KERNEL_SITE)/snapshots" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
- default "$(BR2_KERNEL_SITE)/snapshots" if BR2_KERNEL_ADD_SNAPSHOT
- default $(BR2_CUSTOM_LINUX26_PATCH_SITE) if BR2_LINUX26_CUSTOM
-
-config BR2_LINUX26_RC_VERSION
- string
- default "$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)" if BR2_KERNEL_ADD_RC_PATCH
-
-config BR2_LINUX26_SNAPSHOT_VERSION
- string
- default "$(BR2_KERNEL_THIS_VERSION)-git$(BR2_KERNEL_GIT_LEVEL)" if BR2_KERNEL_ADD_SNAPSHOT
-
-config BR2_LINUX26_RC_SNAPSHOT_VERSION
- string
- default "$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-git$(BR2_KERNEL_GIT_LEVEL)" if BR2_KERNEL_ADD_SNAPSHOT
-
-# ---------------------------------------------------------------------------
-
-choice
- prompt "Linux Kernel Version"
- default BR2_LINUX_2_6_STABLE
- help
- Select the specific Linux version you want to use
-
-config BR2_LINUX_2_6_STABLE
- bool "The latest stable Linux kernel (2.6.33.4)"
-
-config BR2_LINUX_2_6_33
- bool "Linux 2.6.33"
- select BR2_KERNEL_BASE
-
-config BR2_LINUX_2_6_32
- bool "Linux 2.6.32"
- select BR2_KERNEL_BASE
-
-config BR2_LINUX_2_6_31
- bool "Linux 2.6.31"
- select BR2_KERNEL_BASE
-
-config BR2_LINUX_2_6_30
- bool "Linux 2.6.30"
- select BR2_KERNEL_BASE
-
-config BR2_LINUX_2_6_29
- bool "Linux 2.6.29"
- select BR2_KERNEL_BASE
-
-config BR2_LINUX_2_6_28
- bool "Linux 2.6.28"
- select BR2_KERNEL_BASE
-
-config BR2_LINUX_2_6_27
- bool "Linux 2.6.27"
- select BR2_KERNEL_BASE
-
-config BR2_LINUX26_CUSTOM
- bool "Linux <custom> version"
-
-endchoice
-
-if BR2_LINUX26_CUSTOM
-config BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION
- string "Linux Tarball version"
- default "2.6.31"
- help
- Specify any .tar.bz2 file
-
-config BR2_CUSTOM_LINUX26_VERSION
- string "Linux Version"
- default "2.6.31"
- help
- Specify what the linux version will be called
-
-config BR2_CUSTOM_LINUX26_PATCH
- string "patch name"
- default "patch-2.6.31-rc4.bz2"
- help
- Specify a patch to be downloaded
-
-config BR2_CUSTOM_LINUX26_PATCH_SITE
- string "patch site"
- default "http://www.kernel.org/pub/linux/kernel/v2.6/testing"
- help
- Specify from where the patch will be downloaded.
-endif
-
-# -----------------------------------------------
-
-menu "Patches"
- depends on BR2_PACKAGE_LINUX
-
-config BR2_KERNEL_ADD_KERNEL_ORG_PATCH
- bool "Add kernel.org patch"
- depends on BR2_KERNEL_BASE
- help
- Add pre, snapshot or -mm patches
- from http://www.kernel.org/
-
-config BR2_KERNEL_ADD_LATEST
- bool "Use only the latest patch version"
- default y
- depends on BR2_KERNEL_ADD_KERNEL_ORG_PATCH
- help
- Restrict the choices to the latest versions
-
-choice
- prompt "Add a kernel.org patch to the Linux Kernel"
- depends on BR2_PACKAGE_LINUX
- depends on !BR2_KERNEL_PREPATCHED
- depends on BR2_KERNEL_ADD_KERNEL_ORG_PATCH
- help
- Select a patch to add to the Linux kernel
-
-config BR2_KERNEL_ADD_LATEST_MINORPATCH
- bool "Add _latest_ '.#' minor patch"
- depends on BR2_KERNEL_ADD_LATEST
- select BR2_KERNEL_ADD_PATCH
-
-config BR2_KERNEL_ADD_MINORPATCH
- bool "Add a '.#' minor patch"
- depends on !BR2_KERNEL_ADD_LATEST
- select BR2_KERNEL_ADD_PATCH
-
-config BR2_KERNEL_ADD_LATEST_RC_PATCH
- bool "Add _latest_ '-rc#' patch"
- depends on BR2_KERNEL_ADD_LATEST
- select BR2_KERNEL_ADD_PATCH
-
-config BR2_KERNEL_ADD_RC_PATCH
- bool "Add an '-rc#' patch"
- depends on !BR2_KERNEL_ADD_LATEST
- select BR2_KERNEL_ADD_PATCH
-
-config BR2_KERNEL_ADD_LATEST_SNAPSHOT
- bool "Add _latest_ 'snapshot' patch"
- depends on BR2_KERNEL_ADD_LATEST
- select BR2_KERNEL_ADD_PATCH
-
-config BR2_KERNEL_ADD_SNAPSHOT
- bool "Add a 'snapshot' patch (linux-2.6.X-rc#-git#)"
- depends on !BR2_KERNEL_ADD_LATEST
- select BR2_KERNEL_ADD_PATCH
-
-endchoice
-
-config BR2_KERNEL_ADD_PATCH
- bool
-
-config BR2_KERNEL_MINORLEVEL
- string "patch level"
- default ""
- depends on BR2_KERNEL_ADD_MINORPATCH
-
-config BR2_KERNEL_RC_LEVEL
- string "-rc patch level"
- default ""
- depends on BR2_KERNEL_ADD_RC_PATCH || BR2_KERNEL_ADD_SNAPSHOT
-
-config BR2_KERNEL_GIT_LEVEL
- string "-git patch level"
- default ""
- depends on BR2_KERNEL_ADD_SNAPSHOT
-
-source "target/device/Config.in.linux.patches"
-
-config BR2_LINUX_BSP_PATCH
- string "Additional patch to apply (from \$(DL_DIR))"
- default ""
- help
- Apply a patch located in \$(DL_DIR).
- You need to download or create this before
- enable this option
-
-config BR2_KERNEL_PATCH
- string
- default "patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2" if BR2_KERNEL_ADD_LATEST_MINORPATCH
- default "patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2" if BR2_KERNEL_ADD_MINORPATCH
- default "patch-$(LINUX26_LATEST_RC_VERSION).bz2" if BR2_KERNEL_ADD_LATEST_RC_PATCH
- default "patch-$(BR2_LINUX26_RC_VERSION).bz2" if BR2_KERNEL_ADD_RC_PATCH
- default "patch-$(LINUX26_LATEST_GIT_VERSION).bz2" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
- default "patch-$(BR2_LINUX26_SNAPSHOT_VERSION).bz2" if BR2_KERNEL_ADD_SNAPSHOT
- default "$(BR2_CUSTOM_LINUX26_PATCH)" if BR2_LINUX26_CUSTOM
-
-config BR2_EXTRA_VERSION
- string
- default ".$(BR2_KERNEL_PATCH_LEVEL)" if BR2_KERNEL_ADD_LATEST_MINORPATCH
- default ".$(BR2_KERNEL_PATCH_LEVEL)" if BR2_KERNEL_ADD_MINORPATCH
- default "$(BR2_KERNEL_RC_LEVEL)" if BR2_KERNEL_ADD_LATEST_RC_PATCH
- default "$(BR2_KERNEL_RC_LEVEL)" if BR2_KERNEL_ADD_RC_PATCH
- default "$(BR2_KERNEL_GIT_LEVEL)" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
- default "$(BR2_KERNEL_GIT_LEVEL)" if BR2_KERNEL_ADD_SNAPSHOT
- default "" if BR2_LINUX26_CUSTOM
-endmenu
-
-# -----------------------------------------------
-
-config BR2_KERNEL_PREPATCHED
- bool
-
-config BR2_KERNEL_BASE
- bool
-
-config BR2_KERNEL_LATEST
- bool
-
-config BR2_DOWNLOAD_LINUX26_VERSION
- string
- default "$(BR2_KERNEL_THIS_VERSION)" if BR2_KERNEL_BASE
- default "$(BR2_KERNEL_CURRENT_VERSION)" if BR2_LINUX_2_6_STABLE
- default "$(BR2_DEFAULT_KERNEL_HEADERS)" if BR2_KERNEL_LINUX_HEADERS_VERSION
- default $(BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION) if BR2_LINUX26_CUSTOM
-
-config BR2_LINUX26_VERSION
- string
- default "$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)" if BR2_KERNEL_ADD_LATEST_MINORPATCH&& BR2_KERNEL_BASE
- default "$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)" if BR2_KERNEL_ADD_MINORPATCH && BR2_KERNEL_BASE
- default "$(LINUX26_LATEST_RC_VERSION)" if BR2_KERNEL_ADD_LATEST_RC_PATCH
- default "$(BR2_LINUX26_RC_VERSION)" if BR2_KERNEL_ADD_RC_PATCH && BR2_KERNEL_BASE
- default "$(LINUX26_LATEST_GIT_VERSION)" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
- default "$(BR2_LINUX26_SNAPSHOT_VERSION)" if BR2_KERNEL_ADD_SNAPSHOT && BR2_KERNEL_BASE
- default "$(BR2_KERNEL_THIS_VERSION)" if ! BR2_KERNEL_ADD_PATCH && BR2_KERNEL_BASE
- default "$(BR2_KERNEL_CURRENT_VERSION)"if BR2_LINUX_2_6_STABLE
- default "$(BR2_CUSTOM_LINUX26_VERSION)" if BR2_LINUX26_CUSTOM
-
-menu "Linux Kernel Configuration"
-
-choice
- prompt "Linux Kernel Configuration"
- depends on BR2_PACKAGE_LINUX
- default BR2_PACKAGE_LINUX_USE_KCONFIG
- help
- Select the way to configure the Linux
-
-config BR2_PACKAGE_LINUX_USE_KCONFIG
- bool ".config file"
- depends on BR2_PACKAGE_LINUX
- help
- kernel's .config to use to build a kernel for the target.
-
- If the above setting is empty, you can change the default
- board-imposed value by passing LINUX26_KCONFIG=<path> to
- make.
-
-config BR2_PACKAGE_LINUX_USE_DEFCONFIG
- bool "Run make <board>_defconfig "
- depends on BR2_PACKAGE_LINUX
- help
- Configure Linux by make <board>_defconfig
- You have to supply a BOARD_NAME, either by
- defining it in a BSP or by make BOARD_NAME=<board>
-
-config BR2_PACKAGE_LINUX_USE_XCONFIG
- bool "Run make ARCH=$(ARCH) [xconfig|menuconfig] before build"
- depends on BR2_PACKAGE_LINUX
- help
- Configure Linux by make xconfig|menuconfig
-endchoice
-
-config BR2_PACKAGE_LINUX_KCONFIG
- string ".config file"
- depends on BR2_PACKAGE_LINUX_USE_KCONFIG
- default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
- help
- kernel's .config to use to build a kernel for the target.
-
- If the above setting is empty, you can change the default
- board-imposed value by passing LINUX26_KCONFIG=<path> to
- make.
-
-choice
- prompt "Preferred config tool"
- default BR2_MAKE_MENUCONFIG
- depends on BR2_PACKAGE_LINUX_USE_XCONFIG
- help
- Define the preferred tool to invoke if a configuration is invalid
-
-config BR2_MAKE_XCONFIG
- bool "make xconfig (needs QT3 headers on host)"
- help
- Run "make xconfig" if kernel ".config" is invalid
-
-config BR2_MAKE_MENUCONFIG
- bool "make menuconfig"
- help
- Run "make menuconfig" if kernel ".config" is invalid
-
-endchoice
-
-config BR2_KERNEL_CONFIG_METHOD
- string
- default "xconfig" if BR2_MAKE_XCONFIG
- default "menuconfig" if BR2_MAKE_MENUCONFIG
-
-endmenu
-
-choice
- prompt "kernel binary format"
- depends on BR2_PACKAGE_LINUX
- default BR2_LINUX_BIN_BZIMAGE if BR2_i386
- default BR2_LINUX_BIN_BZIMAGE if BR2_x86_64
- default BR2_LINUX_BIN_UIMAGE
- help
- Select the specific Linux binary type you want to use
-
-config BR2_LINUX_BIN_BZIMAGE
- bool "bzImage"
- depends on BR2_PACKAGE_LINUX
-
-config BR2_LINUX_BIN_UIMAGE
- bool "uImage"
- depends on BR2_PACKAGE_LINUX
-
-config BR2_LINUX_BIN_VMLINUX
- bool "vmlinux"
- depends on BR2_PACKAGE_LINUX
-
-config BR2_LINUX_BIN_ZIMAGE
- bool "zImage"
- depends on BR2_PACKAGE_LINUX
-
-config BR2_LINUX_BIN_CUSTOM
- bool "<custom> Linux binary"
- depends on BR2_PACKAGE_LINUX
- help
- Build custom Linux binary format
-
-endchoice
-
-config BR2_LINUX_BIN_CUSTOM_BIN
- string "custom kernel binary format"
- depends on BR2_LINUX_BIN_CUSTOM
- default ""
- help
- Which Linux binary format?
-
-config BR2_PACKAGE_LINUX_FORMAT
- string #"kernel binary format"
- depends on BR2_PACKAGE_LINUX
- default "bzImage" if BR2_LINUX_BIN_BZIMAGE
- default "uImage" if BR2_LINUX_BIN_UIMAGE
- default "vmlinux" if BR2_LINUX_BIN_VMLINUX
- default "zImage" if BR2_LINUX_BIN_ZIMAGE
- default $(BR2_LINUX_BIN_CUSTOM_BIN) if BR2_LINUX_BIN_CUSTOM
- help
- kernel binary format.
- Popular values include:
- - bzImage
- - zImage
- - vmlinux
- - zImage
- - xipImage
- and other, architecture dependant formats.
-
- Note that the default format is supposed to be set by your
- board-description, if any.
- i386 and compatible default to bzImage if nothing was given
- above.
- If the above setting is empty, you can change the default
- board-imposed value by passing LINUX26_FORMAT=<string> to
- make.
-
-menu "Destinations for linux kernel binaries"
-
-config BR2_LINUX_COPYTO_ROOTFS
- bool "Copy kernel to root file system"
- depends on BR2_PACKAGE_LINUX
- help
- Copy kernel to <root>/boot directory
-
-config BR2_LINUX_COPYTO_TFTPBOOT
- bool "Copy kernel to /tftpboot"
- help
- Copy kernel to /tftpboot directory
-
-config BR2_LINUX_COPYTO
- string "Copy kernel to <dir>..."
- default ""
- help
- Copy kernel to secondary location
-
-config BR2_LINUX_COPY_CONFIGURATION
- bool "Copy buildroot configuration to Linux file system"
- help
- The configuration files for buildroot, uclibc, busybox and linux
- are copied to the "<root>/boot" directory.
-
-endmenu
-endif
-
diff --git a/target/linux/Config.in.versions b/target/linux/Config.in.versions
deleted file mode 100644
index c5263a4..0000000
--- a/target/linux/Config.in.versions
+++ /dev/null
@@ -1,62 +0,0 @@
-# This file defines the latest version of
-# You also have to edit BR2_LINUX_2_6_STABLE
-# in target/linux/Config.in.advanced
-# which is approximately at line 136
-
-config LINUX26_LATEST_RC_VERSION
- string
- default "2.6.31-rc4" if BR2_KERNEL_ADD_LATEST_RC_PATCH
- help
- Not really available as of 20090103
-
-config LINUX26_LATEST_GIT_VERSION
- string
- default "2.6.30-rc4-git4" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
-
-config BR2_KERNEL_CURRENT_VERSION
- string
- default "2.6.33.4"
- help
- This is the latest stable kernel (including minor version).
-
-config BR2_KERNEL_LATEST_2_6_33
- string
- default "4"
- help
- Released 2010-May-12.
-
-config BR2_KERNEL_LATEST_2_6_32
- string
- default "13"
- help
- Released 2010-May-12.
-
-config BR2_KERNEL_LATEST_2_6_31
- string
- default "13"
- help
- Released 2010-Apr-01 (last .31-stable release).
-
-config BR2_KERNEL_LATEST_2_6_30
- string
- default "10"
- help
- Released 2009-Dec-04 (last .30-stable release).
-
-config BR2_KERNEL_LATEST_2_6_29
- string
- default "6"
- help
- Released 2009-Jul-02 (last .29-stable release).
-
-config BR2_KERNEL_LATEST_2_6_28
- string
- default "10"
- help
- Released 2009-May-02 (last .28-stable release).
-
-config BR2_KERNEL_LATEST_2_6_27
- string
- default "46"
- help
- Released 2010-Apr-01.
diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
deleted file mode 100644
index f019824..0000000
--- a/target/linux/Makefile.in
+++ /dev/null
@@ -1,250 +0,0 @@
-#############################################################
-#
-# Linux kernel 2.6 target
-#
-#############################################################
-ifneq ($(filter $(TARGETS),linux26),)
-
-
-ifeq ($(DOWNLOAD_LINUX26_VERSION),)
-# User did not define linux version, try using headers
-ifeq ($(LINUX_HEADERS_VERSION),)
-# We did not have headers (this is for real???)
-# Version of linux before patches
-DOWNLOAD_LINUX26_VERSION=2.6.22.1
-# Version of Linux after applying any patches
-LINUX26_VERSION=2.6.22.1
-else
-# OK, we have headers, use them...
-DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
-LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
-endif
-endif
-
-LINUX26_SOURCE=linux-$(DOWNLOAD_LINUX26_VERSION).tar.bz2
-LINUX26_BZCAT:=$(BZCAT)
-LINUX26_SITE=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6
-
-ifeq ($(BOARD_PATH),)
-BOARD_PATH:=$(call qstrip,$(BR2_BOARD_PATH))
-endif
-
-# Linux kernel configuration file
-# Has to be set by the target/device
-# If it is not set by the target/device, then pick the one from .config
-ifndef LINUX26_KCONFIG
-ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_KCONFIG)),)
-LINUX26_KCONFIG=$(call qstrip,$(BR2_PACKAGE_LINUX_KCONFIG))
-else
-# LINUX26_KCONFIG=$(BOARD_PATH)/linux26.config
-endif
-endif
-
-ifndef LINUX26_FORMAT
-ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)),)
-LINUX26_FORMAT=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT))
-else
-ifneq ($(filter i386 x86-64,$(KERNEL_ARCH)),)
-# zImage target no longer available on x86 since 2.6.30
-LINUX26_FORMAT=bzImage
-else
-LINUX26_FORMAT=zImage
-endif
-endif
-endif
-
-# Has to be set by the target/device
-ifndef LINUX26_BINLOC
-# default:
-ifeq ($(LINUX26_FORMAT),vmlinux)
-LINUX26_BINLOC=$(LINUX26_FORMAT)
-else
-ifeq ($(BR2_ARCH),"cris")
-LINUX26_BINLOC=arch/$(KERNEL_ARCH)/arch-v10/boot/$(LINUX26_FORMAT)
-else
-LINUX26_BINLOC=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
-endif
-endif
-endif
-
-# File name for the Linux kernel binary
-ifndef LINUX26_KERNEL
-LINUX26_KERNEL_NAME=$(BINARIES_DIR)/$(LINUX26_FORMAT)
-endif
-
-# Version of Linux AFTER patches
-LINUX26_DIR=$(BUILD_DIR)/linux-$(LINUX26_VERSION)
-
-# for packages that need it
-LINUX_VERSION:=$(LINUX26_VERSION)
-LINUX_DIR=$(LINUX26_DIR)
-LINUX_KERNEL=$(LINUX26_KERNEL_NAME)
-
-# kernel patches
-ifeq ($(strip $(LINUX26_PATCH_DIR)),)
-ifneq ($(BOARD_PATH),)
-LINUX26_PATCH_DIR:=$(BOARD_PATH)/kernel-patches/
-endif
-endif
-LINUX26_MAKE_FLAGS = HOSTCC="$(HOSTCC)" HOSTCFLAGS="$(HOSTCFLAGS)" \
- ARCH=$(KERNEL_ARCH) \
- INSTALL_MOD_PATH=$(TARGET_DIR) \
- CROSS_COMPILE=$(TARGET_CROSS) \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- LZMA="$(LZMA)"
-
-$(LINUX26_KCONFIG):
- @if [ ! -f "$(LINUX26_KCONFIG)" ] ; then \
- echo ""; \
- echo "You should create a .config for your kernel"; \
- echo "and install it as $(LINUX26_KCONFIG)"; \
- echo ""; \
- sleep 5; \
- fi
-
-ifneq ($(strip $(LINUX26_VERSION)),$(strip $(LINUX_HEADERS_VERSION)))
-$(DL_DIR)/$(LINUX26_SOURCE):
- $(call DOWNLOAD,$(LINUX26_SITE),$(LINUX26_SOURCE))
-endif # ($(LINUX26_VERSION),$(LINUX_HEADERS_VERSION))
-
-$(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE)
- rm -rf $(LINUX26_DIR)
- @echo "*** Unpacking kernel source"
- $(LINUX26_BZCAT) $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-ifneq ($(DOWNLOAD_LINUX26_VERSION),$(LINUX26_VERSION))
- # Rename the dir from the downloaded version to the AFTER patch version
- mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(LINUX26_DIR)
-endif
- touch $@
-
-$(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
- toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers \
- linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
-ifeq ($(BR2_KERNEL_HEADERS_RT),y)
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_RT_SOURCE)
-endif
-ifneq ($(KERNEL_HEADERS_PATCH_DIR),)
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
- linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
-endif
-ifeq ($(BR2_PACKAGE_OPENSWAN),y)
- toolchain/patch-kernel.sh $(LINUX26_DIR) package/openswan \
- linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
-endif
-ifneq ($(LINUX26_PATCH_DIR),)
- if [ -d $(LINUX26_PATCH_DIR) ] ; then \
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) linux-$(LINUX26_VERSION)\*.patch ; \
- fi
-endif
- touch $@
-
-$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG)
- cp -dpf $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
- $(SED) '/CONFIG_AEABI=y/d' $(LINUX26_DIR)/.config
-ifeq ($(BR2_ARM_EABI),y)
- echo "CONFIG_AEABI=y" >> $(LINUX26_DIR)/.config
- $(SED) '/CONFIG_OABI_COMPAT/d' $(LINUX26_DIR)/.config
- echo "# CONFIG_OABI_COMPAT is not set" >> $(LINUX26_DIR)/.config
-else
- echo "# CONFIG_AEABI is not set" >> $(LINUX26_DIR)/.config
-endif
- $(SED) '/CONFIG_IPV6=y/d' $(LINUX26_DIR)/.config
-ifeq ($(BR2_INET_IPV6),y)
- echo "CONFIG_IPV6=y" >> $(LINUX26_DIR)/.config
-else
- echo "# CONFIG_IPV6 is not set" >> $(LINUX26_DIR)/.config
-endif
- $(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
- $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
-ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
- echo "CONFIG_INITRAMFS_SOURCE=\"$(BINARIES_DIR)/rootfs.initramfs\"" >> \
- $(LINUX26_DIR)/.config
- echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
- echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
-else
- echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> $(LINUX26_DIR)/.config
-endif
-ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
- # precedence for a small initramfs
- $(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
- $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
- echo "CONFIG_INITRAMFS_SOURCE=\"$(BB_INITRAMFS_TARGET)\"" >> \
- $(LINUX26_DIR)/.config
- echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
- echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
-endif
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig
- touch $@
-
-$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare
- touch $@
-
-$(LINUX26_KERNEL_NAME): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \
- $(LINUX26_DIR)/.depend_done
- $(MAKE) $(LINUX26_MAKE_FLAGS) \
- -C $(LINUX26_DIR) $(LINUX26_FORMAT)
- cp -pf $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL_NAME)
- touch -c $@
-
-$(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep: $(LINUX26_DIR)/.configured
- rm -rf $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)
- rm -f $(TARGET_DIR)/sbin/cardmgr
- @if grep -q CONFIG_MODULES=y $(LINUX26_DIR)/.config; then \
- set -x; \
- echo "Have CONFIG_MODULES"; \
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) modules; \
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) \
- DEPMOD=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26 \
- INSTALL_MOD_PATH=$(TARGET_DIR) modules_install; \
- rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/build \
- $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/source; \
- $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26 -b $(TARGET_DIR) $(LINUX_HEADERS_VERSION); \
- else \
- echo "No CONFIG_MODULES"; \
- fi
- touch -c $@
-
-linux26-menuconfig: host-sed dirs $(LINUX26_DIR)/.patched
- if [ ! -f $(LINUX26_DIR)/.config ]; then \
- [ -n "$(LINUX26_KCONFIG)" ] && [ -f $(LINUX26_KCONFIG) ] && \
- cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config || \
- true; \
- fi
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig
- -[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
-
-linux26-xconfig: host-sed dirs $(LINUX26_DIR)/.patched
- [ -f $(LINUX26_DIR)/.config ] || cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) xconfig
- -[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
-
-linux26: $(LINUX26_KERNEL_NAME)
-
-$(LINUX26_DIR)/.modules_installed: $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
- touch $@
-
-linux26-modules: cross-depmod26 $(LINUX26_DIR)/.modules_installed
-
-linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
-
-linux26-unpacked: $(LINUX26_DIR)/.patched
-
-linux26-config: host-sed $(LINUX26_DIR)/.configured
-
-linux26-update:
- cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG)
-
-# force rebuild
-linux26-force:
- touch $(LINUX26_DIR)/.configured
-
-# This has been renamed so we do _NOT_ by default run this on 'make clean'
-linux26clean:
- rm -f $(LINUX26_KERNEL_NAME) $(LINUX26_DIR)/.configured
- -$(MAKE) PATH=$(TARGET_PATH) -C $(LINUX26_DIR) clean
-
-linux26-dirclean:
- rm -rf $(LINUX26_DIR)
-
-endif
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
deleted file mode 100644
index 9cbbd2c..0000000
--- a/target/linux/Makefile.in.advanced
+++ /dev/null
@@ -1,532 +0,0 @@
-###############################################################################
-#
-# Linux kernel 2.6 target (Advanced configuration)
-#
-###############################################################################
-ifneq ($(filter $(TARGETS),linux26),)
-
-# -----------------------------------------------------------------------------
-# Make sure LINUX_HEADERS_VERSION is defined
-ifeq ($(LINUX_HEADERS_VERSION),)
-# We did not have headers (this is for real???)
-LINUX_HEADERS_VERSION:=2.6.22.1
-endif
-
-# -----------------------------------------------------------------------------
-# STRATEGY FOR DOWNLOAD_LINUX26_VERSION
-# 1. Use definition from user Makefile
-# 2. Use definition from Kconfig
-# 3. Use Linux Headers version
-# 4. Use default (2.6.22.1)
-ifeq ($(DOWNLOAD_LINUX26_VERSION),)
-ifneq ($(BR2_DOWNLOAD_LINUX26_VERSION),)
-DOWNLOAD_LINUX26_VERSION:=$(call qstrip,$(BR2_DOWNLOAD_LINUX26_VERSION))
-else
-DOWNLOAD_LINUX26_VERSION:=$(LINUX_HEADERS_VERSION)
-endif
-endif
-
-# -----------------------------------------------------------------------------
-# STRATEGY FOR LINUX26_VERSION
-# 1. Use definition from user Makefile
-# 2. Use definition from Kconfig
-# 3. Use Linux Headers version
-# 4. Use default (2.6.22.1)
-ifeq ($(LINUX26_VERSION),)
-ifneq ($(BR2_LINUX26_VERSION),)
-LINUX26_VERSION:=$(call qstrip,$(BR2_LINUX26_VERSION))
-else
-LINUX26_VERSION:=$(LINUX_HEADERS_VERSION)
-endif
-endif
-
-# Ask the kernel what version number it will use when installing modules
-LINUX26_VERSION_PROBED = `$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) --no-print-directory -s kernelrelease`
-
-ifeq ($(BOARD_PATH),)
-BOARD_PATH:=$(call qstrip,$(BR2_BOARD_PATH))
-endif
-
-# Version of Linux AFTER patches
-LINUX26_DIR:=$(BUILD_DIR)/linux-$(LINUX26_VERSION)
-
-# for packages that need it
-LINUX_VERSION:=$(LINUX26_VERSION)
-LINUX_DIR:=$(LINUX26_DIR)
-
-# -----------------------------------------------------------------------------
-# Define source name and sites
-LINUX26_SOURCE:=linux-$(DOWNLOAD_LINUX26_VERSION).tar.bz2
-LINUX26_SITE:=$(call qstrip,$(BR2_KERNEL_SITE))
-
-LINUX26_PATCH_SOURCE:=$(call qstrip,$(BR2_KERNEL_PATCH))
-LINUX26_PATCH_SITE:=$(call qstrip,$(BR2_KERNEL_PATCH_SITE))
-
-LINUX26_BSP_PATCH:=$(call qstrip,$(BR2_LINUX_BSP_PATCH))
-
-ifneq ($(LINUX26_BSP_PATCH),)
-LINUX_HEADERS_DEPENDS:= $(DL_DIR)/$(LINUX26_BSP_PATCH)
-endif
-
-ifneq ($(LINUX26_PATCH_SOURCE),)
-LINUX_HEADERS_DEPENDS+=$(DL_DIR)/$(LINUX26_PATCH_SOURCE)
-endif
-
-# ------------------------------------
-# kernel patches provided by buildroot
-ifeq ($(strip $(LINUX26_PATCH_DIR)),)
-LINUX26_PATCH_DIR:=$(BOARD_PATH)/kernel-patches/
-endif
-
-# kernel architecture patches provided by buildroot
-KERNEL_ARCH_PATCH_DIR:=$(call qstrip,$(BR2_KERNEL_ARCH_PATCH_DIR))
-
-
-
-
-# -----------------------------------------------------------------------------
-# Linux kernel configuration file
-# This is used if BR2_PACKAGE_LINUX_USE_KCONFIG is set
-# Has to be set by the target/device
-# If it is not set by the target/device, then pick the one from .config
-ifndef LINUX26_KCONFIG
-ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_KCONFIG)),)
-LINUX26_KCONFIG:=$(call qstrip,$(BR2_PACKAGE_LINUX_KCONFIG))
-else
-ifeq ($(BR2_i386),y)
-LINUX26_KCONFIG:=$(BOARD_PATH)/linux26.config
-else
-LINUX26_KCONFIG:=$(BOARD_PATH)/linux-$(LINUX26_VERSION).config
-endif
-endif
-endif
-
-KERNEL_CONFIG_METHOD:=$(call qstrip,$(BR2_KERNEL_CONFIG_METHOD))
-ifeq ($(KERNEL_CONFIG_METHOD),)
-KERNEL_CONFIG_METHOD:=menuconfig
-endif
-
-# -----------------------------------------------------------------------------
-ifndef LINUX26_FORMAT
-ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)),)
-LINUX26_FORMAT:=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT))
-else
-ifneq ($(filter i386 x86-64,$(KERNEL_ARCH)),)
-# zImage target no longer available on x86 since 2.6.30
-LINUX26_FORMAT=bzImage
-else
-LINUX26_FORMAT:=zImage
-endif
-endif
-endif
-
-# -----------------------------------------------------------------------------
-# Has to be set by the target/device
-
-LINUX26_MKIMAGE_DEP:=
-
-# --------------
-# VMLINUX
-ifeq ($(LINUX26_FORMAT),vmlinux)
-ifeq ($(LINUX26_BINLOC),)
-LINUX26_BINLOC:=$(LINUX26_FORMAT)
-endif
-endif
-
-# --------------
-# UIMAGE
-ifeq ($(LINUX26_FORMAT),uImage)
-LINUX26_MKIMAGE_DEP:=$(MKIMAGE)
-ifeq ($(LINUX26_BINLOC),)
-LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
-endif
-endif
-
-# --------------
-# ZIMAGE
-ifeq ($(LINUX26_FORMAT),zImage)
-ifeq ($(LINUX26_BINLOC),)
-LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
-endif
-endif
-
-# --------------
-# BZIMAGE
-ifeq ($(LINUX26_FORMAT),bzImage)
-ifeq ($(LINUX26_BINLOC),)
-LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/bzImage
-endif
-endif
-
-# -----------------------------------------------------------------------------
-# File name for the Linux kernel binary
-LINUX26_KERNEL_NAME:=$(LINUX26_FORMAT)
-
-
-ifeq ($(BOARD_NAME),)
-BOARD_NAME=$(ARCH)
-endif
-
-ifndef LINUX26_KERNEL
-LINUX26_KERNEL:=$(BINARIES_DIR)/$(LINUX26_KERNEL_NAME)
-endif
-
-# for packages that need it
-LINUX_KERNEL:=$(LINUX26_KERNEL)
-
-
-# -----------------------------------------------------------------------------
-LINUX26_BZCAT:=$(BZCAT)
-
-LINUX26_MAKE_FLAGS = HOSTCC="$(HOSTCC)" HOSTCFLAGS="$(HOSTCFLAGS)" \
- ARCH=$(KERNEL_ARCH) \
- INSTALL_MOD_PATH=$(TARGET_DIR) \
- CROSS_COMPILE=$(TARGET_CROSS) \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- LZMA="$(LZMA)" \
- PATH=$(PATH)
-
-# =============================================================================
-# ifneq ($(strip $(LINUX26_VERSION)),$(strip $(LINUX_HEADERS_VERSION)))
-
-ifneq ($(strip $(LINUX26_SOURCE)),$(strip $(LINUX_HEADERS_SOURCE)))
-$(DL_DIR)/$(LINUX26_SOURCE):
- $(call DOWNLOAD,$(LINUX26_SITE),$(LINUX26_SOURCE))
-endif # ($(LINUX26_VERSION),$(LINUX_HEADERS_VERSION))
-
-ifneq ($(strip $(LINUX26_PATCH_SOURCE)),)
-$(DL_DIR)/$(LINUX26_PATCH_SOURCE):
- $(call DOWNLOAD,$(LINUX26_PATCH_SITE),$(LINUX26_PATCH_SOURCE))
-endif
-
-$(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE)
- rm -rf $(LINUX26_DIR)
- @echo "*** Unpacking kernel source"
- $(LINUX26_BZCAT) $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-ifneq ($(DOWNLOAD_LINUX26_VERSION),$(LINUX26_VERSION))
- # Rename the dir from the downloaded version to the AFTER patch version
- mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(LINUX26_DIR)
- echo $(LINUX26_VERSION_PROBED) > $(BUILD_DIR)/.linux-version
-endif
- touch $@
-
-
-# -----------------------------------------------------------------------------
-LINUX26_TARGETS+=$(LINUX26_KERNEL) $(BUILD_DIR)/.linux-version
-
-ifeq ($(BR2_LINUX_COPYTO_ROOTFS),y)
-LINUX26_TARGETS+=$(TARGET_DIR)/boot/$(LINUX26_KERNEL_NAME)
-endif
-
-ifeq ($(BR2_LINUX_COPYTO_TFTPBOOT),y)
-LINUX26_TARGETS+=/tftpboot/$(LINUX26_KERNEL_NAME)
-endif
-
-ifneq ($(call qstrip,$(BR2_LINUX_COPYTO)),)
-LINUX_COPYTO:=$(call qstrip,$(BR2_LINUX_COPYTO))
-LINUX26_TARGETS+=$(LINUX_COPYTO)/$(LINUX26_KERNEL_NAME)
-endif
-
-ifneq ($(BR2_LINUX_COPY_CONFIGURATION),)
-LINUX26_TARGETS+=$(TARGET_DIR)/boot/buildroot.config
-LINUX26_TARGETS+=$(TARGET_DIR)/boot/linux-$(LINUX26_VERSION).config
-LINUX26_TARGETS+=$(TARGET_DIR)/boot/uclibc.config
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-LINUX26_TARGETS+=$(TARGET_DIR)/boot/busybox.config
-endif
-endif
-# -----------------------------------------------------------------------------
-
-$(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
-ifneq ($(LINUX26_PATCH_SOURCE),)
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX26_PATCH_SOURCE)
-endif
-ifneq ($(LINUX26_BSP_PATCH),)
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX26_BSP_PATCH)
-endif
- toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers \
- linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
-ifeq ($(BR2_KERNEL_HEADERS_RT),y)
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_RT_SOURCE)
-endif
-ifneq ($(KERNEL_HEADERS_PATCH_DIR),)
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
- linux-$(LINUX26_VERSION)\*.patch{,.gz,.bz2}
-endif
-ifeq ($(BR2_PACKAGE_OPENSWAN),y)
- toolchain/patch-kernel.sh $(LINUX26_DIR) package/openswan \
- linux-$(LINUX26_VERSION)\*.patch{,.gz,.bz2}
-endif
- touch $@
-
-$(LINUX26_DIR)/.patched.arch: $(LINUX26_DIR)/.patched
-ifneq ($(BR2_KERNEL_ARCH_PATCH_DIR),)
- if [ -d $(KERNEL_ARCH_PATCH_DIR) ] ; then \
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(KERNEL_ARCH_PATCH_DIR) \
- linux-\*.patch{,.gz,.bz2} ; \
- fi
-endif
- touch $@
-
-$(LINUX26_DIR)/.patched.board: $(LINUX26_DIR)/.patched.arch $(KERNEL_COND_PATCHES)
-ifneq ($(LINUX26_PATCH_DIR),)
- if [ -d $(LINUX26_PATCH_DIR) ] ; then \
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) \
- linux-$(LINUX26_VERSION)\*.patch{,.gz,.bz2} ; \
- fi
-endif
- touch $@
-
-# =============================================================================
-linux_patch: $(LINUX26_DIR)/.patched.board
-
-KERNEL_EXTRA_VERSION:=$(call qstrip,$(BR2_EXTRA_VERSION))
-
-lxcf: $(LINUX26_DIR)/.config
-
-$(LINUX26_DIR)/.config: $(LINUX26_DIR)/.patched.board
-ifeq ($(BR2_PACKAGE_LINUX_USE_DEFCONFIG),y)
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(BOARD_NAME)_defconfig
-endif
-ifeq ($(BR2_PACKAGE_LINUX_USE_XCONFIG),y)
-ifeq ($(KERNEL_CONFIG_METHOD),xconfig)
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) xconfig || \
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig \
-else
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig
-endif
-endif
-ifeq ($(BR2_PACKAGE_LINUX_USE_KCONFIG),y)
- # Try user defined config
- if [ -f "$(LINUX26_KCONFIG)" ] ; then \
- cp -dpf $(LINUX26_KCONFIG) $@ ; \
- fi
- # Try to get a config for this linux version in the board directory
- echo "LINUX26_VERSION = $(LINUX26_VERSION)"
- if [ ! -f "$(LINUX26_DIR)/.config" ] ; then \
- if [ -f "$(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config" ] ; then \
- cp -dpf $(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config $@ ; \
- fi ; \
- fi
- # Try to get a config for latest linux version in the board directory
- if [ ! -f "$(LINUX26_DIR)/.config" ] ; then \
- scripts/get_linux_config.sh $(BOARD_PATH) $(LINUX26_DIR) ; \
- fi
- # Use a board config defined in the linux source.
- if [ ! -f "$(LINUX26_DIR)/.config" ] ; then \
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(BOARD_NAME)_defconfig || \
- echo "$(BOARD_NAME)_defconfig failed..." ; \
- fi
- # let the user create his/her own config
- if [ ! -f "$(LINUX26_DIR)/.config" ] ; then \
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(KERNEL_CONFIG_METHOD) ; \
- fi
-endif
-ifneq ($(call qstrip,$(BR2_EXTRA_VERSION)),)
- $(SED) 's,^EXTRAVERSION.*,EXTRAVERSION = $(KERNEL_EXTRA_VERSION),g' $(LINUX26_DIR)/Makefile
-endif
-# $(strip $(subst ",, - ))
-
-# -----------------------------------------------------------------------------
-$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.config
- $(SED) '/CONFIG_AEABI=y/d' $(LINUX26_DIR)/.config
-ifeq ($(BR2_ARM_EABI),y)
- echo "CONFIG_AEABI=y" >> $(LINUX26_DIR)/.config
- $(SED) '/CONFIG_OABI_COMPAT/d' $(LINUX26_DIR)/.config
- echo "# CONFIG_OABI_COMPAT is not set" >> $(LINUX26_DIR)/.config
-else
- echo "# CONFIG_AEABI is not set" >> $(LINUX26_DIR)/.config
-endif
- $(SED) '/CONFIG_IPV6=y/d' $(LINUX26_DIR)/.config
-ifeq ($(BR2_INET_IPV6),y)
- echo "CONFIG_IPV6=y" >> $(LINUX26_DIR)/.config
-else
- echo "# CONFIG_IPV6 is not set" >> $(LINUX26_DIR)/.config
-endif
- $(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
- $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
-ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
- echo "CONFIG_INITRAMFS_SOURCE=\"$(BINARIES_DIR)/rootfs.initramfs\"" >> \
- $(LINUX26_DIR)/.config
- echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
- echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
-else
- echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> $(LINUX26_DIR)/.config
-endif
-ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
- # precedence for a small initramfs
- $(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
- $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
- echo "CONFIG_INITRAMFS_SOURCE=\"$(BB_INITRAMFS_TARGET)\"" >> \
- $(LINUX26_DIR)/.config
- echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
- echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
-endif
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig
- touch $@
-
-# -----------------------------------------------------------------------------
-$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured $(LINUX26_MKIMAGE_DEP)
- mkdir -p $(TARGET_DIR)/boot
- -mv $(LINUX26_DIR)/localversion* $(TARGET_DIR)/boot
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare
- touch $@
-
-$(LINUX26_DIR)/$(LINUX26_BINLOC): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \
- $(LINUX26_DIR)/.depend_done
- $(MAKE) $(LINUX26_MAKE_FLAGS) \
- -C $(LINUX26_DIR) $(LINUX26_FORMAT)
- touch $@
-
-$(LINUX26_KERNEL): $(LINUX26_DIR)/$(LINUX26_BINLOC)
- cp -pf $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL)
- touch $@
-
-# -----------------------------------------------------------------------------
-$(STAMP_DIR)/linux_modules_target_installed: $(LINUX26_DIR)/.depend_done
- rm -rf $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION_PROBED)
- rm -f $(TARGET_DIR)/sbin/cardmgr
- # Make Linux depend on modules only if enabled in the .config.
- @if [ $(shell grep -c "CONFIG_MODULES=y" $(LINUX26_DIR)/.config) != 0 ] ; then \
- echo "*** Installing Linux kernel modules" ; \
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) modules; \
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) \
- DEPMOD=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26 \
- INSTALL_MOD_PATH=$(TARGET_DIR) modules_install; \
- rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION_PROBED)/build; \
- rm -f $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION_PROBED)/source; \
- $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26 -b $(TARGET_DIR) $(LINUX26_VERSION_PROBED); \
- else \
- echo "*** Skipping installing modules since it is not enabled" ; \
- fi
- touch $@
-
-linux26-menuconfig: $(LINUX26_DIR)/.patched host-sed
- [ -f $(LINUX26_DIR)/.config ] || cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig
- -[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
-
-linux26-xconfig: $(LINUX26_DIR)/.patched host-sed
- [ -f $(LINUX26_DIR)/.config ] || cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
- $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) xconfig
- -[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
-
-$(TARGET_DIR)/boot/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL)
- mkdir -p $(TARGET_DIR)/boot
- cp -dpf $(LINUX26_KERNEL) $(TARGET_DIR)/boot/$(LINUX26_KERNEL_NAME)
-
-$(TARGET_DIR)/boot/buildroot.config: .config
- mkdir -p $(TARGET_DIR)/boot
- cp -dpf .config $(TARGET_DIR)/boot/buildroot.config
-
-$(TARGET_DIR)/boot/linux-$(LINUX26_VERSION).config: $(LINUX26_DIR)/.config
- mkdir -p $(TARGET_DIR)/boot
- cp -dpf $(LINUX26_DIR)/.config $(TARGET_DIR)/boot/linux-$(LINUX26_VERSION).config
-
-$(TARGET_DIR)/boot/uclibc.config: $(UCLIBC_DIR)/.config
- mkdir -p $(TARGET_DIR)/boot
- cp -dpf $(UCLIBC_DIR)/.config $(TARGET_DIR)/boot/uclibc.config
-
-$(TARGET_DIR)/boot/busybox.config: $(BUSYBOX_DIR)/.config
- mkdir -p $(TARGET_DIR)/boot
- cp -dpf $(BUSYBOX_DIR)/.config $(TARGET_DIR)/boot/busybox.config
-
-/tftpboot/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL)
- -mkdir -p /tftpboot
- -cp -dpf $(LINUX26_KERNEL) $@
- -touch $@
-
-ifneq ($(LINUX_COPYTO),/tftpboot)
-$(LINUX_COPYTO)/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL)
- mkdir -p $(LINUX_COPYTO)
- cp -dpf $(LINUX26_KERNEL) $@
- touch $@
-endif
-
-$(BUILD_DIR)/.linux-version: $(LINUX26_KERNEL)
- echo $(LINUX26_VERSION_PROBED) > $(BUILD_DIR)/.linux-version
- echo LINUX_MODULES=`$(LINUX26_VERSION_PROBED)`
-
-linux26: $(LINUX26_TARGETS)
-
-linux26-version: $(BUILD_DIR)/.linux-version
-
-linux26-modules: cross-depmod26 $(STAMP_DIR)/linux_modules_target_installed
-
-linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
-
-linux26-unpacked: $(LINUX26_DIR)/.patched
-
-linux26-config: host-sed $(LINUX26_DIR)/.configured
-
-linux26-update:
- cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG)
-
-# force rebuild
-linux26-force:
- touch $(LINUX26_DIR)/.configured
-
-# This has been renamed so we do _NOT_ by default run this on 'make clean'
-linux26clean:
- rm -f $(STAMP_DIR)/linux_modules_target_installed
- rm -f $(LINUX26_KERNEL) $(LINUX26_DIR)/.configured
- -$(MAKE) PATH=$(TARGET_PATH) -C $(LINUX26_DIR) clean
-
-linux26-dirclean:
- rm -rf $(LINUX26_DIR)
-
-linux26-status: linux-status
-
-# @echo =$()
-linux-status:
- @echo BOARD_NAME=$(BOARD_NAME)
- @echo BR2_BOARD_PATH=$(BR2_BOARD_PATH)
- @echo BR2_CUSTOM_LINUX26_PATCH=$(BR2_CUSTOM_LINUX26_PATCH)
- @echo BR2_CUSTOM_LINUX26_PATCH_SITE=$(BR2_CUSTOM_LINUX26_PATCH_SITE)
- @echo BR2_DOWNLOAD_LINUX26_VERSION=$(BR2_DOWNLOAD_LINUX26_VERSION)
- @echo BR2_LINUX_BSP_PATCH=$(BR2_LINUX_BSP_PATCH)
- @echo BR2_LINUX_COPYTO=$(BR2_LINUX_COPYTO)
- @echo BR2_LINUX_COPYTO_ROOTFS=$(BR2_LINUX_COPYTO_ROOTFS)
- @echo BR2_LINUX_COPYTO_TFTPBOOT=$(BR2_LINUX_COPYTO_TFTPBOOT)
- @echo BR2_LINUX_VERSION=$(BR2_LINUX_VERSION)
- @echo BR2_LINUX26_CUSTOM=$(BR2_LINUX26_CUSTOM)
- @echo BR2_LINUX26_VERSION=$(BR2_LINUX26_VERSION)
- @echo BR2_KERNEL_ADD_LATEST_RC_PATCH=$(BR2_KERNEL_ADD_LATEST_RC_PATCH)
- @echo BR2_KERNEL_ADD_LATEST_SNAPSHOT=$(BR2_KERNEL_ADD_LATEST_SNAPSHOT)
- @echo BR2_KERNEL_ADD_MINORPATCH=$(BR2_KERNEL_ADD_MINORPATCH)
- @echo BR2_KERNEL_ARCH_PATCH_DIR=$(BR2_KERNEL_ARCH_PATCH_DIR)
- @echo BR2_KERNEL_GIT_LEVEL=$(BR2_KERNEL_GIT_LEVEL)
- @echo BR2_KERNEL_MINORLEVEL=$(BR2_KERNEL_MINORLEVEL)
- @echo BR2_KERNEL_PATCH=$(BR2_KERNEL_PATCH)
- @echo BR2_KERNEL_PATCH_SITE=$(BR2_KERNEL_PATCH_SITE)
- @echo BR2_KERNEL_RC_LEVEL=$(BR2_KERNEL_RC_LEVEL)
- @echo BR2_KERNEL_SITE=$(BR2_KERNEL_SITE)
- @echo BR2_PACKAGE_LINUX_KCONFIG=$(BR2_PACKAGE_LINUX_KCONFIG)
- @echo BR2_PACKAGE_LINUX_USE_DEFCONFIG=$(BR2_PACKAGE_LINUX_USE_DEFCONFIG)
- @echo BR2_PACKAGE_LINUX_USE_KCONFIG=$(BR2_PACKAGE_LINUX_USE_KCONFIG)
- @echo BR2_PACKAGE_LINUX_USE_XCONFIG=$(BR2_PACKAGE_LINUX_USE_XCONFIG)
- @echo DOWNLOAD_LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION)
- @echo KERNEL_ARCH_PATCH_DIR=$(KERNEL_ARCH_PATCH_DIR)
- @echo KERNEL_COND_PATCHES=$(KERNEL_COND_PATCHES)
- @echo KERNEL_EXT=$(KERNEL_EXT)
- @echo KERNEL_EXTRA_VERSION=$(KERNEL_EXTRA_VERSION)
- @echo KERNEL_HEADERS_PATCH_DIR=$(KERNEL_HEADERS_PATCH_DIR)
- @echo LINUX_COPYTO=$(LINUX_COPYTO)
- @echo LINUX_HEADERS_VERSION=$(LINUX_HEADERS_VERSION)
- @echo LINUX26_BINLOC=$(LINUX26_BINLOC)
- @echo LINUX26_DIR=$(LINUX26_DIR)
- @echo LINUX26_FORMAT=$(LINUX26_FORMAT)
- @echo LINUX26_HEADERS_PATCH_DIR=$(LINUX26_HEADERS_PATCH_DIR)
- @echo LINUX26_KERNEL=$(LINUX26_KERNEL)
- @echo LINUX26_KERNEL_NAME=$(LINUX26_KERNEL_NAME)
- @echo LINUX26_LATEST_GIT_PATCH=$(LINUX26_LATEST_GIT_PATCH)
- @echo LINUX26_LATEST_RC_PATCH=$(LINUX26_LATEST_RC_PATCH)
- @echo LINUX26_PATCH_DIR=$(LINUX26_PATCH_DIR)
- @echo LINUX26_SOURCE=$(LINUX26_SOURCE)
- @echo LINUX26_TARGETS=$(LINUX26_TARGETS)
- @echo LINUX26_VERSION=$(LINUX26_VERSION)
- @echo LINUX26_MAKE_FLAGS=$(LINUX26_MAKE_FLAGS)
- @echo BUILD_DIR=$(BUILD_DIR)
- @echo TARGETS=$(TARGETS)
-
-endif
--
1.7.0.4
^ 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