diff options
40 files changed, 1344 insertions, 1366 deletions
diff --git a/.gitignore b/.gitignore index a736c4d4a..18588e86c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /.auto.deps /.config.cmd /.config.old +/..config.tmp /.config *.depend *.o @@ -38,13 +38,14 @@ lm-sensors, lockfile-progs, logrotate, m4, mdadm, mesa3d, metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon, netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd, - openssh, openvpn, oprofile, pango, patch, pcre, php, - pkg-config, prboom, radvd, rdesktop, ruby, qt, quagga, samba, - sawman, sdl_mixer, sdl_sound, setserial, shared-mime-info, - speex, sqlite, squashfs, strace, sylpheed, taglib, tcpdump, - thttpd, tiff, tn5250, udev, udpcast, usbmount, usbutils, - vsftpd, vtun, which, wpa_supplicant, xapp_twm, - xapp_xbacklight, + openssh, openssl, openvpn, oprofile, pango, patch, pcre, php, + pkg-config, pppd, prboom, radvd, rdesktop, ruby, qt, quagga, + samba, sawman, sdl_mixer, sdl_sound, setserial, + shared-mime-info, speex, sqlite, squashfs, + startup-notification, strace, sylpheed, taglib, tcpdump, + thttpd, tiff, tn5250, torsmo, udev, udpcast, usbmount, + usbutils, vsftpd, vtun, which, wpa_supplicant, xapp_twm, + xapp_xbacklight, xapp_xcursorgen, xapp_xinput, xapp_xmore, xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard}, xdriver-xf86-input-{mouse,synaptics,vmmouse,void}, xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev}, @@ -56,16 +57,18 @@ xdriver-xf86-video-{vmware,voodeo,wsfb,xgi,xgixp}, xkeyboard-config, xlib_libX11, xstroke, xterm, xvkbd, zlib - Deprecated packages: hotplug, lzma + Deprecated packages: hotplug, lzma, ng-spice-rework Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia Issues resolved (http://bugs.uclibc.org): + #2389: Generate a Makefile wrapper in $(O) #2521: Can't compile sdl_mixer, mikmod.h can't be found #2563: [PATCH] cairo: Expose the configure option to disable some... #2581: libmms: Update to 0.6, and patch to work on architectures... + #2707: Can't compile linux kernel using buildroot + crosstool-ng 2010.08: Released August 31th, 2010: @@ -249,6 +249,14 @@ ifeq ($(ARCH),xtensa) ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name)) endif +KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \ + -e s/i.86/i386/ -e s/sun4u/sparc64/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/parisc64/parisc/ \ + -e s/powerpc64/powerpc/ \ + -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ + -e s/sh.*/sh/) + ZCAT:=$(call qstrip,$(BR2_ZCAT)) BZCAT:=$(call qstrip,$(BR2_BZCAT)) TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf diff --git a/docs/buildroot.html b/docs/buildroot.html index fc754e581..00808ffc4 100644 --- a/docs/buildroot.html +++ b/docs/buildroot.html @@ -1,12 +1,10 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html> +<html lang="en"> -<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Buildroot - Usage and documentation</title> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <link rel="stylesheet" type="text/css" href="stylesheet.css" /> + <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> + <link rel="stylesheet" href="stylesheet.css"> </head> <body> @@ -15,26 +13,21 @@ <h1>Buildroot</h1> </div> - <p><a href="http://buildroot.net/">Buildroot</a> - usage and documentation by Thomas Petazzoni. Contributions from - Karsten Kruse, Ned Ludd, Martin Herren and others. </p> + <p><a href="http://buildroot.net/">Buildroot</a> usage and documentation + by Thomas Petazzoni. Contributions from Karsten Kruse, Ned Ludd, Martin + Herren and others.</p> <ul> - <li><a href="#about">About Buildroot</a></li> <li><a href="#download">Obtaining Buildroot</a></li> <li><a href="#using">Using Buildroot</a></li> <li><a href="#custom_targetfs">Customizing the generated target filesystem</a></li> - <li><a href="#custom_busybox">Customizing the Busybox - configuration</a></li> - <li><a href="#custom_uclibc">Customizing the uClibc - configuration</a></li> - <li><a href="#custom_linux26">Customizing the Linux kernel - configuration</a></li> + <li><a href="#custom_busybox">Customizing the Busybox configuration</a></li> + <li><a href="#custom_uclibc">Customizing the uClibc configuration</a></li> + <li><a href="#custom_linux26">Customizing the Linux kernel configuration</a></li> <li><a href="#rebuilding_packages">Understanding how to rebuild packages</a></li> <li><a href="#buildroot_innards">How Buildroot works</a></li> - <li><a href="#using_toolchain">Using the uClibc toolchain - outside Buildroot</a></li> + <li><a href="#using_toolchain">Using the uClibc toolchain outside Buildroot</a></li> <li><a href="#external_toolchain">Use an external toolchain</a></li> <li><a href="#downloaded_packages">Location of downloaded packages</a></li> <li><a href="#add_packages">Adding new packages to Buildroot</a></li> @@ -42,126 +35,124 @@ <li><a href="#links">Resources</a></li> </ul> - <h2><a name="about" id="about"></a>About Buildroot</h2> - - <p>Buildroot is a set of Makefiles and patches that allows you to - easily generate a cross-compilation toolchain, a root filesystem - and a Linux kernel image for your target. Buildroot can be used - for one, two or all of these options, independently.</p> - - <p>Buildroot is useful mainly for people working with embedded systems. - Embedded systems often use processors that are not the regular x86 - processors everyone is used to having in his PC. They can be PowerPC - processors, MIPS processors, ARM processors, etc. </p> - - <p>A compilation toolchain is the set of tools that allows you to - compile code for your system. It consists of a compiler (in our - case, <code>gcc</code>), binary utils like assembler and linker - (in our case, <code>binutils</code>) and a C standard library (for - example <a href="http://www.gnu.org/software/libc/libc.html">GNU - Libc</a>, <a href="http://www.uclibc.org/">uClibc</a> or <a - href="http://www.fefe.de/dietlibc/">dietlibc</a>). The system - installed on your development station certainly already has a - compilation toolchain that you can use to compile an application that - runs on your system. If you're using a PC, your compilation - toolchain runs on an x86 processor and generates code for an x86 - processor. Under most Linux systems, the compilation toolchain - uses the GNU libc (glibc) as the C standard library. This compilation - toolchain is called the "host compilation toolchain". - The machine on which it is running, and on which you're - working, is called the "host system". The compilation toolchain - is provided by your distribution, and Buildroot has nothing to do - with it (other than using it to build a cross-compilation toolchain - and other tools that are run on the development host). </p> + <h2 id="about">About Buildroot</h2> + + <p>Buildroot is a set of Makefiles and patches that allows you to easily + generate a cross-compilation toolchain, a root filesystem and a Linux + kernel image for your target. Buildroot can be used for one, two or all + of these options, independently.</p> + + <p>Buildroot is useful mainly for people working with embedded systems. + Embedded systems often use processors that are not the regular x86 + processors everyone is used to having in his PC. They can be PowerPC + processors, MIPS processors, ARM processors, etc.</p> + + <p>A compilation toolchain is the set of tools that allows you to + compile code for your system. It consists of a compiler (in our case, + <code>gcc</code>), binary utils like assembler and linker (in our case, + <code>binutils</code>) and a C standard library (for example + <a href="http://www.gnu.org/software/libc/libc.html">GNU Libc</a>, + <a href="http://www.uclibc.org/">uClibc</a> or + <a href="http://www.fefe.de/dietlibc/">dietlibc</a>). The system installed + on your development station certainly already has a compilation + toolchain that you can use to compile an application that runs on your + system. If you're using a PC, your compilation toolchain runs on an x86 + processor and generates code for an x86 processor. Under most Linux + systems, the compilation toolchain uses the GNU libc (glibc) as the C + standard library. This compilation toolchain is called the "host + compilation toolchain". The machine on which it is running, and on + which you're working, is called the "host system". The + compilation toolchain is provided by your distribution, and Buildroot + has nothing to do with it (other than using it to build a + cross-compilation toolchain and other tools that are run on the + development host).</p> <p>As said above, the compilation toolchain that comes with your system - runs on and generates code for the processor in your host system. As your - embedded system has a different processor, you need a cross-compilation - toolchain — a compilation toolchain that runs on your host system but - generates code for your target system (and target processor). For - example, if your host system uses x86 and your target system uses ARM, the - regular compilation toolchain on your host runs on x86 and generates code - for x86, while the cross-compilation toolchain runs on x86 and generates - code for ARM. </p> - - <p>Even if your embedded system uses an x86 processor, you might be interested - in Buildroot for two reasons:</p> + runs on and generates code for the processor in your host system. As + your embedded system has a different processor, you need a + cross-compilation toolchain — a compilation toolchain that runs on + your host system but generates code for your target system (and target + processor). For example, if your host system uses x86 and your target + system uses ARM, the regular compilation toolchain on your host runs on + x86 and generates code for x86, while the cross-compilation toolchain + runs on x86 and generates code for ARM.</p> + + <p>Even if your embedded system uses an x86 processor, you might be + interested in Buildroot for two reasons:</p> <ul> <li>The compilation toolchain on your host certainly uses the GNU Libc which is a complete but huge C standard library. Instead of using GNU - Libc on your target system, you can use uClibc which is a tiny C standard - library. If you want to use this C library, then you need a compilation - toolchain to generate binaries linked with it. Buildroot can do that for - you. </li> + Libc on your target system, you can use uClibc which is a tiny C + standard library. If you want to use this C library, then you need a + compilation toolchain to generate binaries linked with it. Buildroot + can do that for you.</li> <li>Buildroot automates the building of a root filesystem with all needed - tools like busybox. That makes it much easier than doing it by hand. </li> + tools like busybox. That makes it much easier than doing it by hand.</li> </ul> <p>You might wonder why such a tool is needed when you can compile <code>gcc</code>, <code>binutils</code>, <code>uClibc</code> and all - the other tools by hand. - Of course doing so is possible. But, dealing with all of the configure options - and problems of every <code>gcc</code> or <code>binutils</code> - version is very time-consuming and uninteresting. Buildroot automates this - process through the use of Makefiles and has a collection of patches for - each <code>gcc</code> and <code>binutils</code> version to make them work - on most architectures. </p> + the other tools by hand. Of course doing so is possible but, dealing with + all of the configure options and problems of every <code>gcc</code> or + <code>binutils</code> version is very time-consuming and uninteresting. + Buildroot automates this process through the use of Makefiles and has a + collection of patches for each <code>gcc</code> and <code>binutils</code> + version to make them work on most architectures.</p> <p>Moreover, Buildroot provides an infrastructure for reproducing - the build process of your kernel, cross-toolchain, and embedded root filesystem. Being able to - reproduce the build process will be useful when a component needs - to be patched or updated or when another person is supposed to - take over the project.</p> + the build process of your kernel, cross-toolchain, and embedded root + filesystem. Being able to reproduce the build process will be useful when a + component needs to be patched or updated or when another person is supposed + to take over the project.</p> - <h2><a name="download" id="download"></a>Obtaining Buildroot</h2> + <h2 id="download">Obtaining Buildroot</h2> <p>Buildroot releases are made approximately every 3 months. Direct Git access and daily snapshots are also - available if you want more bleeding edge.</p> + available, if you want more bleeding edge.</p> - <p>Releases are available at <a - href="http://buildroot.net/downloads/">http://buildroot.net/downloads/</a>.</p> + <p>Releases are available at + <a href="http://buildroot.net/downloads/">http://buildroot.net/downloads/</a>.</p> - <p>The latest snapshot is always available at <a - href="http://buildroot.net/downloads/snapshots/buildroot-snapshot.tar.bz2">http://buildroot.net/downloads/snapshots/buildroot-snapshot.tar.bz2</a>, - and previous snapshots are also available at <a - href="http://buildroot.net/downloads/snapshots/">http://buildroot.net/downloads/snapshots/</a>. </p> + <p>The latest snapshot is always available at + <a href="http://buildroot.net/downloads/snapshots/buildroot-snapshot.tar.bz2">http://buildroot.net/downloads/snapshots/buildroot-snapshot.tar.bz2</a>, + and previous snapshots are also available at + <a href="http://buildroot.net/downloads/snapshots/">http://buildroot.net/downloads/snapshots/</a>.</p> - <p>To download Buildroot using Git you can simply follow - the rules described on the "Accessing Git" page (<a href= - "http://buildroot.net/git.html">http://buildroot.net/git.html</a>) - of the Buildroot website (<a href= - "http://buildroot.net">http://buildroot.net</a>). - For the impatient, here's a quick - recipe:</p> + <p>To download Buildroot using Git, you can simply follow + the rules described on the "Accessing Git" page + (<a href= "http://buildroot.net/git.html">http://buildroot.net/git.html</a>) + of the Buildroot website + (<a href="http://buildroot.net">http://buildroot.net</a>). + For the impatient, here's a quick recipe:</p> - <pre> +<pre> $ git clone git://git.buildroot.net/buildroot </pre> - <h2><a name="using" id="using"></a>Using Buildroot</h2> + <h2 id="using">Using Buildroot</h2> <p>Buildroot has a nice configuration tool similar to the one you can find - in the Linux kernel (<a href= - "http://www.kernel.org/">http://www.kernel.org/</a>) or in Busybox + in the Linux kernel + (<a href="http://www.kernel.org/">http://www.kernel.org/</a>) or in Busybox (<a href="http://www.busybox.org/">http://www.busybox.org/</a>). Note that - you can (and should) build everything as a normal user. There is no need to be root to - configure and use Buildroot. The first step is to run the configuration - assistant:</p> + you can (and should) build everything as a normal user. There is no need to + be root to configure and use Buildroot. The first step is to run the + configuration assistant:</p> <pre> $ make menuconfig </pre> -<p>to run the curses-based configurator, or</p> + <p>to run the curses-based configurator, or</p> <pre> $ make xconfig </pre> -or + <p>or</p> <pre> $ make gconfig @@ -170,21 +161,19 @@ or <p>to run the Qt3 or GTK-based configurators.</p> <p>All of these "make" commands will need to build a configuration - utility, so you may need to install "development" packages for - relevant libraries used by the configuration utilities. - On Debian-like systems, the - <code>libncurses5-dev</code> package is required to use the - <i>menuconfig</i> interface, <code>libqt3-mt-dev</code> is - required to use the <i>xconfig</i> interface, and - <code>libglib2.0-dev, libgtk2.0-dev and libglade2-dev</code> are - needed to used the <i>gconfig</i> interface.</p> - - <p>For each menu entry in the configuration tool, you can find associated help - that describes the purpose of the entry. </p> + utility, so you may need to install "development" packages for relevant + libraries used by the configuration utilities. On Debian-like systems, + the <code>libncurses5-dev</code> package is required to use the <i> + menuconfig</i> interface, <code>libqt3-mt-dev</code> is required to use + the <i>xconfig</i> interface, and <code>libglib2.0-dev, libgtk2.0-dev + and libglade2-dev</code> are needed to use the <i>gconfig</i> interface.</p> + + <p>For each menu entry in the configuration tool, you can find associated + help that describes the purpose of the entry.</p> <p>Once everything is configured, the configuration tool generates a <code>.config</code> file that contains the description of your - configuration. It will be used by the Makefiles to do what's needed. </p> + configuration. It will be used by the Makefiles to do what's needed.</p> <p>Let's go:</p> @@ -192,6 +181,7 @@ or <pre> $ make </pre> + <p>This command will generally perform the following steps:</p> <ul> <li>Download source files (as required)</li> @@ -203,76 +193,73 @@ or </ul> <p>Some of the above steps might not be performed if they are not selected in the Buildroot configuration. - </p> + </p> - <p>Buildroot output is stored in a single directory, - <code>output/</code>. This directory contains several - subdirectories:</p> + <p>Buildroot output is stored in a single directory, <code>output/</code>. + This directory contains several subdirectories:</p> <ul> - <li><code>images/</code> where all the images (kernel image, bootloader and root filesystem images) are stored.</li> <li><code>build/</code> where all the components except for the - cross-compilation toolchain are built - (this includes tools needed to run Buildroot on the host and packages compiled - for the target). The <code>build/</code> directory contains one - subdirectory for each of these components.</li> - - <li><code>staging/</code> which contains a hierarchy similar to - a root filesystem hierarchy. This directory contains the - installation of the cross-compilation toolchain and all the - userspace packages selected for the target. However, this - directory is <i>not</i> intended to be the root filesystem for - the target: it contains a lot of development files, unstripped - binaries and libraries that make it far too big for an embedded - system. These development files are used to compile libraries - and applications for the target that depend on other + cross-compilation toolchain are built (this includes tools needed to + run Buildroot on the host and packages compiled for the target). The + <code>build/</code> directory contains one subdirectory for each of + these components.</li> + + <li><code>staging/</code> which contains a hierarchy similar to a root + filesystem hierarchy. This directory contains the installation of the + cross-compilation toolchain and all the userspace packages selected + for the target. However, this directory is <i>not</i> intended to be + the root filesystem for the target: it contains a lot of development + files, unstripped binaries and libraries that make it far too big for + an embedded system. These development files are used to compile + libraries and applications for the target that depend on other libraries.</li> - <li><code>target/</code> which contains <i>almost</i> the root - filesystem for the target: everything needed is present except - the device files in <code>/dev/</code> (Buildroot can't create - them because Buildroot doesn't run as root and does not want to - run as root). Therefore, this directory <b>should not be used on - your target</b>. Instead, you should use one of the images - built in the <code>images/</code> directory. If you need an - extracted image of the root filesystem for booting over NFS, - then use the tarball image generated in <code>images/</code> and - extract it as root.<br/>Compared to <code>staging/</code>, - <code>target/</code> contains only the files and libraries needed - to run the selected target applications: the development files - (headers, etc.) are not present.</li> - - <li><code>host/</code> contains the installation of tools - compiled for the host that are needed for the proper execution - of Buildroot except for the cross-compilation toolchain which is - installed under <code>staging/</code>.</li> - - <li><code>toolchain/</code> contains the build directories for - the various components of the cross-compilation toolchain.</li> + <li><code>target/</code> which contains <i>almost</i> the complete + root filesystem for the target: everything needed is present except + the device files in <code>/dev/</code> (Buildroot can't create them + because Buildroot doesn't run as root and doesn't want to run as + root). Therefore, this directory <b>should not be used on your target</b>. + Instead, you should use one of the images built in the + <code>images/</code> directory. If you need an extracted image of the + root filesystem for booting over NFS, then use the tarball image + generated in <code>images/</code> and extract it as root.<br/>Compared + to <code>staging/</code>, <code>target/</code> contains only the + files and libraries needed to run the selected target applications: + the development files (headers, etc.) are not present, unless the + <code>development files in target filesystem</code> option is selected. + </li> + + <li><code>host/</code> contains the installation of tools compiled for + the host that are needed for the proper execution of Buildroot, except + for the cross-compilation toolchain which is installed under + <code>staging/</code>.</li> + <li><code>toolchain/</code> contains the build directories for the + various components of the cross-compilation toolchain.</li> </ul> - <h3><a name="offline_builds" id="offline_builds"></a> - Offline builds</h3> + <h3 id="offline_builds">Offline builds</h3> <p>If you intend to do an offline build and just want to download all sources that you previously selected in the configurator (<i>menuconfig</i>, <i>xconfig</i> or <i>gconfig</i>), then issue:</p> + <pre> $ make source </pre> + <p>You can now disconnect or copy the content of your <code>dl</code> - directory to the build-host. </p> + directory to the build-host.</p> - <h3><a name="building_out_of_tree" id="building_out_of_tree"></a> - Building out-of-tree</h3> + <h3 id="building_out_of_tree">Building out-of-tree</h3> - <p>Buildroot supports building out of tree with a syntax similar - to the Linux kernel. To use it, add O=<directory> to the - make command line:</p> + <p>Buildroot supports building out of tree with a syntax similar to the + Linux kernel. To use it, add O=<directory> to the make command + line:</p> <pre> $ make O=/tmp/build @@ -284,185 +271,176 @@ or $ cd /tmp/build; make O=$PWD -C path/to/buildroot </pre> - <p>All the output files will be located under - <code>/tmp/build</code>.</p> + <p>All the output files will be located under <code>/tmp/build</code>.</p> - <p>When using out-of-tree builds, the Buildroot - <code>.config</code> and temporary files are also stored in the - output directory. This means that you can safely run multiple - builds in parallel using the same source tree as long as they use - unique output directories.</p> + <p>When using out-of-tree builds, the Buildroot <code>.config</code> and + temporary files are also stored in the output directory. This means that + you can safely run multiple builds in parallel using the same source + tree as long as they use unique output directories.</p> - <p>For ease of use, Buildroot generates a Makefile wrapper in the - output directory - So after the first run, you no longer need to - pass <code>O=..</code> and <code>-C ..</code>, simply run (in the - output directory):</p> + <p>For ease of use, Buildroot generates a Makefile wrapper in the output + directory - So after the first run, you no longer need to pass + <code>O=..</code> and <code>-C ..</code>, simply run (in the output + directory):</p> <pre> $ make <target> </pre> - <h3><a name="environment_variables" id="environment_variables"></a> - Environment variables</h3> + <h3 id="environment_variables">Environment variables</h3> - <p>Buildroot also honors some environment variables when they are passed + <p>Buildroot also honors some environment variables, when they are passed to <code>make</code> or set in the environment:</p> <ul> - <li><code>HOSTCXX</code>, the host C++ compiler to use</li> - <li><code>HOSTCC</code>, the host C compiler to use</li> - <li><code>UCLIBC_CONFIG_FILE=<path/to/.config></code>, path - to the uClibc configuration file to use to compile uClibc if an - internal toolchain is being built</li> - <li><code>BUSYBOX_CONFIG_FILE=<path/to/.config></code>, path - to the Busybox configuration file</li> - <li><code>BUILDROOT_DL_DIR</code> to override the directory in - which Buildroot stores/retrieves downloaded files</li> + <li><code>HOSTCXX</code>, the host C++ compiler to use</li> + <li><code>HOSTCC</code>, the host C compiler to use</li> + <li><code>UCLIBC_CONFIG_FILE=<path/to/.config></code>, path to + the uClibc configuration file, used to compile uClibc, if an + internal toolchain is being built</li> + <li><code>BUSYBOX_CONFIG_FILE=<path/to/.config></code>, path to + the Busybox configuration file</li> + <li><code>BUILDROOT_DL_DIR</code> to override the directory in which + Buildroot stores/retrieves downloaded files</li> </ul> <p>An example that uses config files located in the toplevel directory and in your $HOME:</p> + <pre> -$ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config + $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config </pre> <p>If you want to use a compiler other than the default <code>gcc</code> or <code>g++</code> for building helper-binaries on your host, then do</p> + <pre> -$ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD + $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD </pre> - <h2><a name="custom_targetfs" id="custom_targetfs"></a>Customizing the - generated target filesystem</h2> + <h2 id="custom_targetfs">Customizing the generated target filesystem</h2> <p>There are a few ways to customize the resulting target filesystem:</p> <ul> - <li>Customize the target filesystem directly and rebuild the image. The - target filesystem is available under <code>output/target/</code>. - You can simply make your changes here and run make afterwards — this will - rebuild the target filesystem image. This method allows you to do anything - to the target filesystem, but if you decide to completely rebuild your - toolchain and tools, these changes will be lost. </li> - - <li>Customize the target filesystem skeleton available under - <code>fs/skeleton/</code>. You can customize - configuration files or other stuff here. However, the full file hierarchy - is not yet present because it's created during the compilation process. - Therefore, you can't do everything on this target filesystem skeleton, but - changes to it do remain even if you completely rebuild the cross-compilation - toolchain and the tools. <br /> - You can also customize the <code>target/generic/device_table.txt</code> - file which is used by the tools that generate the target filesystem image - to properly set permissions and create device nodes.<br /> - These customizations are deployed into - <code>output/target/</code> just before the actual image - is made. Simply rebuilding the image by running - make should propagate any new changes to the image. </li> - - <li>Add support for your own target in Buildroot so that you + <li>Customize the target filesystem directly and rebuild the image. + The target filesystem is available under <code>output/target/</code>. + You can simply make your changes here and run make afterwards — + this will rebuild the target filesystem image. This method allows you + to do anything to the target filesystem, but if you decide to + completely rebuild your toolchain and tools, these changes will be + lost.</li> + + <li>Customize the target filesystem skeleton available under <code> + fs/skeleton/</code>. You can customize configuration files or other + stuff here. However, the full file hierarchy is not yet present + because it's created during the compilation process. Therefore, you + can't do everything on this target filesystem skeleton, but changes to + it do remain even if you completely rebuild the cross-compilation + toolchain and the tools. <br /> You can also customize the <code> + target/generic/device_table.txt</code> file, which is used by the + tools that generate the target filesystem image to properly set + permissions and create device nodes.<br /> These customizations are + deployed into <code>output/target/</code> just before the actual image + is made. Simply rebuilding the image by running make should propagate + any new changes to the image.</li> + + <li>Add support for your own target in Buildroot, so that you have your own target skeleton (see <a href="#board_support">this section</a> for details).</li> <li>In the Buildroot configuration, you can specify the path to a - post-build script that gets called <i>after</i> Buildroot builds - all the selected software but <i>before</i> the the rootfs - packages are assembled. The destination root filesystem folder - is given as the first argument to this script, and this script can - then be used to copy programs, static data or any other needed - file to your target filesystem.<br/>You should, however, use - this feature with care. Whenever you find that a certain package - generates wrong or unneeded files, you should fix that - package rather than work around it with a post-build cleanup script.</li> + post-build script, that gets called <i>after</i> Buildroot builds all + the selected software, but <i>before</i> the rootfs packages are + assembled. The destination root filesystem folder is given as the + first argument to this script, and this script can then be used to + copy programs, static data or any other needed file to your target + filesystem.<br/>You should, however, use this feature with care. + Whenever you find that a certain package generates wrong or unneeded + files, you should fix that package rather than work around it with a + post-build cleanup script.</li> <li>A special package, <i>customize</i>, stored in <code>package/customize</code> can be used. You can put all the files that you want to see in the final target root filesystem - in <code>package/customize/source</code> and then enable this + in <code>package/customize/source</code>, and then enable this special package in the configuration system.</li> - </ul> - <h2><a name="custom_busybox" id="custom_busybox"></a>Customizing the - Busybox configuration</h2> + <h2 id="custom_busybox">Customizing the Busybox configuration</h2> - <p><a href="http://www.busybox.net/">Busybox</a> is very configurable, and - you may want to customize it. You can - follow these simple steps to do so. This method isn't optimal, but it's - simple and it works:</p> + <p><a href="http://www.busybox.net/">Busybox</a> is very configurable, + and you may want to customize it. You can follow these simple steps to + do so. This method isn't optimal, but it's simple, and it works:</p> <ol> - <li>Do an initial compilation of Buildroot with busybox without trying to - customize it. </li> + <li>Do an initial compilation of Buildroot, with busybox, without + trying to customize it.</li> <li>Invoke <code>make busybox-menuconfig</code>. The nice configuration tool appears, and you can - customize everything. </li> + customize everything.</li> - <li>Run the compilation of Buildroot again. </li> + <li>Run the compilation of Buildroot again.</li> </ol> <p>Otherwise, you can simply change the - <code>package/busybox/busybox-<version>.config</code> file if you - know the options you want to change without using the configuration tool. + <code>package/busybox/busybox-<version>.config</code> file, if you + know the options you want to change, without using the configuration tool. </p> + <p>If you want to use an existing config file for busybox, then see - section <a href="#environment_variables">environment variables</a>. </p> + section <a href="#environment_variables">environment variables</a>.</p> - <h2><a name="custom_uclibc" id="custom_uclibc"></a>Customizing the uClibc - configuration</h2> + <h2 id="custom_uclibc">Customizing the uClibc configuration</h2> - <p>Just like <a href="#custom_busybox">BusyBox</a>, <a - href="http://www.uclibc.org/">uClibc</a> offers a lot of + <p>Just like <a href="#custom_busybox">BusyBox</a>, + <a href="http://www.uclibc.org/">uClibc</a> offers a lot of configuration options. They allow you to select various - functionalities depending on your needs and limitations. </p> + functionalities depending on your needs and limitations.</p> <p>The easiest way to modify the configuration of uClibc is to follow these steps:</p> <ol> - <li>Do an initial compilation of Buildroot without trying to - customize uClibc. </li> + customize uClibc.</li> <li>Invoke <code>make uclibc-menuconfig</code>. The nice configuration assistant, similar to the one used in the Linux kernel or Buildroot, appears. Make - your configuration changes as appropriate. </li> + your configuration changes as appropriate.</li> <li>Copy the <code>.config</code> file to <code>toolchain/uClibc/uClibc.config</code> or <code>toolchain/uClibc/uClibc.config-locale</code>. The former is used if you haven't selected locale support in Buildroot configuration, and the latter is used if you have selected - locale support. </li> + locale support.</li> <li>Run the compilation of Buildroot again.</li> - </ol> <p>Otherwise, you can simply change <code>toolchain/uClibc/uClibc.config</code> or - <code>toolchain/uClibc/uClibc.config-locale</code> without running - the configuration assistant. </p> + <code>toolchain/uClibc/uClibc.config-locale</code>, without running + the configuration assistant.</p> <p>If you want to use an existing config file for uclibc, then see - section <a href="#environment_variables">environment variables</a>. </p> + section <a href="#environment_variables">environment variables</a>.</p> - <h2><a name="custom_linux26" id="custom_linux26"></a>Customizing - the Linux kernel configuration</h2> + <h2 id="custom_linux26">Customizing the Linux kernel configuration</h2> - <p>The Linux kernel configuration can be customized just like <a - href="#custom_busybox">BusyBox</a> and <a href="#custom_uclibc">uClibc</a> - using <code>make linux26-menuconfig</code>. Make sure you have - enabled the kernel build in <code>make menuconfig</code> first. - Once done, run <code>make</code> to (re)build everything.</p> + <p>The Linux kernel configuration can be customized just like + <a href="#custom_busybox">BusyBox</a> and + <a href="#custom_uclibc">uClibc</a> using <code>make linux26-menuconfig + </code>. Make sure you have enabled the kernel build in <code>make + menuconfig</code> first. Once done, run <code>make</code> to (re)build + everything.</p> <p>If you want to use an existing config file for Linux, then see section <a href="#environment_variables">environment variables</a>.</p> - <h2><a name="#rebuilding_packages" - id="rebuilding_packages">Understanding how to rebuild - packages</a></h2> + <h2 id="rebuilding_packages">Understanding how to rebuild packages</h2> <p>One of the most common questions asked by Buildroot users is how to rebuild a given package or how to @@ -494,7 +472,6 @@ $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD following stamp files are relevant:</p> <ul> - <li><code>output/build/packagename-version/.stamp_configured</code>. If removed, Buildroot will trigger the recompilation of the package from the configuration step (execution of @@ -503,25 +480,23 @@ $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD <li><code>output/build/packagename-version/.stamp_built</code>. If removed, Buildroot will trigger the recompilation of the package from the compilation step (execution of <code>make</code>).</li> - </ul> - <p>For other packages, an analysis of the specific - <i>package.mk</i> file is needed. For example, the zlib Makefile - used to look like this (before it was converted to the generic - package infrastructure):</p> + <p>For other packages, an analysis of the specific <i>package.mk</i> + file is needed. For example, the zlib Makefile used to look like this + (before it was converted to the generic package infrastructure):</p> - <pre> +<pre> $(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched - (cd $(ZLIB_DIR); rm -rf config.cache; \ - [...] - ) - touch $@ + (cd $(ZLIB_DIR); rm -rf config.cache; \ + [...] + ) + touch $@ $(ZLIB_DIR)/libz.a: $(ZLIB_DIR)/.configured - $(MAKE) -C $(ZLIB_DIR) all libz.a - touch -c $@ - </pre> + $(MAKE) -C $(ZLIB_DIR) all libz.a + touch -c $@ +</pre> <p>If you want to trigger the reconfiguration, you need to remove <code>output/build/zlib-version/.configured</code>. If @@ -529,33 +504,32 @@ $(ZLIB_DIR)/libz.a: $(ZLIB_DIR)/.configured <code>output/build/zlib-version/libz.a</code>.</p> <p>Note that most packages, if not all, will progressively be - ported over the generic or the autotools infrastructure, making it + ported over to the generic or autotools infrastructure, making it much easier to rebuild individual packages.</p> - <h2><a name="buildroot_innards" id="buildroot_innards"></a>How Buildroot - works</h2> + <h2 id="buildroot_innards">How Buildroot works</h2> - <p>As mentioned above, Buildroot is basically a set of Makefiles that downloads, - configures and compiles software with the correct options. It also includes - patches for various software packages — mainly the ones involved in the - cross-compilation tool chain (<code>gcc</code>, <code>binutils</code> and - <code>uClibc</code>). </p> + <p>As mentioned above, Buildroot is basically a set of Makefiles that + download, configure, and compile software with the correct options. It + also includes patches for various software packages — mainly the + ones involved in the cross-compilation tool chain (<code>gcc</code>, + <code>binutils</code> and <code>uClibc</code>).</p> - <p>There is basically one Makefile per software package, and they are named with - the <code>.mk</code> extension. Makefiles are split into three main - sections:</p> + <p>There is basically one Makefile per software package, and they are + named with the <code>.mk</code> extension. Makefiles are split into + three main sections:</p> <ul> <li><b>toolchain</b> (in the <code>toolchain/</code> directory) contains the Makefiles and associated files for all software related to the cross-compilation toolchain: <code>binutils</code>, <code>ccache</code>, <code>gcc</code>, <code>gdb</code>, <code>kernel-headers</code> and - <code>uClibc</code>. </li> + <code>uClibc</code>.</li> <li><b>package</b> (in the <code>package/</code> directory) contains the Makefiles and associated files for all user-space tools that Buildroot can compile and add to the target root filesystem. There is one - sub-directory per tool. </li> + sub-directory per tool.</li> <li><b>target</b> (in the <code>target</code> directory) contains the Makefiles and associated files for software related to the generation of @@ -563,26 +537,24 @@ $(ZLIB_DIR)/libz.a: $(ZLIB_DIR)/.configured ext2, jffs2, cramfs and squashfs. For each of them there is a sub-directory with the required files. There is also a <code>default/</code> directory that contains the target filesystem - skeleton. </li> + skeleton.</li> </ul> <p>Each directory contains at least 2 files:</p> <ul> <li><code>something.mk</code> is the Makefile that downloads, configures, - compiles and installs the package <code>something</code>. </li> + compiles and installs the package <code>something</code>.</li> <li><code>Config.in</code> is a part of the configuration tool - description file. It describes the options related to the - package. </li> - + description file. It describes the options related to the + package.</li> </ul> <p>The main Makefile performs the following steps (once the configuration is done):</p> <ol> - <li>Create all the output directories: <code>staging</code>, <code>target</code>, <code>build</code>, <code>stamps</code>, etc. in the output directory (<code>output/</code> by default, @@ -601,11 +573,9 @@ $(ZLIB_DIR)/libz.a: $(ZLIB_DIR)/.configured trigger the compilation of the userspace packages (libraries, programs), the kernel, the bootloader and the generation of the root filesystem images, depending on the configuration.</li> - </ol> - <h2><a name="board_support" id="board_support"></a> - Creating your own board support</h2> + <h2 id="board_support"> Creating your own board support</h2> <p>Creating your own board support in Buildroot allows you to have a convenient place to store your project's target filesystem skeleton @@ -614,7 +584,6 @@ $(ZLIB_DIR)/libz.a: $(ZLIB_DIR)/.configured <p>Follow these steps to integrate your board in Buildroot:</p> <ol> - <li>Create a new directory in <code>target/device/</code> named after your company or organization</li> @@ -630,19 +599,19 @@ $(ZLIB_DIR)/libz.a: $(ZLIB_DIR)/.configured <li>Create a <code>target/device/yourcompany/Config.in</code> file that looks like the following: - <pre> +<pre> menuconfig BR2_TARGET_COMPANY - bool "Company projects" + bool "Company projects" if BR2_TARGET_COMPANY config BR2_TARGET_COMPANY_PROJECT_FOOBAR - bool "Support for Company project Foobar" - help - This option enables support for Company project Foobar + bool "Support for Company project Foobar" + help + This option enables support for Company project Foobar endif - </pre> +</pre> Of course, you should customize the different values to match your company/organization and your project. This file will create a @@ -652,11 +621,12 @@ endif <li>Create a <code>target/device/yourcompany/Makefile.in</code> file that looks like the following: - <pre> +<pre> ifeq ($(BR2_TARGET_COMPANY_PROJECT_FOOBAR),y) include target/device/yourcompany/project-foobar/Makefile.in endif - </pre> +</pre> + </li> <li>Create the @@ -665,19 +635,15 @@ endif <code>BOARD_PATH</code> variable set to <code>target/device/yourcompany/project-foobar</code> as it will simplify further definitions. Then, the file might define - one or several of the following variables: - - <ul> - - <li><code>TARGET_SKELETON</code> to a directory that contains - the target skeleton for your project. If this variable is - defined, this target skeleton will be used instead of the - default one. If defined, the convention is to define it to - <code>$(BOARD_PATH)/target_skeleton</code> so that the target - skeleton is stored in the board specific directory.</li> - - </ul> - + one or more of the following variables: + <ul> + <li><code>TARGET_SKELETON</code> to a directory that contains + the target skeleton for your project. If this variable is + defined, this target skeleton will be used instead of the + default one. If defined, the convention is to define it to + <code>$(BOARD_PATH)/target_skeleton</code> so that the target + skeleton is stored in the board specific directory.</li> + </ul> </li> <li>In the @@ -691,144 +657,130 @@ endif <code>configs/</code> directory. Your users will then be able to run <code>make something_defconfig</code> and get the right configuration for your project</li> - </ol> - <h2><a name="using_toolchain" id="using_toolchain"></a>Using the - generated toolchain outside Buildroot</h2> + <h2 id="using_toolchain">Using the generated toolchain outside Buildroot</h2> - <p>You may want to compile for your target your own programs or other software - that are not packaged in Buildroot. In order to do this you can - use the toolchain that was generated by Buildroot. </p> + <p>You may want to compile, for your target, your own programs or other + software that are not packaged in Buildroot. In order to do this you can + use the toolchain that was generated by Buildroot.</p> <p>The toolchain generated by Buildroot is located by default in - <code>output/staging/</code>. The simplest way to use it - is to add <code>output/staging/usr/bin/</code> to your PATH - environment variable and then to use - <code>ARCH-linux-gcc</code>, <code>ARCH-linux-objdump</code>, - <code>ARCH-linux-ld</code>, etc. </p> + <code>output/staging/</code>. The simplest way to use it is to add + <code>output/staging/usr/bin/</code> to your PATH environment variable and + then to use <code>ARCH-linux-gcc</code>, <code>ARCH-linux-objdump</code>, + <code>ARCH-linux-ld</code>, etc.</p> <p><b>Important</b>: do not try to move a gcc-3.x toolchain to another - directory — it won't work because there are some hardcoded paths in the - gcc-3.x configuration. If you are using a current gcc-4.x, it - is possible to relocate the toolchain — but then - <code>--sysroot</code> must be passed every time the compiler is - called to tell where the libraries and header files are.</p> + directory — it won't work because there are some hardcoded paths + in the gcc-3.x configuration. If you are using a current gcc-4.x, it is + possible to relocate the toolchain — but then <code>--sysroot</code> + must be passed every time the compiler is called to tell where the + libraries and header files are.</p> - <p>It is also possible to generate the Buildroot toolchain in - a directory other than <code>output/staging</code> by using the - <code>Build options -> Toolchain and header file - location</code> options. This could be useful if the toolchain - must be shared with other users.</p> + <p>It is also possible to generate the Buildroot toolchain in a + directory other than <code>output/staging</code> by using the <code> + Build options -> Toolchain and header file location</code> options. + This could be useful if the toolchain must be shared with other users.</p> - <h2><a name="downloaded_packages" - id="downloaded_packages"></a>Location of downloaded packages</h2> + <h2 id="downloaded_packages">Location of downloaded packages</h2> <p>It might be useful to know that the various tarballs that are - downloaded by the Makefiles are all stored in the - <code>DL_DIR</code> which by default is the <code>dl</code> - directory. It's useful, for example, if you want to keep a complete - version of Buildroot which is know to be working with the - associated tarballs. This will allow you to regenerate the - toolchain and the target filesystem with exactly the same - versions. </p> - - <p>If you maintain several Buildroot trees, it might be better to have - a shared download location. This can be accessed by creating a symbolic link - from the <code>dl</code> directory to the shared download location: </p> + downloaded by the Makefiles are all stored in the <code>DL_DIR</code> + which by default is the <code>dl</code> directory. It's useful, for + example, if you want to keep a complete version of Buildroot which is + known to be working with the associated tarballs. This will allow you to + regenerate the toolchain and the target filesystem with exactly the same + versions.</p> + + <p>If you maintain several Buildroot trees, it might be better to have a + shared download location. This can be accessed by creating a symbolic + link from the <code>dl</code> directory to the shared download location:</p> <pre> -ln -s <shared download location> dl + $ ln -s <shared download location> dl </pre> <p>Another way of accessing a shared download location is to create the <code>BUILDROOT_DL_DIR</code> environment variable. If this is set, then the value of DL_DIR in the project is overridden. The following line should be added to - <code>"~/.bashrc"</code>. <p> + <code>"~/.bashrc"</code>.</p> <pre> -export BUILDROOT_DL_DIR <shared download location> + $ export BUILDROOT_DL_DIR <shared download location> </pre> - <h2><a name="external_toolchain" id="external_toolchain"></a>Using - an external toolchain</h2> - -<p>It might be useful not to use the toolchain generated by -Buildroot, for example if you already have a toolchain that is known -to work for your specific CPU, or if the toolchain generation feature -of Buildroot is not sufficiently flexible for you (for example if you -need to generate a system with <i>glibc</i> instead of -<i>uClibc</i>). Buildroot supports using an <i>external -toolchain</i>.</p> - -<p>To enable the use of an external toolchain, go in the -<code>Toolchain</code> menu, and :</p> - -<ul> - <li>Select the <code>External binary toolchain</code> toolchain - type</li> - <li>Adjust the <code>External toolchain path</code> - appropriately. It should be set to a path where a bin/ directory - contains your cross-compiling tools</li> - <li>Adjust the <code>External toolchain prefix</code> so that the - prefix, suffixed with <code>-gcc</code> or <code>-ld</code> will - correspond to your cross-compiling tools</li> -</ul> - -<p>If you are using an external toolchain based on <i>uClibc</i>, the -<code>Core C library from the external toolchain</code> and -<code>Libraries to copy from the external toolchain</code> options -should already have correct values. However, if your external -toolchain is based on <i>glibc</i>, you'll have to change these values -according to your cross-compiling toolchain.</p> - -<p>To generate external toolchains, we recommend using <a -href="http://ymorin.is-a-geek.org/dokuwiki/projects/crosstool">Crosstool-NG</a>. -It allows generating toolchains based on <i>uClibc</i>, <i>glibc</i> -and <i>eglibc</i> for a wide range of architectures and has good -community support.</p> - - <h2><a name="add_packages" id="add_packages"></a>Adding new - packages to Buildroot</h2> + <h2 id="external_toolchain">Using an external toolchain</h2> + + <p>It might be useful not to use the toolchain generated by + Buildroot, for example if you already have a toolchain that is known + to work for your specific CPU, or if the toolchain generation feature + of Buildroot is not sufficiently flexible for you (for example if you + need to generate a system with <i>glibc</i> instead of + <i>uClibc</i>). Buildroot supports using an <i>external + toolchain</i>.</p> + + <p>To enable the use of an external toolchain, go to the + <code>Toolchain</code> menu, and :</p> + + <ul> + <li>Select the <code>External binary toolchain</code> toolchain + type</li> + <li>Adjust the <code>External toolchain path</code> + appropriately. It should be set to a path where a bin/ directory + contains your cross-compiling tools</li> + <li>Adjust the <code>External toolchain prefix</code> so that the + prefix, suffixed with <code>-gcc</code> or <code>-ld</code> will + correspond to your cross-compiling tools</li> + </ul> + + <p>If you are using an external toolchain based on <i>uClibc</i>, the + <code>Core C library from the external toolchain</code> and + <code>Libraries to copy from the external toolchain</code> options + should already have correct values. However, if your external + toolchain is based on <i>glibc</i>, you'll have to change these values + according to your cross-compiling toolchain.</p> + + <p>To generate external toolchains, we recommend using + <a href="http://ymorin.is-a-geek.org/dokuwiki/projects/crosstool">Crosstool-NG</a>. + It allows generating toolchains based on <i>uClibc</i>, <i>glibc</i> + and <i>eglibc</i> for a wide range of architectures and has good + community support.</p> + + <h2 id="add_packages">Adding new packages to Buildroot</h2> <p>This section covers how new packages (userspace libraries or - applications) can be integrated into Buildroot. It also allows to - understand how existing packages are integrated, which is needed - to fix issues or tune their configuration.</p> + applications) can be integrated into Buildroot. It also shows how existing + packages are integrated, which is needed for fixing issues or tuning their + configuration.</p> <ul> <li><a href="#package-directory">Package directory</a></li> <li><a href="#config-in-file"><code>Config.in</code> file</a></li> <li><a href="#mk-file">The <code>.mk</code> file</a> - <ul> - <li><a href="#generic-tutorial">Makefile for generic - packages : tutorial</a></li> - <li><a href="#generic-reference">Makefile for - generic packages : reference</a></li> - <li><a href="#autotools-tutorial">Makefile for autotools-based - packages : tutorial</a></li> - <li><a href="#autotools-reference">Makefile for autotools-based - packages : reference</a></li> - <li><a href="#manual-tutorial">Manual Makefile : tutorial</a></li> - </ul> + <ul> + <li><a href="#generic-tutorial">Makefile for generic packages : tutorial</a></li> + <li><a href="#generic-reference">Makefile for generic packages : reference</a></li> + <li><a href="#autotools-tutorial">Makefile for autotools-based packages : tutorial</a></li> + <li><a href="#autotools-reference">Makefile for autotools-based packages : reference</a></li> + <li><a href="#manual-tutorial">Manual Makefile : tutorial</a></li> + </ul> </li> - <li><a href="#gettext-integration">Gettext integration and - interaction with packages</a></li> + <li><a href="#gettext-integration">Gettext integration and interaction with packages</a></li> </ul> - <h3><a name="package-directory"></a>Package directory</h3> + <h3 id="package-directory">Package directory</h3> <p>First of all, create a directory under the <code>package</code> - directory for your software, for example <code>foo</code>. </p> + directory for your software, for example <code>libfoo</code>.</p> <p>Some packages have been grouped by topic in a sub-directory: - <code>multimedia</code>, <code>java</code>, - <code>databases</code>, <code>editors</code>, <code>x11r7</code>, + <code>multimedia</code>, <code>java</code>, <code>x11r7</code>, and <code>games</code>. If your package fits in one of these categories, then create your package directory in these.</p> - <h3><a name="config-in-file"></a><code>Config.in</code> file</h3> + <h3 id="config-in-file"><code>Config.in</code> file</h3> <p>Then, create a file named <code>Config.in</code>. This file will contain the option descriptions related to our @@ -837,8 +789,8 @@ community support.</p> <pre> config BR2_PACKAGE_LIBFOO - bool "libfoo" - help + bool "libfoo" + help This is a comment that explains what libfoo is. http://foosoftware.org/libfoo/ @@ -848,8 +800,9 @@ config BR2_PACKAGE_LIBFOO things in your software. You can look at examples in other packages. The syntax of the Config.in file is the same as the one for the kernel Kconfig file. The documentation for this syntax is - available at <a - href="http://lxr.free-electrons.com/source/Documentation/kbuild/kconfig-language.txt">http://lxr.free-electrons.com/source/Documentation/kbuild/kconfig-language.txt</a></p> + available at + <a href="http://lxr.free-electrons.com/source/Documentation/kbuild/kconfig-language.txt">http://lxr.free-electrons.com/source/Documentation/kbuild/kconfig-language.txt</a> + </p> <p>Finally you have to add your new <code>libfoo/Config.in</code> to <code>package/Config.in</code> (or in a category subdirectory if @@ -857,767 +810,711 @@ config BR2_PACKAGE_LIBFOO categories). The files included there are <em>sorted alphabetically</em> per category and are <em>NOT</em> supposed to contain anything but the <em>bare</em> name of the package.</p> + <pre> source "package/libfoo/Config.in" </pre> - <h3><a name="mk-file"></a>The <code>.mk</code> file</h3> - - <p>Finally, here's the hardest part. Create a file named - <code>foo.mk</code>. It describes how the package should be - downloaded, configured, built, installed, etc.</p> - - <p>Depending on the package type, the <code>.mk</code> file must be - written in a different way, using different infrastructures:</p> - - <ul> - - <li>Makefiles for generic packages (not using autotools), based - on an infrastructure similar to the one used for autotools-based - packages, but which requires a little more work from the - developer : specify what should be done at for the configuration, - compilation, installation and cleanup of the package. This - infrastructure must be used for all packages that do not use the - autotools as their build system. In the future, other specialized - infrastructures might be written for other build systems.<br/>We - cover them through a <a - href="#generic-tutorial">tutorial</a> and a <a - href="#generic-reference">reference</a>.</li> - - <li>Makefiles for autotools-based (autoconf, automake, etc.) - software. We provide a dedicated infrastructure for such - packages, since autotools is a very common build system. This - infrastructure <i>must</i> be used for new packages that rely on - the autotools as their build system.<br/>We cover them through a - <a href="#autotools-tutorial">tutorial</a> and a <a - href="#autotools-reference">reference</a>.</li> - - <li>Manual Makefiles. These are currently obsolete and no new - manual Makefiles should be added. However, since there are still - many of them in the tree and because the , we keep them documented in a <a - href="#manual-tutorial">tutorial</a>.</li> - - </ul> - - <h4><a name="generic-tutorial"></a>Makefile for generic packages : - tutorial</h4> - - <pre><tt><span style="color: #000000">01:</span> <span style="font-style: italic"><span style="color: #9A1900">#############################################################</span></span> -<span style="color: #000000">02:</span> <span style="font-style: italic"><span style="color: #9A1900">#</span></span> -<span style="color: #000000">03:</span> <span style="font-style: italic"><span style="color: #9A1900"># libfoo</span></span> -<span style="color: #000000">04:</span> <span style="font-style: italic"><span style="color: #9A1900">#</span></span> -<span style="color: #000000">05:</span> <span style="font-style: italic"><span style="color: #9A1900">#############################################################</span></span> -<span style="color: #000000">06:</span> <span style="color: #990000">LIBFOO_VERSION:=</span>1.0 -<span style="color: #000000">07:</span> <span style="color: #990000">LIBFOO_SOURCE:=</span>libfoo-<span style="color: #009900">$(LIBFOO_VERSION)</span>.tar.gz -<span style="color: #000000">08:</span> <span style="color: #990000">LIBFOO_SITE:=</span>http<span style="color: #990000">:</span>//www.foosoftware.org/download -<span style="color: #000000">09:</span> <span style="color: #009900">LIBFOO_INSTALL_STAGING=</span>YES -<span style="color: #000000">10:</span> <span style="color: #009900">LIBFOO_DEPENDENCIES =</span> host-libaaa libbbb -<span style="color: #000000">11:</span> + <h3 id="mk-file">The <code>.mk</code> file</h3> + + <p>Finally, here's the hardest part. Create a file named + <code>libfoo.mk</code>. It describes how the package should be + downloaded, configured, built, installed, etc.</p> + + <p>Depending on the package type, the <code>.mk</code> file must be + written in a different way, using different infrastructures:</p> + + <ul> + <li><b>Makefiles for generic packages</b> (not using autotools): These + are based on an infrastructure similar to the one used for + autotools-based packages, but requires a little more work from the + developer. They specify what should be done for the configuration, + compilation, installation and cleanup of the package. This + infrastructure must be used for all packages that do not use the + autotools as their build system. In the future, other specialized + infrastructures might be written for other build systems.<br/>We cover + them through a <a href="#generic-tutorial">tutorial</a> and a + <a href="#generic-reference">reference</a>.</li> + + <li><b>Makefiles for autotools-based software</b> (autoconf, automake, + etc.): We provide a dedicated infrastructure for such packages, since + autotools is a very common build system. This infrastructure <i>must + </i> be used for new packages that rely on the autotools as their + build system.<br/>We cover them through a + <a href="#autotools-tutorial">tutorial</a> and a + <a href="#autotools-reference">reference</a>.</li> + + <li><b>Manual Makefiles:</b> These are currently obsolete, and no new + manual Makefiles should be added. However, since there are still many + of them in the tree, we keep them documented in a + <a href="#manual-tutorial">tutorial</a>.</li> + </ul> + + <h4 id="generic-tutorial">Makefile for generic packages : tutorial</h4> + +<pre> +<span style="color: #000000">01:</span><span style="font-style: italic; color: #9A1900"> #############################################################</span> +<span style="color: #000000">02:</span><span style="font-style: italic; color: #9A1900"> #</span> +<span style="color: #000000">03:</span><span style="font-style: italic; color: #9A1900"> # libfoo</span> +<span style="color: #000000">04:</span><span style="font-style: italic; color: #9A1900"> #</span> +<span style="color: #000000">05:</span><span style="font-style: italic; color: #9A1900"> #############################################################</span> +<span style="color: #000000">06:</span><span style="color: #009900"> LIBFOO_VERSION</span> = 1.0 +<span style="color: #000000">07:</span><span style="color: #009900"> LIBFOO_SOURCE</span> = libfoo-<span style="color: #009900">$(LIBFOO_VERSION)</span>.tar.gz +<span style="color: #000000">08:</span><span style="color: #009900"> LIBFOO_SITE</span> = http://www.foosoftware.org/download +<span style="color: #000000">09:</span><span style="color: #009900"> LIBFOO_INSTALL_STAGING</span> = YES +<span style="color: #000000">10:</span><span style="color: #009900"> LIBFOO_DEPENDENCIES</span> = host-libaaa libbbb +<span style="color: #000000">11:</span> <span style="color: #000000">12:</span> define LIBFOO_BUILD_CMDS -<span style="color: #000000">13:</span> <span style="color: #009900">$(MAKE)</span> <span style="color: #009900">CC</span><span style="color: #990000">=</span><span style="color: #009900">$(TARGET_CC)</span> <span style="color: #009900">LD</span><span style="color: #990000">=</span><span style="color: #009900">$(TARGET_LD)</span> -C <span style="color: #009900">$(@D)</span> all +<span style="color: #000000">13:</span> <span style="color: #009900">$(MAKE)</span> CC=<span style="color: #009900">$(TARGET_CC)</span> LD=<span style="color: #009900">$(TARGET_LD)</span> -C <span style="color: #009900">$(@D)</span> all <span style="color: #000000">14:</span> endef -<span style="color: #000000">15:</span> +<span style="color: #000000">15:</span> <span style="color: #000000">16:</span> define LIBFOO_INSTALL_STAGING_CMDS -<span style="color: #000000">17:</span> <span style="color: #009900">$(INSTALL)</span> -D <span style="color: #009900">$(@D)</span>/libfoo.a <span style="color: #009900">$(STAGING_DIR)</span>/usr/lib/libfoo.a -<span style="color: #000000">18:</span> <span style="color: #009900">$(INSTALL)</span> -D <span style="color: #009900">$(@D)</span>/foo.h <span style="color: #009900">$(STAGING_DIR)</span>/usr/include/foo.h -<span style="color: #000000">19:</span> cp -dpf <span style="color: #009900">$(@D)</span>/libfoo.so<span style="color: #990000">*</span> <span style="color: #009900">$(STAGING_DIR)</span>/usr/lib +<span style="color: #000000">17:</span> <span style="color: #009900">$(INSTALL)</span> -D -m 0755 <span style="color: #009900">$(@D)</span>/libfoo.a <span style="color: #009900">$(STAGING_DIR)</span>/usr/lib/libfoo.a +<span style="color: #000000">18:</span> <span style="color: #009900">$(INSTALL)</span> -D -m 0644 <span style="color: #009900">$(@D)</span>/foo.h <span style="color: #009900">$(STAGING_DIR)</span>/usr/include/foo.h +<span style="color: #000000">19:</span> <span style="color: #009900">$(INSTALL)</span> -D -m 0755 <span style="color: #009900">$(@D)</span>/libfoo.so* <span style="color: #009900">$(STAGING_DIR)</span>/usr/lib <span style="color: #000000">20:</span> endef -<span style="color: #000000">21:</span> +<span style="color: #000000">21:</span> <span style="color: #000000">22:</span> define LIBFOO_INSTALL_TARGET_CMDS -<span style="color: #000000">23:</span> cp -dpf <span style="color: #009900">$(@D)</span>/libfoo.so<span style="color: #990000">*</span> <span style="color: #009900">$(TARGET_DIR)</span>/usr/lib -<span style="color: #000000">24:</span> -<span style="color: #009900">$(STRIPCMP)</span> <span style="color: #009900">$(STRIP_STRIP_UNNEEDED)</span> <span style="color: #009900">$(TARGET_DIR)</span>/isr/lib/libfoo.so<span style="color: #990000">*</span> +<span style="color: #000000">23:</span> <span style="color: #009900">$(INSTALL)</span> -D -m 0755 <span style="color: #009900">$(@D)</span>/libfoo.so* <span style="color: #009900">$(TARGET_DIR)</span>/usr/lib +<span style="color: #000000">24:</span> <span style="color: #009900">$(INSTALL)</span> -d -m 0755 <span style="color: #009900">$(TARGET_DIR)</span>/etc/foo.d <span style="color: #000000">25:</span> endef -<span style="color: #000000">26:</span> -<span style="color: #000000">27:</span> <span style="color: #009900">$(</span><span style="font-weight: bold"><span style="color: #0000FF">eval</span></span> <span style="color: #009900">$(</span>call GENTARGETS<span style="color: #990000">,</span>package<span style="color: #990000">,</span>libfoo<span style="color: #990000">))</span></tt></pre> - - <p>The Makefile begins on line 6 to 8 by metadata informations: the - version of the package (<code>LIBFOO_VERSION</code>), the name of - the tarball containing the package (<code>LIBFOO_SOURCE</code>) and - the Internet location at which the tarball can be downloaded - (<code>LIBFOO_SITE</code>). All variables must start with the same - prefix, <code>LIBFOO_</code> in this case. This prefix is always - the uppercased version of the package name (see below to understand - where the package name is defined).</p> - - <p>On line 9, we specify that this package wants to install - something to the staging space. This is often needed for libraries - since they must install header files and other development files in - the staging space. This will ensure that the commands listed in the - <code>LIBFOO_INSTALL_STAGING_CMDS</code> variable will be - executed.</p> - - <p>On line 10, we specify the list of dependencies this package - relies on. These dependencies are listed in terms of lower-case - package names, which can be packages for the target (without the - <code>host-</code> prefix) or packages for the host (with the - <code>host-</code>) prefix). Buildroot will ensure that all these - packages are built and installed <i>before</i> the current package - starts its configuration.</p> - - <p>The rest of the Makefile defines what should be done at the - different steps of the package configuration, compilation and - installation. <code>LIBFOO_BUILD_CMDS</code> tells what steps - should be performed to build the - package. <code>LIBFOO_INSTALL_STAGING_CMDS</code> tells what steps - should be performed to install the package in the staging - space. <code>LIBFOO_INSTALL_TARGET_CMDS</code> tells what steps - should be performed to install the package in the target space.</p> - - <p>All these steps rely on the <code>$(@D)</code> variable, which - contains the directory where the source code of the package has - been extracted.</p> - - <p>Finally, on line 27, we call the <code>GENTARGETS</code> which - generates, according to the variables defined previously, all the - Makefile code necessary to make your package working.</p> - - <h4><a name="generic-reference"></a>Makefile for generic packages : - reference</h4> - - <p>The <code>GENTARGETS</code> macro takes three arguments:</p> - - <ul> - - <li>The first argument is the package directory prefix. If your - package is in <code>package/libfoo</code>, then the directory - prefix is <code>package</code>. If your package is in - <code>package/editors/foo</code>, then the directory prefix must - be <code>package/editors</code>.</li> - - <li>The second argument is the lower-cased package name. It must - match the prefix of the variables in the <code>.mk</code> file - and must match the configuration option name in the - <code>Config.in</code> file. For example, if the package name is - <code>libfoo</code>, so the variables in the <code>.mk</code> - must start with <code>LIBFOO_</code> and the configuration option - in the <code>Config.in</code> file must be - <code>BR2_PACKAGE_LIBFOO</code>.</li> - - <li>The third argument is optional. It can be used to tell if the - package if a target package (cross-compiled for the target) or a - host package (natively compiled for the host). If unspecified, it - is assumed that it is a target package. See below for - details.</li> - - </ul> - - <p>For a given package, in a single <code>.mk</code> file, it is - possible to call GENTARGETS twice, once to create the rules to - generate a target package and once to create the rules to generate - a host package:</p> +<span style="color: #000000">26:</span> +<span style="color: #000000">27:</span><span style="color: #009900"> $(eval $(call GENTARGETS,package,libfoo))</span> +</pre> + + <p>The Makefile begins on line 6 to 8 with metadata information: the + version of the package (<code>LIBFOO_VERSION</code>), the name of the + tarball containing the package (<code>LIBFOO_SOURCE</code>) and the + Internet location at which the tarball can be downloaded + (<code>LIBFOO_SITE</code>). All variables must start with the same prefix, + <code>LIBFOO_</code> in this case. This prefix is always the uppercased + version of the package name (see below to understand where the package + name is defined).</p> + + <p>On line 9, we specify that this package wants to install something to + the staging space. This is often needed for libraries, since they must + install header files and other development files in the staging space. + This will ensure that the commands listed in the + <code>LIBFOO_INSTALL_STAGING_CMDS</code> variable will be executed.</p> + + <p>On line 10, we specify the list of dependencies this package relies + on. These dependencies are listed in terms of lower-case package names, + which can be packages for the target (without the <code>host-</code> + prefix) or packages for the host (with the <code>host-</code>) prefix). + Buildroot will ensure that all these packages are built and installed + <i>before</i> the current package starts its configuration.</p> + + <p>The rest of the Makefile defines what should be done at the different + steps of the package configuration, compilation and installation. + <code>LIBFOO_BUILD_CMDS</code> tells what steps should be performed to + build the package. <code>LIBFOO_INSTALL_STAGING_CMDS</code> tells what + steps should be performed to install the package in the staging space. + <code>LIBFOO_INSTALL_TARGET_CMDS</code> tells what steps should be + performed to install the package in the target space.</p> + + <p>All these steps rely on the <code>$(@D)</code> variable, which + contains the directory where the source code of the package has been + extracted.</p> + + <p>Finally, on line 27, we call the <code>GENTARGETS</code> which + generates, according to the variables defined previously, all the + Makefile code necessary to make your package working.</p> + + <h4 id="generic-reference">Makefile for generic packages : reference</h4> + + <p>The <code>GENTARGETS</code> macro takes three arguments:</p> + + <ul> + <li>The first argument is the package directory prefix. If your + package is in <code>package/libfoo</code>, then the directory prefix + is <code>package</code>. If your package is in + <code>package/editors/foo</code>, then the directory prefix must be + <code>package/editors</code>.</li> + + <li>The second argument is the lower-cased package name. It must match + the prefix of the variables in the <code>.mk</code> file and must + match the configuration option name in the <code>Config.in</code> + file. For example, if the package name is <code>libfoo</code>, then the + variables in the <code>.mk</code> file must start with + <code>LIBFOO_</code> and the configuration option in the + <code>Config.in</code> file must be <code>BR2_PACKAGE_LIBFOO</code>.</li> + + <li>The third argument is optional. It can be used to tell if the + package is a target package (cross-compiled for the target) or a host + package (natively compiled for the host). If unspecified, it is + assumed that it is a target package. See below for details.</li> + </ul> + + <p>For a given package, in a single <code>.mk</code> file, it is + possible to call GENTARGETS twice, once to create the rules to generate + a target package and once to create the rules to generate a host package: + </p> <pre> $(eval $(call GENTARGETS,package,libfoo)) $(eval $(call GENTARGETS,package,libfoo,host)) </pre> - <p>This might be useful if the compilation of the target package - requires some tools to be installed on the host. If the package - name is <code>libfoo</code>, then the name of the package for the - target is also <code>libfoo</code>, while the name of the package - for the host is <code>host-libfoo</code>. These names should be - used in the DEPENDENCIES variables of other packages if they depend - on <code>libfoo</code> or <code>host-libfoo</code>.</p> - - <p>The call to the <code>GENTARGETS</code> macro <b>must</b> be at - the end of the <code>.mk</code> file, after all variable - definitions.</p> - - <p>For the target package, the <code>GENTARGETS</code> uses the - variables defined by the .mk file and prefixed by the uppercased - package name: <code>LIBFOO_*</code>. For the host package, it uses - the <code>HOST_LIBFOO_*</code>. For <i>some</i> variables, if the - <code>HOST_LIBFOO_</code> prefixed variable doesn't exist, the - package infrastructure uses the corresponding variable prefixed by - <code>LIBFOO_</code>. This is done for variables that are likely to - have the same value for both the target and host packages. See - below for details.</p> - - <p>The list of variables that can be set in a <code>.mk</code> file - to give metadata informations is (assuming the package name is - <code>libfoo</code>) :</p> - - <ul> - - <li><code>LIBFOO_VERSION</code>, mandatory, must contain the - version of the package. Note that if - <code>HOST_LIBFOO_VERSION</code> doesn't exist, it is assumed to - be the same as <code>LIBFOO_VERSION</code>.<br/>Example: - <code>LIBFOO_VERSION=0.1.2</code></li> - - <li><code>LIBFOO_SOURCE</code> may contain the name of the - tarball of the package. If <code>HOST_LIBFOO_SOURCE</code> is not - specified, it defaults to <code>LIBFOO_VERSION</code>. If none - are specified, then the value is assumed to be - <code>packagename-$(LIBFOO_VERSION).tar.gz</code>.<br/>Example: - <code>LIBFOO_SOURCE = - foobar-$(LIBFOO_VERSION).tar.bz2</code></li> - - <li><code>LIBFOO_PATCH</code> may contain the name of a patch, - that will be downloaded from the same location as the tarball - indicated in <code>LIBFOO_SOURCE</code>. If - <code>HOST_LIBFOO_PATCH</code> is not specified, it defaults to - <code>LIBFOO_PATCH</code>. Also note that another mechanism is - available to patch a package: all files of the form - <code>packagename-packageversion-description.patch</code> present - in the package directory inside Buildroot will be applied to the - package after extraction.</li> - - <li><code>LIBFOO_SITE</code> may contain the Internet location of - the tarball of the package. If <code>HOST_LIBFOO_SITE</code> is - not specified, it defaults to <code>LIBFOO_SITE</code>. If none - are specified, then the location is assumed to be - <code>http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/packagename</code>.<br/>Example: - <code>LIBFOO_SITE=http://www.foosoftware.org/libfoo</code>.</li> - - <li><code>LIBFOO_DEPENDENCIES</code> lists the dependencies (in - terms of package name) that are required for the current target - package to compile. These dependencies are guaranteed to be - compiled and installed before the configuration of the current - package starts. In a similar way, - <code>HOST_LIBFOO_DEPENDENCIES</code> lists the dependency for - the current host package.</li> - - <li><code>LIBFOO_INSTALL_STAGING</code> can be set to - <code>YES</code> or <code>NO</code> (default). If set to - <code>YES</code>, then the commands in the - <code>LIBFOO_INSTALL_STAGING_CMDS</code> variables are executed - to install the package into the staging directory.</p> - - <li><code>LIBFOO_INSTALL_TARGET</code> can be set to - <code>YES</code> (default) or <code>NO</code>. If set to - <code>YES</code>, then the commands in the - <code>LIBFOO_INSTALL_TARGET_CMDS</code> variables are executed - to install the package into the target directory.</p> - - </ul> - - <p>The recommended way to define these variables is to use the - following syntax:</p> + <p>This might be useful if the compilation of the target package + requires some tools to be installed on the host. If the package name is + <code>libfoo</code>, then the name of the package for the target is also + <code>libfoo</code>, while the name of the package for the host is + <code>host-libfoo</code>. These names should be used in the DEPENDENCIES + variables of other packages, if they depend on <code>libfoo</code> or + <code>host-libfoo</code>.</p> + + <p>The call to the <code>GENTARGETS</code> macro <b>must</b> be at the + end of the <code>.mk</code> file, after all variable definitions.</p> + + <p>For the target package, the <code>GENTARGETS</code> uses the + variables defined by the .mk file and prefixed by the uppercased package + name: <code>LIBFOO_*</code>. For the host package, it uses the + <code>HOST_LIBFOO_*</code>. For <i>some</i> variables, if the + <code>HOST_LIBFOO_</code> prefixed variable doesn't exist, the package + infrastructure uses the corresponding variable prefixed by + <code>LIBFOO_</code>. This is done for variables that are likely to have + the same value for both the target and host packages. See below for + details.</p> + + <p>The list of variables that can be set in a <code>.mk</code> file to + give metadata information is (assuming the package name is + <code>libfoo</code>) :</p> + + <ul> + <li><code>LIBFOO_VERSION</code>, mandatory, must contain the version + of the package. Note that if <code>HOST_LIBFOO_VERSION</code> doesn't + exist, it is assumed to be the same as <code>LIBFOO_VERSION</code>.<br/> + Example: <code>LIBFOO_VERSION = 0.1.2</code></li> + + <li><code>LIBFOO_SOURCE</code> may contain the name of the tarball of + the package. If <code>HOST_LIBFOO_SOURCE</code> is not specified, it + defaults to <code>LIBFOO_VERSION</code>. If none are specified, then + the value is assumed to be + <code>packagename-$(LIBFOO_VERSION).tar.gz</code>.<br/>Example: + <code>LIBFOO_SOURCE = foobar-$(LIBFOO_VERSION).tar.bz2</code></li> + + <li><code>LIBFOO_PATCH</code> may contain the name of a patch, that + will be downloaded from the same location as the tarball indicated in + <code>LIBFOO_SOURCE</code>. If <code>HOST_LIBFOO_PATCH</code> is not + specified, it defaults to <code>LIBFOO_PATCH</code>. Also note that + another mechanism is available to patch a package: all files of the + form <code>packagename-packageversion-description.patch</code> present + in the package directory inside Buildroot will be applied to the + package after extraction.</li> + + <li><code>LIBFOO_SITE</code> may contain the Internet location of the + tarball of the package. If <code>HOST_LIBFOO_SITE</code> is not + specified, it defaults to <code>LIBFOO_SITE</code>. If none are + specified, then the location is assumed to be + <code>http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/packagename</code>. + <br/>Example: + <code>LIBFOO_SITE=http://www.libfoosoftware.org/libfoo</code>.</li> + + <li><code>LIBFOO_DEPENDENCIES</code> lists the dependencies (in terms + of package name) that are required for the current target package to + compile. These dependencies are guaranteed to be compiled and + installed before the configuration of the current package starts. In a + similar way, <code>HOST_LIBFOO_DEPENDENCIES</code> lists the + dependency for the current host package.</li> + + <li><code>LIBFOO_INSTALL_STAGING</code> can be set to <code>YES</code> + or <code>NO</code> (default). If set to <code>YES</code>, then the + commands in the <code>LIBFOO_INSTALL_STAGING_CMDS</code> variables are + executed to install the package into the staging directory.</li> + + <li><code>LIBFOO_INSTALL_TARGET</code> can be set to <code>YES</code> + (default) or <code>NO</code>. If set to <code>YES</code>, then the + commands in the <code>LIBFOO_INSTALL_TARGET_CMDS</code> variables are + executed to install the package into the target directory.</li> </ul> + + <p>The recommended way to define these variables is to use the following + syntax:</p> <pre> -LIBFOO_VERSION=2.32 +LIBFOO_VERSION = 2.32 </pre> - <p>Now, the variables that define what should be performed at the - different steps of the build process.</p> - - <ul> - - <li><code>LIBFOO_CONFIGURE_CMDS</code>, used to list the - actions to be performed to configure the package before its - compilation</li> + <p>Now, the variables that define what should be performed at the + different steps of the build process.</p> - <li><code>LIBFOO_BUILD_CMDS</code>, used to list the actions to - be performed to compile the package</li> - - <li><code>HOST_LIBFOO_INSTALL_CMDS</code>, used to list the - actions to be performed to install the package, when the - package is a host package. The package must install its files - to the directory given by <code>$(HOST_DIR)</code>. All files, - including development files such as headers should be - installed, since other packages might be compiled on top of - this package.</li> - - <li><code>LIBFOO_INSTALL_TARGET_CMDS</code>, used to list the - actions to be performed to install the package to the target - directory, when the package is a target package. The package - must install its files to the directory given by - <code>$(TARGET_DIR)</code>. Only the files required for - <i>execution</i> of the package should be installed. Header - files and documentation should not be installed.</li> - - <li><code>LIBFOO_INSTALL_STAGING_CMDS</code>, used to list the - actions to be performed to install the package to the staging - directory, when the package is a target package. The package - must install its files to the directory given by - <code>$(STAGING_DIR)</code>. All development files should be - installed, since they might be needed to compile other - packages.</li> + <ul> + <li><code>LIBFOO_CONFIGURE_CMDS</code>, used to list the actions to be + performed to configure the package before its compilation</li> + + <li><code>LIBFOO_BUILD_CMDS</code>, used to list the actions to be + performed to compile the package</li> + + <li><code>HOST_LIBFOO_INSTALL_CMDS</code>, used to list the actions to + be performed to install the package, when the package is a host + package. The package must install its files to the directory given by + <code>$(HOST_DIR)</code>. All files, including development files such + as headers should be installed, since other packages might be compiled + on top of this package.</li> + + <li><code>LIBFOO_INSTALL_TARGET_CMDS</code>, used to list the actions + to be performed to install the package to the target directory, when + the package is a target package. The package must install its files to + the directory given by <code>$(TARGET_DIR)</code>. Only the files + required for <i>documentation</i> and <i>execution</i> of the package + should be installed. Header files should not be installed, they will + be copied to the target, if the + <code>development files in target filesystem</code> option is selected. + </li> - <li><code>LIBFOO_CLEAN_CMDS</code>, used to list the actions to - perform to clean up the build directory of the package.</li> + <li><code>LIBFOO_INSTALL_STAGING_CMDS</code>, used to list the actions + to be performed to install the package to the staging directory, when + the package is a target package. The package must install its files to + the directory given by <code>$(STAGING_DIR)</code>. All development + files should be installed, since they might be needed to compile other + packages.</li> - <li><code>LIBFOO_UNINSTALL_TARGET_CMDS</code>, used to list the - actions to uninstall the package from the target directory - <code>$(TARGET_DIR)</code></li> + <li><code>LIBFOO_CLEAN_CMDS</code>, used to list the actions to + perform to clean up the build directory of the package.</li> - <li><code>LIBFOO_UNINSTALL_STAGING_CMDS</code></li>, used to - list the actions to uninstall the package from the staging - directory <code>$(STAGING_DIR)</code>.</li> + <li><code>LIBFOO_UNINSTALL_TARGET_CMDS</code>, used to list the actions + to uninstall the package from the target directory + <code>$(TARGET_DIR)</code></li> - </ul> + <li><code>LIBFOO_UNINSTALL_STAGING_CMDS</code>, used to list the + actions to uninstall the package from the staging directory + <code>$(STAGING_DIR)</code>.</li> + </ul> - <p>The preferred way to define these variables is:</p> + <p>The preferred way to define these variables is:</p> <pre> define LIBFOO_CONFIGURE_CMDS - action 1 - action 2 - action 3 -endef</pre> - - <p>In the action definitions, you can use the following - variables:</p> - - <ul> - - <li><code>$(@D)</code>, which contains the directory in which - the package source code has been uncompressed.</li> + action 1 + action 2 + action 3 +endef +</pre> - <li><code>$(TARGET_CC)</code>, <code>$(TARGET_LD)</code>, - etc. to get the target cross-compilation utilities</li> + <p>In the action definitions, you can use the following variables:</p> - <li><code>$(TARGET_CROSS)</code> to get the cross-compilation - toolchain prefix</li> + <ul> + <li><code>$(@D)</code>, which contains the directory in which the + package source code has been uncompressed.</li> - <li>Of course the <code>$(HOST_DIR)</code>, - <code>$(STAGING_DIR)</code> and <code>$(TARGET_DIR)</code> - variables to install the packages properly.</li> + <li><code>$(TARGET_CC)</code>, <code>$(TARGET_LD)</code>, etc. to get + the target cross-compilation utilities</li> - </ul> + <li><code>$(TARGET_CROSS)</code> to get the cross-compilation + toolchain prefix</li> + <li>Of course the <code>$(HOST_DIR)</code>, <code>$(STAGING_DIR)</code> + and <code>$(TARGET_DIR)</code> variables to install the packages + properly.</li> + </ul> - <p>The last feature of the generic infrastructure is the ability - to add hook more actions after existing steps. These hooks aren't - really useful for generic packages, since the <code>.mk</code> - file already has full control over the actions performed in each - step of the package construction. The hooks are more useful for - packages using the autotools infrastructure described below. But - since they are provided by the generic infrastructure, they are - documented here.</p> + <p>The last feature of the generic infrastructure is the ability to add + hooks. These define further actions to perform after existing steps. + Most hooks aren't really useful for generic packages, since the + <code>.mk</code> file already has full control over the actions + performed in each step of the package construction. The hooks are more + useful for packages using the autotools infrastructure described below. + However, since they are provided by the generic infrastructure, they are + documented here. The exception is <code>LIBFOO_POST_PATCH_HOOKS</code>. + Patching the package is not user definable, so + <code>LIBFOO_POST_PATCH_HOOKS</code> will be userful for generic packages. + </p> - <p>The following hook points are available:</p> + <p>The following hook points are available:</p> - <ul> - <li><code>LIBFOO_POST_PATCH_HOOKS</code></li> - <li><code>LIBFOO_POST_CONFIGURE_HOOKS</code></li> - <li><code>LIBFOO_POST_BUILD_HOOKS</code></li> - <li><code>LIBFOO_POST_INSTALL_HOOKS</code> (for host packages only)</li> - <li><code>LIBFOO_POST_INSTALL_STAGING_HOOKS</code> (for target packages only)</li> - <li><code>LIBFOO_POST_INSTALL_TARGET_HOOKS</code> (for target packages only)</li> - </ul> + <ul> + <li><code>LIBFOO_POST_PATCH_HOOKS</code></li> + <li><code>LIBFOO_POST_CONFIGURE_HOOKS</code></li> + <li><code>LIBFOO_POST_BUILD_HOOKS</code></li> + <li><code>LIBFOO_POST_INSTALL_HOOKS</code> (for host packages only)</li> + <li><code>LIBFOO_POST_INSTALL_STAGING_HOOKS</code> (for target packages only)</li> + <li><code>LIBFOO_POST_INSTALL_TARGET_HOOKS</code> (for target packages only)</li> + </ul> - <p>This variables are <i>lists</i> of variable names containing - actions to be performed at this hook point. This allows several - hooks to be registered at a given hook point. Here is an - example:</p> + <p>These variables are <i>lists</i> of variable names containing actions + to be performed at this hook point. This allows several hooks to be + registered at a given hook point. Here is an example:</p> - <pre> +<pre> define LIBFOO_POST_PATCH_FIXUP - action1 - action2 + action1 + action2 endef LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP </pre> - <h4><a name="autotools-tutorial"></a>Makefile for autotools-based - packages : tutorial</h4> + <h4 id="autotools-tutorial">Makefile for autotools-based packages : tutorial</h4> <p>First, let's see how to write a <code>.mk</code> file for an - autotools-based package, with an example :</p> - -<pre><tt><span style="color: #000000">01:</span> <span style="font-style: italic"><span style="color: #9A1900">#############################################################</span></span> -<span style="color: #000000">02:</span> <span style="font-style: italic"><span style="color: #9A1900">#</span></span> -<span style="color: #000000">03:</span> <span style="font-style: italic"><span style="color: #9A1900"># foo</span></span> -<span style="color: #000000">04:</span> <span style="font-style: italic"><span style="color: #9A1900">#</span></span> -<span style="color: #000000">05:</span> <span style="font-style: italic"><span style="color: #9A1900">#############################################################</span></span> -<span style="color: #000000">06:</span> -<span style="color: #000000">07:</span> <span style="color: #990000">FOO_VERSION:=</span>1.0 -<span style="color: #000000">08:</span> <span style="color: #990000">FOO_SOURCE:=</span>foo-<span style="color: #009900">$(FOO_VERSION)</span>.tar.gz -<span style="color: #000000">09:</span> <span style="color: #990000">FOO_SITE:=</span>http<span style="color: #990000">:</span>//www.foosoftware.org/downloads -<span style="color: #000000">10:</span> <span style="color: #009900">FOO_INSTALL_STAGING =</span> YES -<span style="color: #000000">11:</span> <span style="color: #009900">FOO_INSTALL_TARGET =</span> YES -<span style="color: #000000">12:</span> <span style="color: #009900">FOO_CONF_OPT =</span> --enable-shared -<span style="color: #000000">13:</span> <span style="color: #009900">FOO_DEPENDENCIES =</span> libglib2 host-pkg-config -<span style="color: #000000">14:</span> -<span style="color: #000000">15:</span> <span style="color: #009900">$(</span><span style="font-weight: bold"><span style="color: #0000FF">eval</span></span> <span style="color: #009900">$(</span>call AUTOTARGETS<span style="color: #990000">,</span>package<span style="color: #990000">,</span>foo<span style="color: #990000">))</span></tt></pre> - - <p>On line 7, we declare the version of the package. On line 8 and - 9, we declare the name of the tarball and the location of the - tarball on the Web. Buildroot will automatically download the + autotools-based package, with an example :</p> + +<pre> +<span style="color: #000000">01:</span><span style="font-style: italic; color: #9A1900"> #############################################################</span> +<span style="color: #000000">02:</span><span style="font-style: italic; color: #9A1900"> #</span> +<span style="color: #000000">03:</span><span style="font-style: italic; color: #9A1900"> # libfoo</span> +<span style="color: #000000">04:</span><span style="font-style: italic; color: #9A1900"> #</span> +<span style="color: #000000">05:</span><span style="font-style: italic; color: #9A1900"> #############################################################</span> +<span style="color: #000000">06:</span><span style="color: #009900"> LIBFOO_VERSION</span> = 1.0 +<span style="color: #000000">07:</span><span style="color: #009900"> LIBFOO_SOURCE</span> = libfoo-<span style="color: #009900">$(LIBFOO_VERSION)</span>.tar.gz +<span style="color: #000000">08:</span><span style="color: #009900"> LIBFOO_SITE</span> = http://www.foosoftware.org/download +<span style="color: #000000">09:</span><span style="color: #009900"> LIBFOO_INSTALL_STAGING</span> = YES +<span style="color: #000000">10:</span><span style="color: #009900"> LIBFOO_INSTALL_TARGET</span> = YES +<span style="color: #000000">11:</span><span style="color: #009900"> LIBFOO_CONF_OPT</span> = --enable-shared +<span style="color: #000000">12:</span><span style="color: #009900"> LIBFOO_DEPENDENCIES</span> = libglib2 host-pkg-config +<span style="color: #000000">13:</span> +<span style="color: #000000">14:</span><span style="color: #009900"> $(eval $(call AUTOTARGETS,package,libfoo))</span> +</pre> + + <p>On line 6, we declare the version of the package.</p> + + <p>On line 7 and 8, we declare the name of the tarball and the location + of the tarball on the Web. Buildroot will automatically download the tarball from this location.</p> - <p>On line 10, we tell Buildroot to install the package to the - staging directory. The staging directory, located in - <code>output/staging/</code> is the directory where all the - packages are installed, including their development files, etc. By - default, packages are not installed to the staging directory, - since usually, only libraries need to be installed in the staging - directory: their development files are needed to compile other - libraries or applications depending on them. Also by default, when - staging installation is enabled, packages are installed in this - location using the <code>make install</code> command.</p> - - <p>On line 11, we tell Buildroot to also install the package to - the target directory. This directory contains what will become the - root filesystem running on the target. Usually, we try not to - install the documentation and to install stripped versions of the - binary. By default, target installation is enabled, so in fact, - this line is not strictly necessary. Also by default, packages are - installed in this location using the <code>make - install-strip</code> command.</p> - - <p>On line 12, we tell Buildroot to pass a custom configure - option, that will be passed to the <code>./configure</code> script - before configuring and building the package.</p> - - <p>On line 13, we declare our dependencies, so that they are built + <p>On line 9, we tell Buildroot to install the package to the staging + directory. The staging directory, located in <code>output/staging/</code> + is the directory where all the packages are installed, including their + development files, etc. By default, packages are not installed to the + staging directory, since usually, only libraries need to be installed in + the staging directory: their development files are needed to compile + other libraries or applications depending on them. Also by default, when + staging installation is enabled, packages are installed in this location + using the <code>make install</code> command.</p> + + <p>On line 10, we tell Buildroot to also install the package to the + target directory. This directory contains what will become the root + filesystem running on the target. Usually, we try not to install header + files and to install stripped versions of the binary. By default, target + installation is enabled, so in fact, this line is not strictly + necessary. Also by default, packages are installed in this location + using the <code>make install</code> command.</p> + + <p>On line 11, we tell Buildroot to pass a custom configure option, that + will be passed to the <code>./configure</code> script before configuring + and building the package.</p> + + <p>On line 12, we declare our dependencies, so that they are built before the build process of our package starts.</p> - <p>Finally, on line line 14, we invoke the - <code>AUTOTARGETS</code> macro that generates all the Makefile - rules that actually allows the package to be built.</p> + <p>Finally, on line line 14, we invoke the <code>AUTOTARGETS</code> + macro that generates all the Makefile rules that actually allows the + package to be built.</p> - <h4><a name="autotools-reference"></a>Makefile for autotools - packages : reference</h4> + <h4 id="autotools-reference">Makefile for autotools packages : reference</h4> <p>The main macro of the autotools package infrastructure is - <code>AUTOTARGETS</code>. It has the same number of arguments and - the same semantic as the <code>GENTARGETS</code> macro, which is - the main macro of the generic package infrastructure. For - autotools packages, the ability to have target and host packages - is also available (and is actually widely used).</p> - - <p>Just like the generic infrastructure, the autotools - infrastructure works by defining a number of variables before - calling the <code>AUTOTARGETS</code> macro.</p> - - <p>First, all the package meta-information variables that exist in - the generic infrastructure also exist in the autotools - infrastructure: <code>LIBFOO_VERSION</code>, - <code>LIBFOO_SOURCE</code>, <code>LIBFOO_PATCH</code>, - <code>LIBFOO_SITE</code>, <code>LIBFOO_SUBDIR</code>, - <code>LIBFOO_DEPENDENCIES</code>, - <code>LIBFOO_INSTALL_STAGING</code>, - <code>LIBFOO_INSTALL_TARGET</code>.</p> - - <p>A few additional variables, specific to the autotools - infrastructure, can also be defined. Many of them are only useful - in very specific cases, typical packages will therefore only use a - few of them.</p> + <code>AUTOTARGETS</code>. It has the same number of arguments and the + same semantic as the <code>GENTARGETS</code> macro, which is the main + macro of the generic package infrastructure. For autotools packages, the + ability to have target and host packages is also available (and is + actually widely used).</p> + + <p>Just like the generic infrastructure, the autotools infrastructure + works by defining a number of variables before calling the + <code>AUTOTARGETS</code> macro.</p> + + <p>First, all the package metadata information variables that exist in the + generic infrastructure also exist in the autotools infrastructure: + <code>LIBFOO_VERSION</code>, <code>LIBFOO_SOURCE</code>, + <code>LIBFOO_PATCH</code>, <code>LIBFOO_SITE</code>, + <code>LIBFOO_SUBDIR</code>, <code>LIBFOO_DEPENDENCIES</code>, + <code>LIBFOO_INSTALL_STAGING</code>, <code>LIBFOO_INSTALL_TARGET</code>.</p> + + <p>A few additional variables, specific to the autotools infrastructure, + can also be defined. Many of them are only useful in very specific + cases, typical packages will therefore only use a few of them.</p> <ul> - - <li><code>LIBFOO_SUBDIR</code> may contain the name of a - subdirectory inside the package that contains the configure - script. This is useful, if for example, the main configure - script is not at the root of the tree extracted by the - tarball. If <code>HOST_LIBFOO_SUBDIR</code> is not specified, it - defaults to <code>LIBFOO_SUBDIR</code>.</li> - - <li><code>LIBFOO_CONF_ENV</code>, to specify additional - environment variables to pass to the configure script. By - default, empty.</li> - - <li><code>LIBFOO_CONF_OPT</code>, to specify additional - configure options to pass to the configure script. By default, - empty.</li> - - <li><code>LIBFOO_MAKE</code>, to specify an - alternate <code>make</code> command. This is typically useful - when parallel make it enabled in the configuration - (using <code>BR2_JLEVEL</code>) but that this feature should be - disabled for the given package, for one reason or another. By - default, set to <code>$(MAKE)</code>. If parallel building is - not supported by the package, then it should - do <code>LIBFOO_MAKE=$(MAKE1)</code>.</li> - - <li><code>LIBFOO_MAKE_ENV</code>, to specify additional - environment variables to pass to make in the build step. These - are passed before the <code>make</code> command. By default, - empty.</li> - - <li><code>LIBFOO_MAKE_OPT</code>, to specify additional - variables to pass to make in the build step. These are passed - after the <code>make</code> command. By default, empty.</li> - - <li><code>LIBFOO_AUTORECONF</code>, tells whether the package - should be autoreconfigured or not (i.e, if the configure script - and Makefile.in files should be re-generated by re-running - autoconf, automake, libtool, etc.). Valid values - are <code>YES</code> and <code>NO</code>. By default, the value - is <code>NO</code></li> - - <li><code>LIBFOO_AUTORECONF_OPT</code> to specify additional - options passed to the <i>autoreconf</i> program - if <code>LIBFOO_AUTORECONF=YES</code>. By default, empty.</li> - - <li><code>LIBFOO_LIBTOOL_PATCH</code> tells whether the - Buildroot patch to fix libtool cross-compilation issues should - be applied or not. Valid values are <code>YES</code> - and <code>NO</code>. By default, the value - is <code>YES</code></li> - - <li><code>LIBFOO_USE_CONFIG_CACHE</code> tells whether the - configure script should really on a cache file that caches test - results from previous configure script. Usually, this variable - should be left to its default value. Only for specific packages - having issues with the configure cache can set this variable to - the <code>NO</code> value (but this is more a work-around than a - really fix)</li> - - <li><code>LIBFOO_INSTALL_STAGING_OPT</code> contains the make - options used to install the package to the staging directory. By - default, the value is <code>DESTDIR=$$(STAGING_DIR) - install</code>, which is correct for most autotools packages. It - is still possible to override it.</li> - - <li><code>LIBFOO_INSTALL_TARGET_OPT</code> contains the make - options used to install the package to the target directory. By - default, the value is <code>DESTDIR=$$(TARGET_DIR) - install-strip</code> if <code>BR2_ENABLE_DEBUG</code> is not - set, and <code>DESTDIR=$$(TARGET_DIR) install-exec</code> - if <code>BR2_ENABLE_DEBUG</code> is set. These default values - are correct for most autotools packages, but it is still - possible to override them if needed.</li> - - <li><code>LIBFOO_CLEAN_OPT</code> contains the make options used - to clean the package. By default, the value - is <code>clean</code>.</li> + <li><code>LIBFOO_SUBDIR</code> may contain the name of a subdirectory + inside the package that contains the configure script. This is useful, + if for example, the main configure script is not at the root of the + tree extracted by the tarball. If <code>HOST_LIBFOO_SUBDIR</code> is + not specified, it defaults to <code>LIBFOO_SUBDIR</code>.</li> + + <li><code>LIBFOO_CONF_ENV</code>, to specify additional environment + variables to pass to the configure script. By default, empty.</li> + + <li><code>LIBFOO_CONF_OPT</code>, to specify additional configure + options to pass to the configure script. By default, empty.</li> + + <li><code>LIBFOO_MAKE</code>, to specify an alternate <code>make</code> + command. This is typically useful when parallel make is enabled in + the configuration (using <code>BR2_JLEVEL</code>) but that this + feature should be disabled for the given package, for one reason or + another. By default, set to <code>$(MAKE)</code>. If parallel building + is not supported by the package, then it should be set to + <code>LIBFOO_MAKE=$(MAKE1)</code>.</li> + + <li><code>LIBFOO_MAKE_ENV</code>, to specify additional environment + variables to pass to make in the build step. These are passed before + the <code>make</code> command. By default, empty.</li> + + <li><code>LIBFOO_MAKE_OPT</code>, to specify additional variables to + pass to make in the build step. These are passed after the + <code>make</code> command. By default, empty.</li> + + <li><code>LIBFOO_AUTORECONF</code>, tells whether the package should + be autoreconfigured or not (i.e, if the configure script and + Makefile.in files should be re-generated by re-running autoconf, + automake, libtool, etc.). Valid values are <code>YES</code> and + <code>NO</code>. By default, the value is <code>NO</code></li> + + <li><code>LIBFOO_AUTORECONF_OPT</code> to specify additional options + passed to the <i>autoreconf</i> program if + <code>LIBFOO_AUTORECONF=YES</code>. By default, empty.</li> + + <li><code>LIBFOO_LIBTOOL_PATCH</code> tells whether the Buildroot + patch to fix libtool cross-compilation issues should be applied or + not. Valid values are <code>YES</code> and <code>NO</code>. By + default, the value is <code>YES</code></li> + + <li><code>LIBFOO_USE_CONFIG_CACHE</code> tells whether the configure + script should use the central configure cache, which caches test + results from previous configure scripts. Usually, this variable should + be left to its default value. Only packages having issues with the + configure cache, can set this variable to the <code>NO</code> value + (but this is more of a work-around than a fix)</li> + + <li><code>LIBFOO_INSTALL_STAGING_OPT</code> contains the make options + used to install the package to the staging directory. By default, the + value is <code>DESTDIR=$$(STAGING_DIR) install</code>, which is + correct for most autotools packages. It is still possible to override + it.</li> + + <li><code>LIBFOO_INSTALL_TARGET_OPT</code> contains the make options + used to install the package to the target directory. By default, the + value is <code>DESTDIR=$$(TARGET_DIR) install</code>. The default + value is correct for most autotools packages, but it is still possible + to override it if needed.</li> + + <li><code>LIBFOO_CLEAN_OPT</code> contains the make options used to + clean the package. By default, the value is <code>clean</code>.</li> <li><code>LIBFOO_UNINSTALL_STAGING_OPT</code>, contains the make - options used to uninstall the package from the staging - directory. By default, the value is - <code>DESTDIR=$$(STAGING_DIR) uninstall</code>.</li> + options used to uninstall the package from the staging directory. By + default, the value is <code>DESTDIR=$$(STAGING_DIR) uninstall</code>.</li> <li><code>LIBFOO_UNINSTALL_TARGET_OPT</code>, contains the make - options used to uninstall the package from the target - directory. By default, the value is - <code>DESTDIR=$$(TARGET_DIR) uninstall</code>.</li> - + options used to uninstall the package from the target directory. By + default, the value is <code>DESTDIR=$$(TARGET_DIR) uninstall</code>.</li> </ul> - <p>With the autotools infrastructure, all the steps required to - build and install the packages are already defined, and they - generally work well for most autotools-based packages. However, - when required, it is still possible to customize what is done in - particular step:</p> + <p>With the autotools infrastructure, all the steps required to build + and install the packages are already defined, and they generally work + well for most autotools-based packages. However, when required, it is + still possible to customize what is done in any particular step:</p> <ul> + <li>By adding a post-operation hook (after extract, patch, configure, + build or install). See the reference documentation of the generic + infrastructure for details.</li> - <li>By adding a post-operation hook (after extract, patch, - configure, build or install). See the reference documentation of - the generic infrastructure for details.</li> - - <li>By overriding one of the steps. For example, even if the - autotools infrastructure is used, if the package - <code>.mk</code> defines its own - <code>LIBFOO_CONFIGURE_CMDS</code> variable, it will be used + <li>By overriding one of the steps. For example, even if the autotools + infrastructure is used, if the package <code>.mk</code> file defines its + own <code>LIBFOO_CONFIGURE_CMDS</code> variable, it will be used instead of the default autotools one. However, using this method - should be restricted to very specific cases. Do not use it in - the general case.</li> - + should be restricted to very specific cases. Do not use it in the + general case.</li> </ul> - <h4><a name="manual-tutorial"></a>Manual Makefile : tutorial</h4> + <h4 id ="manual-tutorial">Manual Makefile : tutorial</h4> - <p><b>NOTE: new manual makefiles should not be created, and - existing manual makefiles should be converted either to the - generic infrastructure or the autotools infrastructure. This - section is only kept to document the existing manual makefiles and - help understanding how they work.</b></p> + <p><b>NOTE: new manual makefiles should not be created, and existing + manual makefiles should be converted either to the generic + infrastructure or the autotools infrastructure. This section is only + kept to document the existing manual makefiles and to help understand + how they work.</b></p> <pre> - <a name="ex2line1" id="ex2line1">1</a> ############################################################# - <a name="ex2line2" id="ex2line2">2</a> # - <a name="ex2line3" id="ex2line3">3</a> # foo - <a name="ex2line4" id="ex2line4">4</a> # - <a name="ex2line5" id="ex2line5">5</a> ############################################################# - <a name="ex2line6" id="ex2line6">6</a> FOO_VERSION:=1.0 - <a name="ex2line7" id="ex2line7">7</a> FOO_SOURCE:=foo-$(FOO_VERSION).tar.gz - <a name="ex2line8" id="ex2line8">8</a> FOO_SITE:=http://www.foosoftware.org/downloads - <a name="ex2line9" id="ex2line9">9</a> FOO_DIR:=$(BUILD_DIR)/foo-$(FOO_VERSION) - <a name="ex2line10" id="ex2line10">10</a> FOO_BINARY:=foo - <a name="ex2line11" id="ex2line11">11</a> FOO_TARGET_BINARY:=usr/bin/foo - <a name="ex2line12" id="ex2line12">12</a> - <a name="ex2line13" id="ex2line13">13</a> $(DL_DIR)/$(FOO_SOURCE): - <a name="ex2line14" id="ex2line14">14</a> $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE)) - <a name="ex2line15" id="ex2line15">15</a> - <a name="ex2line16" id="ex2line16">16</a> $(FOO_DIR)/.source: $(DL_DIR)/$(FOO_SOURCE) - <a name="ex2line17" id="ex2line17">17</a> $(ZCAT) $(DL_DIR)/$(FOO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - <a name="ex2line18" id="ex2line18">18</a> touch $@ - <a name="ex2line19" id="ex2line19">19</a> - <a name="ex2line20" id="ex2line20">20</a> $(FOO_DIR)/.configured: $(FOO_DIR)/.source - <a name="ex2line21" id="ex2line21">21</a> (cd $(FOO_DIR); rm -rf config.cache; \ - <a name="ex2line22" id="ex2line22">22</a> $(TARGET_CONFIGURE_OPTS) \ - <a name="ex2line23" id="ex2line23">23</a> $(TARGET_CONFIGURE_ARGS) \ - <a name="ex2line24" id="ex2line24">24</a> ./configure \ - <a name="ex2line25" id="ex2line25">25</a> --target=$(GNU_TARGET_NAME) \ - <a name="ex2line26" id="ex2line26">26</a> --host=$(GNU_TARGET_NAME) \ - <a name="ex2line27" id="ex2line27">27</a> --build=$(GNU_HOST_NAME) \ - <a name="ex2line28" id="ex2line28">28</a> --prefix=/usr \ - <a name="ex2line29" id="ex2line29">29</a> --sysconfdir=/etc \ - <a name="ex2line30" id="ex2line30">30</a> ) - <a name="ex2line31" id="ex2line31">31</a> touch $@ - <a name="ex2line32" id="ex2line32">32</a> - <a name="ex2line33" id="ex2line33">33</a> $(FOO_DIR)/$(FOO_BINARY): $(FOO_DIR)/.configured - <a name="ex2line34" id="ex2line34">34</a> $(MAKE) CC=$(TARGET_CC) -C $(FOO_DIR) - <a name="ex2line35" id="ex2line35">35</a> - <a name="ex2line36" id="ex2line36">36</a> $(TARGET_DIR)/$(FOO_TARGET_BINARY): $(FOO_DIR)/$(FOO_BINARY) - <a name="ex2line37" id="ex2line37">37</a> $(MAKE) DESTDIR=$(TARGET_DIR) -C $(FOO_DIR) install-strip - <a name="ex2line38" id="ex2line38">38</a> rm -Rf $(TARGET_DIR)/usr/man - <a name="ex2line39" id="ex2line39">39</a> - <a name="ex2line40" id="ex2line40">40</a> foo: uclibc ncurses $(TARGET_DIR)/$(FOO_TARGET_BINARY) - <a name="ex2line41" id="ex2line41">41</a> - <a name="ex2line42" id="ex2line42">42</a> foo-source: $(DL_DIR)/$(FOO_SOURCE) - <a name="ex2line43" id="ex2line43">43</a> - <a name="ex2line44" id="ex2line44">44</a> foo-clean: - <a name="ex2line45" id="ex2line45">45</a> $(MAKE) prefix=$(TARGET_DIR)/usr -C $(FOO_DIR) uninstall - <a name="ex2line46" id="ex2line46">46</a> -$(MAKE) -C $(FOO_DIR) clean - <a name="ex2line47" id="ex2line47">47</a> - <a name="ex2line48" id="ex2line48">48</a> foo-dirclean: - <a name="ex2line49" id="ex2line49">49</a> rm -rf $(FOO_DIR) - <a name="ex2line50" id="ex2line50">50</a> - <a name="ex2line51" id="ex2line51">51</a> ############################################################# - <a name="ex2line52" id="ex2line52">52</a> # - <a name="ex2line53" id="ex2line53">53</a> # Toplevel Makefile options - <a name="ex2line54" id="ex2line54">54</a> # - <a name="ex2line55" id="ex2line55">55</a> ############################################################# - <a name="ex2line56" id="ex2line56">56</a> ifeq ($(BR2_PACKAGE_FOO),y) - <a name="ex2line57" id="ex2line57">57</a> TARGETS+=foo - <a name="ex2line58" id="ex2line58">58</a> endif - +01: ############################################################# +02: # +03: # libfoo +04: # +05: ############################################################# +<span id="ex2line6">06: LIBFOO_VERSION:=1.0</span> +07: LIBFOO_SOURCE:=libfoo-$(LIBFOO_VERSION).tar.gz +08: LIBFOO_SITE:=http://www.foosoftware.org/downloads +09: LIBFOO_DIR:=$(BUILD_DIR)/foo-$(FOO_VERSION) +10: LIBFOO_BINARY:=foo +11: LIBFOO_TARGET_BINARY:=usr/bin/foo +12: +<span id="ex2line13">13: $(DL_DIR)/$(LIBFOO_SOURCE):</span> +14: $(call DOWNLOAD,$(LIBFOO_SITE),$(LIBFOO_SOURCE)) +15: +<span id="ex2line16">16: $(LIBFOO_DIR)/.source: $(DL_DIR)/$(LIBFOO_SOURCE)</span> +17: $(ZCAT) $(DL_DIR)/$(LIBFOO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - +18: touch $@ +19: +<span id="ex2line20">20: $(LIBFOO_DIR)/.configured: $(LIBFOO_DIR)/.source</span> +21: (cd $(LIBFOO_DIR); rm -rf config.cache; \ +22: $(TARGET_CONFIGURE_OPTS) \ +23: $(TARGET_CONFIGURE_ARGS) \ +24: ./configure \ +25: --target=$(GNU_TARGET_NAME) \ +26: --host=$(GNU_TARGET_NAME) \ +27: --build=$(GNU_HOST_NAME) \ +28: --prefix=/usr \ +29: --sysconfdir=/etc \ +30: ) +31: touch $@ +32: +<span id="ex2line33">33: $(LIBFOO_DIR)/$(LIBFOO_BINARY): $(LIBFOO_DIR)/.configured</span> +34: $(MAKE) CC=$(TARGET_CC) -C $(LIBFOO_DIR) +35: +<span id="ex2line36">36: $(TARGET_DIR)/$(LIBFOO_TARGET_BINARY): $(LIBFOO_DIR)/$(LIBFOO_BINARY)</span> +37: $(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIBFOO_DIR) install-strip +38: rm -Rf $(TARGET_DIR)/usr/man +39: +<span id="ex2line40">40: libfoo: uclibc ncurses $(TARGET_DIR)/$(LIBFOO_TARGET_BINARY)</span> +41: +<span id="ex2line42">42: libfoo-source: $(DL_DIR)/$(LIBFOO_SOURCE)</span> +43: +<span id="ex2line44">44: libfoo-clean:</span> +45: $(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBFOO_DIR) uninstall +46: -$(MAKE) -C $(LIBFOO_DIR) clean +47: +<span id="ex2line48">48: libfoo-dirclean:</span> +49: rm -rf $(LIBFOO_DIR) +50: +<span id="ex2line51">51: #############################################################</span> +52: # +53: # Toplevel Makefile options +54: # +55: ############################################################# +56: ifeq ($(BR2_PACKAGE_LIBFOO),y) +57: TARGETS+=libfoo +58: endif </pre> - <p>First of all, this Makefile example works for a package which comprises a single - binary executable. For other software, such as libraries or more - complex stuff with multiple binaries, it must be adapted. For examples look at - the other <code>*.mk</code> files in the <code>package</code> - directory. </p> + <p>First of all, this Makefile example works for a package which + comprises a single binary executable. For other software, such as + libraries or more complex stuff with multiple binaries, it must be + adapted. For examples look at the other <code>*.mk</code> files in the + <code>package</code> directory.</p> <p>At lines <a href="#ex2line6">6-11</a>, a couple of useful variables are defined:</p> <ul> + <li><code>LIBFOO_VERSION</code>: The version of <i>libfoo</i> that + should be downloaded.</li> - <li><code>FOO_VERSION</code>: The version of <i>foo</i> that - should be downloaded. </li> - - <li><code>FOO_SOURCE</code>: The name of the tarball of - <i>foo</i> on the download website or FTP site. As you can see - <code>FOO_VERSION</code> is used. </li> - - <li><code>FOO_SITE</code>: The HTTP or FTP site from which - <i>foo</i> archive is downloaded. It must include the complete - path to the directory where <code>FOO_SOURCE</code> can be - found. </li> - - <li><code>FOO_DIR</code>: The directory into which the software - will be configured and compiled. Basically, it's a subdirectory - of <code>BUILD_DIR</code> which is created upon decompression of - the tarball. </li> + <li><code>LIBFOO_SOURCE</code>: The name of the tarball of <i>libfoo</i> + on the download website or FTP site. As you can see + <code>LIBFOO_VERSION</code> is used.</li> - <li><code>FOO_BINARY</code>: Software binary name. As said - previously, this is an example for a package with a single binary.</li> + <li><code>LIBFOO_SITE</code>: The HTTP or FTP site from which + <i>libfoo</i> archive is downloaded. It must include the complete path to + the directory where <code>LIBFOO_SOURCE</code> can be found.</li> - <li><code>FOO_TARGET_BINARY</code>: The full path of the binary - inside the target filesystem. </li> - - </ul> + <li><code>LIBFOO_DIR</code>: The directory into which the software will + be configured and compiled. Basically, it's a subdirectory of + <code>BUILD_DIR</code> which is created upon decompression of the tarball. + </li> - <p>Lines <a href="#ex2line13">13-14</a> define a target that downloads the - tarball from the remote site to the download directory - (<code>DL_DIR</code>). </p> - - <p>Lines <a href="#ex2line16">16-18</a> define a target and associated rules - that uncompress the downloaded tarball. As you can see, this target - depends on the tarball file so that the previous target (lines - <a href="#ex2line13">13-14</a>) is called before executing the rules of the - current target. Uncompressing is followed by <i>touching</i> a hidden file - to mark the software as having been uncompressed. This trick is - used everywhere in a Buildroot Makefile to split steps - (download, uncompress, configure, compile, install) while still - having correct dependencies. </p> - - <p>Lines <a href="#ex2line20">20-31</a> define a target and associated rules - that configure the software. It depends on the previous target (the - hidden <code>.source</code> file) so that we are sure the software has - been uncompressed. In order to configure the package, it basically runs the - well-known <code>./configure</code> script. As we may be doing + <li><code>LIBFOO_BINARY</code>: Software binary name. As said previously, + this is an example for a package with a single binary.</li> + + <li><code>LIBFOO_TARGET_BINARY</code>: The full path of the binary inside + the target filesystem.</li> </ul> + + <p>Lines <a href="#ex2line13">13-14</a> define a target that downloads + the tarball from the remote site to the download directory + (<code>DL_DIR</code>).</p> + + <p>Lines <a href="#ex2line16">16-18</a> define a target and associated + rules that uncompress the downloaded tarball. As you can see, this + target depends on the tarball file so that the previous target (lines + <a href="#ex2line13">13-14</a>) is called before executing the rules of + the current target. Uncompressing is followed by <i>touching</i> a + hidden file to mark the software as having been uncompressed. This trick + is used everywhere in a Buildroot Makefile to split steps (download, + uncompress, configure, compile, install) while still having correct + dependencies.</p> + + <p>Lines <a href="#ex2line20">20-31</a> define a target and associated + rules that configure the software. It depends on the previous target + (the hidden <code>.source</code> file) so that we are sure the software + has been uncompressed. In order to configure the package, it basically + runs the well-known <code>./configure</code> script. As we may be doing cross-compilation, <code>target</code>, <code>host</code> and <code>build</code> arguments are given. The prefix is also set to <code>/usr</code>, not because the software will be installed in - <code>/usr</code> on your host system, but because the software will - bin installed in <code>/usr</code> on the target - filesystem. Finally it creates a <code>.configured</code> file to - mark the software as configured. </p> + <code>/usr</code> on your host system, but because the software will be + installed in <code> /usr</code> on the target filesystem. Finally it + creates a <code>.configured</code> file to mark the software as + configured.</p> <p>Lines <a href="#ex2line33">33-34</a> define a target and a rule that compile the software. This target will create the binary file in the compilation directory and depends on the software being already - configured (hence the reference to the <code>.configured</code> - file). It basically runs <code>make</code> inside the source - directory. </p> - - <p>Lines <a href="#ex2line36">36-38</a> define a target and associated rules - that install the software inside the target filesystem. They depend on the - binary file in the source directory to make sure the software has - been compiled. They use the <code>install-strip</code> target of the - software <code>Makefile</code> by passing a <code>DESTDIR</code> - argument so that the <code>Makefile</code> doesn't try to install - the software in the host <code>/usr</code> but rather in the target - <code>/usr</code>. After the installation, the - <code>/usr/man</code> directory inside the target filesystem is - removed to save space. </p> - - <p>Line <a href="#ex2line40">40</a> defines the main target of the software — - the one that will be eventually be used by the top level - <code>Makefile</code> to download, compile, and then install - this package. This target should first of all depend on all - needed dependencies of the software (in our example, - <i>uclibc</i> and <i>ncurses</i>) and also depend on the - final binary. This last dependency will call all previous - dependencies in the correct order. </p> + configured (hence the reference to the <code>.configured</code> file). + It basically runs <code>make</code> inside the source directory.</p> + + <p>Lines <a href="#ex2line36">36-38</a> define a target and associated + rules that install the software inside the target filesystem. They + depend on the binary file in the source directory to make sure the + software has been compiled. They use the <code>install-strip</code> + target of the software <code>Makefile</code> by passing a + <code>DESTDIR</code> argument so that the <code>Makefile</code> doesn't + try to install the software in the host <code>/usr</code> but rather in + the target <code>/usr</code>. After the installation, the + <code>/usr/man </code> directory inside the target filesystem is removed + to save space. </p> + + <p>Line <a href="#ex2line40">40</a> defines the main target of the + software — the one that will eventually be used by the top level + <code>Makefile</code> to download, compile, and then install this + package. This target should first of all depend on all needed + dependencies of the software (in our example, <i>uclibc</i> and + <i>ncurses</i>) and also depend on the final binary. This last dependency + will call all previous dependencies in the correct order.</p> <p>Line <a href="#ex2line42">42</a> defines a simple target that only downloads the code source. This is not used during normal operation of - Buildroot, but is needed if you intend to download all required sources at - once for later offline build. Note that if you add a new package providing - a <code>foo-source</code> target is <i>mandatory</i> to support - users that wish to do offline-builds. Furthermore it eases checking - if all package-sources are downloadable. </p> - - <p>Lines <a href="#ex2line44">44-46</a> define a simple target to clean the - software build by calling the Makefiles with the appropriate option. - The <code>-clean</code> target should run <code>make clean</code> - on $(BUILD_DIR)/package-version and MUST uninstall all files of the - package from $(STAGING_DIR) and from $(TARGET_DIR). </p> - - <p>Lines <a href="#ex2line48">48-49</a> define a simple target to completely - remove the directory in which the software was uncompressed, configured and - compiled. The <code>-dirclean</code> target MUST completely rm $(BUILD_DIR)/ - package-version. </p> - - <p>Lines <a href="#ex2line51">51-58</a> add the target <code>foo</code> to - the list of targets to be compiled by Buildroot by first checking if - the configuration option for this package has been enabled - using the configuration tool. If so, it then "subscribes" - this package to be compiled by adding the package to the TARGETS - global variable. The name added to the TARGETS global - variable is the name of this package's target, as defined on - line <a href="#ex2line40">40</a>, which is used by Buildroot to download, - compile, and then install this package. </p> - - <h3><a name="gettext-integration"></a>Gettext integration and - interaction with packages</h3> + Buildroot, but is needed if you intend to download all required sources + at once for later offline build. Note that if you add a new package, + providing a <code>libfoo-source</code> target is <i>mandatory</i> to + support users that wish to do offline-builds. Furthermore, it eases + checking if all package-sources are downloadable.</p> + + <p>Lines <a href="#ex2line44">44-46</a> define a simple target to clean + the software build by calling the Makefile with the appropriate options. + The <code>-clean</code> target should run <code>make clean</code> on + $(BUILD_DIR)/package-version and MUST uninstall all files of the package + from $(STAGING_DIR) and from $(TARGET_DIR).</p> + + <p>Lines <a href="#ex2line48">48-49</a> define a simple target to + completely remove the directory in which the software was uncompressed, + configured and compiled. The <code>-dirclean</code> target MUST + completely rm $(BUILD_DIR)/ package-version.</p> + + <p>Lines <a href="#ex2line51">51-58</a> add the target <code>libfoo</code> + to the list of targets to be compiled by Buildroot, by first checking if + the configuration option for this package has been enabled using the + configuration tool. If so, it then "subscribes" this package + to be compiled by adding the package to the TARGETS global variable. + The name added to the TARGETS global variable is the name of this + package's target, as defined on line <a href="#ex2line40">40</a>, which + is used by Buildroot to download, compile, and then install this package. + </p> + + <h3 id="gettext-integration">Gettext integration and interaction with packages</h3> <p>Many packages that support internationalization use the gettext - library. Dependency on this library are fairly complicated and - therefore deserves a few explanations.</p> + library. Dependencies for this library are fairly complicated and therefore, + deserves some explanation.</p> - <p>The <i>uClibc</i> C library doesn't implement gettext - functionality, therefore with this C library, a separate gettext - must be compiled. On the other hand, the <i>glibc</i> C library - does integrate its own gettext, and in this case, the separate - gettext library should not be compiled, because it creates various - kind of build failures.</p> + <p>The <i>uClibc</i> C library doesn't implement gettext functionality, + therefore with this C library, a separate gettext must be compiled. On + the other hand, the <i>glibc</i> C library does integrate its own + gettext, and in this case, the separate gettext library should not be + compiled, because it creates various kinds of build failures.</p> - <p>Additionally, some packages (such as libglib2) do require - gettext unconditionally, while other packages (those who - support <code>--disable-nls</code> in general) only require - gettext when locale support is enabled.</p> + <p>Additionally, some packages (such as libglib2) do require gettext + unconditionally, while other packages (those who support + <code>--disable-nls</code> in general) only require gettext when locale + support is enabled.</p> <p>Therefore, Buildroot defines two configuration options:</p> @@ -1625,64 +1522,52 @@ LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP <li><code>BR2_NEEDS_GETTEXT</code>, which is true as soon as the toolchain doesn't provide its own gettext implementation</li> - <li><code>BR2_NEEDS_GETTEXT_IF_LOCALE</code>, which is true if - the toolchain doesn't provide its own gettext implementation and - if locale support is enabled</li> - - </ul> + <li><code>BR2_NEEDS_GETTEXT_IF_LOCALE</code>, which is true if the + toolchain doesn't provide its own gettext implementation and if locale + support is enabled</li> </ul> <p>Therefore, packages that unconditionally need gettext should:</p> <ol> - <li>Use <code>select BR2_PACKAGE_GETTEXT if - BR2_NEEDS_GETTEXT</code> and possibly <code>select - BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT</code> if libintl is - also needed</li> + <li>Use <code>select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT</code> + and possibly <code>select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT</code>, + if libintl is also needed</li> - <li>Use <code>$(if $(BR2_NEEDS_GETTEXT),gettext)</code> in the - package <code>DEPENDENCIES</code> variable</li> + <li>Use <code>$(if $(BR2_NEEDS_GETTEXT),gettext)</code> in the package + <code>DEPENDENCIES</code> variable</li> </ol> - <p>Packages that need gettext only when locale support is enabled - should:</p> + <p>Packages that need gettext only when locale support is enabled should: + </p> <ol> - <li>Use <code>select BR2_PACKAGE_GETTEXT if - BR2_NEEDS_GETTEXT_IF_LOCALE</code> and possibly <code>select - BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE</code> if - libintl is also needed</li> - - <li>Use <code>$(if - $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)</code> in the - package <code>DEPENDENCIES</code> variable</li> + <li>Use + <code>select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE</code> + and possibly + <code>select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE</code>, + if libintl is also needed</li> + + <li>Use <code>$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)</code> in + the package <code>DEPENDENCIES</code> variable</li> </ol> <h3>Conclusion</h3> <p>As you can see, adding a software package to Buildroot is simply a - matter of writing a Makefile using an existing - example and modifying it according to the compilation process required by - the package. </p> + matter of writing a Makefile using an existing example and modifying it + according to the compilation process required by the package.</p> - <p>If you package software that might be useful for other people, - don't forget to send a patch to Buildroot developers!</p> + <p>If you package software that might be useful for other people, don't + forget to send a patch to Buildroot developers!</p> - <h2><a name="links" id="links"></a>Resources</h2> + <h2 id="links">Resources</h2> - <p>To learn more about Buildroot you can visit these - websites:</p> + <p>To learn more about Buildroot you can visit these websites:</p> <ul> <li><a href="http://www.uclibc.org/">http://www.uclibc.org/</a></li> <li><a href="http://www.busybox.net/">http://www.busybox.net/</a></li> </ul> </div> -<!-- - <a href="http://validator.w3.org/check?uri=referer"><img - border="0" height="31" width="88" - src="images/valid-html401.png" - alt="Valid HTML"></img></a> ---> - </body> </html> diff --git a/docs/stylesheet.css b/docs/stylesheet.css index ac938c5c5..0feb32e8d 100644 --- a/docs/stylesheet.css +++ b/docs/stylesheet.css @@ -1,13 +1,13 @@ body { - margin: 0px 0px 0px 0px; + margin: 0px; color: white; background-color: #93c6f9; font: 12pt/18pt georgia; } div.main { - margin: 10px 10px 10px 10px; - padding: 10px 10px 10px 10px; + margin: 10px; + padding: 10px; color: black; background-color: white; } @@ -16,49 +16,49 @@ div.titre { text-align: center; background-color: #336699; color: white; - padding: 10px 10px 10px 10px; + padding: 10px; } h1 { text-align: center; - font: 26pt georgia; - letter-spacing: 3px; + font: 26pt georgia; + letter-spacing: 3px; } h2 { - padding: 5px 5px 5px 5px; + padding: 5px; background-color: #c2e0ff; color: #336699; } -a:link, a:visited { - font-weight: bold; - text-decoration: none; +a:link, a:visited { + font-weight: bold; + text-decoration: none; color: #336699; } -a:hover, a:active { - text-decoration: underline; +a:hover, a:active { + text-decoration: underline; color: #9685BA; } -h3 { - font: italic normal 14pt georgia; - letter-spacing: 1px; - margin-bottom: 0px; +h3 { + font: italic normal 14pt georgia; + letter-spacing: 1px; + margin-bottom: 0px; margin-left: 10px; margin-right: 10px; color: #336699; - border-bottom: 2px solid #336699; + border-bottom: 2px solid #336699; } -h4 { - font: italic normal 14pt georgia; - letter-spacing: 1px; - margin-bottom: 0px; +h4 { + font: italic normal 14pt georgia; + letter-spacing: 1px; + margin-bottom: 0px; margin-left: 10px; margin-right: 10px; - border-bottom: 1px dashed black; + border-bottom: 1px dashed black; } p { @@ -68,8 +68,8 @@ p { } pre { - border-left: 3px #aaa solid; - margin-left: 1em; - padding: 0 1em; - color: #888; -}
\ No newline at end of file + border-left: 3px #aaa solid; + margin-left: 1em; + padding: 0 1em; + color: #888; +} diff --git a/linux/Config.in b/linux/Config.in index 1e015b7fc..5191d01f8 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -19,10 +19,10 @@ if BR2_LINUX_KERNEL # choice prompt "Kernel version" - default BR2_LINUX_KERNEL_2_6_35 + default BR2_LINUX_KERNEL_2_6_36 -config BR2_LINUX_KERNEL_2_6_35 - bool "2.6.35.6" +config BR2_LINUX_KERNEL_2_6_36 + bool "2.6.36" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers" @@ -52,7 +52,7 @@ endchoice config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE string "Kernel version" depends on BR2_LINUX_KERNEL_CUSTOM_VERSION - default "2.6.35.6" + default "2.6.36" config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION string "URL of custom kernel tarball" @@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION config BR2_LINUX_KERNEL_VERSION string - default "2.6.35.6" if BR2_LINUX_KERNEL_2_6_35 + default "2.6.36" if BR2_LINUX_KERNEL_2_6_36 default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/package/Makefile.in b/package/Makefile.in index 85e655054..fb09083de 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -116,7 +116,11 @@ TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)- else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) +ifneq ($(TOOLCHAIN_EXTERNAL_PATH),) TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- +else +TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PREFIX)- +endif else ifeq ($(BR2_TOOLCHAIN_CTNG),y) TARGET_CROSS=$(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)- endif diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch new file mode 100644 index 000000000..b135c1463 --- /dev/null +++ b/package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.17.3/networking/dnsd.c busybox-1.17.3-dnsd/networking/dnsd.c +--- busybox-1.17.3/networking/dnsd.c 2010-10-09 21:57:14.000000000 +0200 ++++ busybox-1.17.3-dnsd/networking/dnsd.c 2010-10-29 00:37:43.066043841 +0200 +@@ -388,7 +388,7 @@ static int process_packet(struct dns_ent + query_len = strlen(query_string) + 1; + /* may be unaligned! */ + unaligned_type_class = (void *)(query_string + query_len); +- query_len += sizeof(unaligned_type_class); ++ query_len += sizeof(*unaligned_type_class); + /* where to append answer block */ + answb = (void *)(unaligned_type_class + 1); + diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch new file mode 100644 index 000000000..ebc9bf9f9 --- /dev/null +++ b/package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.17.3/coreutils/sort.c busybox-1.17.3-sort/coreutils/sort.c +--- busybox-1.17.3/coreutils/sort.c 2010-10-09 21:57:13.000000000 +0200 ++++ busybox-1.17.3-sort/coreutils/sort.c 2010-10-20 15:17:35.320293543 +0200 +@@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, cha + #if ENABLE_FEATURE_SORT_BIG + /* Open output file _after_ we read all input ones */ + if (option_mask32 & FLAG_o) +- xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO); ++ xmove_fd(xopen3(str_o, O_WRONLY|O_CREAT|O_TRUNC, 0666), STDOUT_FILENO); + #endif + flag = (option_mask32 & FLAG_z) ? '\0' : '\n'; + for (i = 0; i < linecount; i++) diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch new file mode 100644 index 000000000..dc3b02e22 --- /dev/null +++ b/package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.17.3/libbb/unicode.c busybox-1.17.3-unicode/libbb/unicode.c +--- busybox-1.17.3/libbb/unicode.c 2010-10-09 21:58:13.000000000 +0200 ++++ busybox-1.17.3-unicode/libbb/unicode.c 2010-10-29 00:48:36.951494079 +0200 +@@ -1006,7 +1006,7 @@ static char* FAST_FUNC unicode_conv_to_p + } + } + if (stats) +- stats->byte_count = stats->unicode_count = (d - dst); ++ stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst); + return dst; + } + diff --git a/package/games/prboom/prboom-2.5.0-libpng-1.4.patch b/package/games/prboom/prboom-2.5.0-libpng-1.4.patch new file mode 100644 index 000000000..0d2a3a5ba --- /dev/null +++ b/package/games/prboom/prboom-2.5.0-libpng-1.4.patch @@ -0,0 +1,32 @@ +[PATCH] fix build with libpng 1.4.x + +In 1.4.x the png_*_NULL defines are gone. Replace them with a normal +NULL instead. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + src/SDL/i_sshot.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: prboom-2.5.0/src/SDL/i_sshot.c +=================================================================== +--- prboom-2.5.0.orig/src/SDL/i_sshot.c ++++ prboom-2.5.0/src/SDL/i_sshot.c +@@ -231,7 +231,7 @@ int I_ScreenShot (const char *fname) + if (fp) + { + png_struct *png_ptr = png_create_write_struct( +- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); ++ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); + + if (png_ptr) + { +@@ -279,7 +279,7 @@ int I_ScreenShot (const char *fname) + break; + } + } +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + } + fclose(fp); + } diff --git a/package/games/prboom/prboom.mk b/package/games/prboom/prboom.mk index 228c78886..3a50fd502 100644 --- a/package/games/prboom/prboom.mk +++ b/package/games/prboom/prboom.mk @@ -3,20 +3,26 @@ # PrBoom # ############################################################# -PRBOOM_VERSION = 2.4.7 +PRBOOM_VERSION = 2.5.0 +PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes PRBOOM_DEPENDENCIES = sdl SDL_net sdl_mixer +ifeq ($(BR2_PACKAGE_LIBPNG),y) +PRBOOM_DEPENDENCIES += libpng +endif + PRBOOM_CONF_OPT = \ --oldincludedir=$(STAGING_DIR)/usr/include \ --with-sdl-prefix=$(STAGING_DIR)/usr \ --with-sdl-exec-prefix=$(STAGING_DIR)/usr \ --disable-cpu-opt \ --disable-sdltest \ - --disable-gl \ - --without-x + --disable-gl +# endianness detection isn't used when cross compiling define PRBOOM_BIG_ENDIAN_FIXUP - $(SED) 's,.*#undef WORDS_BIGENDIAN.*,#define WORDS_BIGENDIAN 1,g' $(PRBOOM_DIR)/config.h + $(SED) 's,.*#undef WORDS_BIGENDIAN.*,#define WORDS_BIGENDIAN 1,g' \ + $(PRBOOM_DIR)/config.h endef ifeq ($(BR2_ENDIAN),"BIG") diff --git a/package/haserl/Config.in b/package/haserl/Config.in index a8d2ee5a8..23101c43f 100644 --- a/package/haserl/Config.in +++ b/package/haserl/Config.in @@ -38,4 +38,4 @@ endchoice config BR2_PACKAGE_HASERL_VERSION string default "0.8.0" if BR2_PACKAGE_HASERL_VERSION_0_8_X - default "0.9.26" if BR2_PACKAGE_HASERL_VERSION_0_9_X + default "0.9.27" if BR2_PACKAGE_HASERL_VERSION_0_9_X diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 133796e20..376a087b4 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -10,16 +10,14 @@ config BR2_PACKAGE_HOSTAPD http://hostap.epitest.fi/ -config BR2_PACKAGE_HOSTAPD_EXTRA_EAP - bool "Enable EAP TLS/TTLS/MSCHAPv2/PEAP" +config BR2_PACKAGE_HOSTAPD_EAP + bool "Enable EAP" depends on BR2_PACKAGE_HOSTAPD - select BR2_PACKAGE_OPENSSL help - Enable support for extra EAP methods TLS, TTLS, MSCHAPv2 and PEAP. + Enable support for EAP and RADIUS. config BR2_PACKAGE_HOSTAPD_WPS bool "Enable WPS" depends on BR2_PACKAGE_HOSTAPD - select BR2_PACKAGE_OPENSSL help Enable support for Wi-Fi Protected Setup. diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 4065d7b66..27689b8fc 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -1,46 +1,66 @@ -############################################################# +############################################################## # # hostapd # ############################################################# -HOSTAPD_VERSION = 0.7.2 +HOSTAPD_VERSION = 0.7.3 HOSTAPD_SITE = http://hostap.epitest.fi/releases HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config HOSTAPD_DEPENDENCIES = libnl -ifeq ($(BR2_PACKAGE_OPENSSL),y) - HOSTAPD_DEPENDENCIES += openssl - # OpenSSL is required for EXTRA_EAP and/or WPS - # We take care of that in Config.in -else -define HOSTAPD_OPENSSL_CONF +define HOSTAPD_CRYPTO_CONFIG echo "CONFIG_CRYPTO=internal" >>$(HOSTAPD_CONFIG) echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_TLS=internal" >>$(HOSTAPD_CONFIG) + echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(HOSTAPD_CONFIG) endef -endif -ifneq ($(BR2_INET_IPV6),y) -define HOSTAPD_IPV6_CONF - $(SED) "s/CONFIG_IPV6=y//" $(HOSTAPD_CONFIG) +# Try to use openssl for TLS if it's already available +# gnutls is also supported for TLS +ifeq ($(BR2_PACKAGE_OPENSSL),y) + HOSTAPD_DEPENDENCIES += openssl +define HOSTAPD_TLS_CONFIG + echo "CONFIG_TLS=openssl" >>$(HOSTAPD_CONFIG) +endef +else +define HOSTAPD_TLS_CONFIG + echo "CONFIG_TLS=internal" >>$(HOSTAPD_CONFIG) endef endif -ifneq ($(BR2_PACKAGE_HOSTAPD_EXTRA_EAP),y) -define HOSTAPD_EXTRA_EAP_CONF +ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y) +define HOSTAPD_EAP_CONFIG $(SED) "s/CONFIG_EAP_MSCHAPV2=y//" $(HOSTAPD_CONFIG) $(SED) "s/CONFIG_EAP_PEAP=y//" $(HOSTAPD_CONFIG) $(SED) "s/CONFIG_EAP_TLS=y//" $(HOSTAPD_CONFIG) $(SED) "s/CONFIG_EAP_TTLS=y//" $(HOSTAPD_CONFIG) + echo "CONFIG_EAP_AKA=y" >>$(HOSTAPD_CONFIG) + echo "CONFIG_EAP_AKA_PRIME=y" >>$(HOSTAPD_CONFIG) + echo "CONFIG_EAP_GPSK=y" >>$(HOSTAPD_CONFIG) + echo "CONFIG_EAP_GPSK_SHA256=y" >>$(HOSTAPD_CONFIG) + echo "CONFIG_EAP_PAX=y" >>$(HOSTAPD_CONFIG) + echo "CONFIG_EAP_PSK=y" >>$(HOSTAPD_CONFIG) + echo "CONFIG_EAP_SAKE=y" >>$(HOSTAPD_CONFIG) + echo "CONFIG_EAP_SIM=y" >>$(HOSTAPD_CONFIG) + echo "CONFIG_RADIUS_SERVER=y" >>$(HOSTAPD_CONFIG) +endef +ifeq ($(BR2_INET_IPV6),y) +define HOSTAPD_RADIUS_IPV6_CONFIG + $(SED) "s/^#CONFIG_IPV6/CONFIG_IPV6/" $(HOSTAPD_CONFIG) +endef +endif +else +define HOSTAPD_EAP_CONFIG + $(SED) "s/^CONFIG_EAP/#CONFIG_EAP/g" $(HOSTAPD_CONFIG) + $(SED) "s/^#CONFIG_NO_ACCOUNTING/CONFIG_NO_ACCOUNTING/" $(HOSTAPD_CONFIG) + $(SED) "s/^#CONFIG_NO_RADIUS/CONFIG_NO_RADIUS/" $(HOSTAPD_CONFIG) endef endif ifeq ($(BR2_PACKAGE_HOSTAPD_WPS),y) -define HOSTAPD_WPS_CONF - echo "CONFIG_WPS=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_WPS_UPNP=y" >>$(HOSTAPD_CONFIG) +define HOSTAPD_WPS_CONFIG + $(SED) "s/^#CONFIG_WPS/CONFIG_WPS/g" $(HOSTAPD_CONFIG) endef endif @@ -50,28 +70,18 @@ define HOSTAPD_CONFIGURE_CMDS echo "CFLAGS += $(TARGET_CFLAGS)" >>$(HOSTAPD_CONFIG) echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(HOSTAPD_CONFIG) echo "CC = $(TARGET_CC)" >>$(HOSTAPD_CONFIG) -# EAP - echo "CONFIG_EAP_AKA=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_AKA_PRIME=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_GPSK=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_GPSK_SHA256=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_PAX=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_PSK=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_SAKE=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_SIM=y" >>$(HOSTAPD_CONFIG) # Drivers - echo "CONFIG_DRIVER_WIRED=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_DRIVER_PRISM54=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_DRIVER_NL80211=y" >>$(HOSTAPD_CONFIG) + $(SED) "s/^#CONFIG_DRIVER_WIRED/CONFIG_DRIVER_WIRED/" $(HOSTAPD_CONFIG) + $(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(HOSTAPD_CONFIG) # Misc - echo "CONFIG_IEEE80211N=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_IEEE80211R=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_IEEE80211W=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_RADIUS_SERVER=y" >>$(HOSTAPD_CONFIG) - $(HOSTAPD_OPENSSL_CONF) - $(HOSTAPD_IPV6_CONF) - $(HOSTAPD_EXTRA_EAP_CONF) - $(HOSTAPD_WPS_CONF) + $(SED) "s/^CONFIG_IPV6/#CONFIG_IPV6/" $(HOSTAPD_CONFIG) + $(SED) "s/^#CONFIG_IEEE80211N/CONFIG_IEEE80211N/" $(HOSTAPD_CONFIG) + $(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(HOSTAPD_CONFIG) + $(HOSTAPD_CRYPTO_CONFIG) + $(HOSTAPD_TLS_CONFIG) + $(HOSTAPD_RADIUS_IPV6_CONFIG) + $(HOSTAPD_EAP_CONFIG) + $(HOSTAPD_WPS_CONFIG) endef define HOSTAPD_INSTALL_TARGET_CMDS diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 58ecc87bb..ae2d433de 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -3,7 +3,7 @@ # mtd provides jffs2 utilities # ############################################################# -MTD_VERSION:=1.4.0 +MTD_VERSION:=1.4.1 MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE:=ftp://ftp.infradead.org/pub/mtd-utils ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y) diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk index 5447b6c1c..ee9d9bc5d 100644 --- a/package/multimedia/alsa-lib/alsa-lib.mk +++ b/package/multimedia/alsa-lib/alsa-lib.mk @@ -3,7 +3,7 @@ # alsa-lib # ############################################################# -ALSA_LIB_VERSION = 1.0.22 +ALSA_LIB_VERSION = 1.0.23 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib ALSA_LIB_INSTALL_STAGING = YES diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 47c792f74..0fe2bc886 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -9,6 +9,7 @@ NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/n NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz NETSNMP_INSTALL_STAGING = YES NETSNMP_LIBTOOL_PATCH = NO +NETSNMP_MAKE = $(MAKE1) NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=yes NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \ --with-defaults --enable-mini-agent --without-rpm \ @@ -40,14 +41,14 @@ ifneq ($(BR2_HAVE_DOCUMENTATION),y) endif define NETSNMP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ DESTDIR=$(TARGET_DIR) install $(INSTALL) -D -m 0755 package/netsnmp/S59snmpd \ $(TARGET_DIR)/etc/init.d/S59snmpd endef define NETSNMP_UNINSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ DESTDIR=$(TARGET_DIR) uninstall rm -f $(TARGET_DIR)/etc/init.d/S59snmpd rm -f $(TARGET_DIR)/usr/lib/libnetsnmp* diff --git a/package/ng-spice-rework/Config.in b/package/ng-spice-rework/Config.in index a82f439fc..de5d091e0 100644 --- a/package/ng-spice-rework/Config.in +++ b/package/ng-spice-rework/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NG_SPICE_REWORK bool "ng-spice-rework" + depends on BR2_DEPRECATED depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXAW help diff --git a/package/openssl/openssl-nofips.patch b/package/openssl/openssl-nofips.patch deleted file mode 100644 index 0edea3ebc..000000000 --- a/package/openssl/openssl-nofips.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nura openssl-0.9.8k/Makefile.org openssl-0.9.8k.nofips/Makefile.org ---- openssl-0.9.8k/Makefile.org 2009-03-03 20:40:29.000000000 -0200 -+++ openssl-0.9.8k.nofips/Makefile.org 2009-03-26 09:50:27.000000000 -0300 -@@ -131,7 +131,7 @@ - - BASEADDR= - --DIRS= crypto fips ssl engines apps test tools -+DIRS= crypto ssl engines apps test tools - SHLIBDIRS= crypto ssl fips - - # dirs in crypto to build diff --git a/package/openssl/openssl-optional-ipv6.patch b/package/openssl/openssl-optional-ipv6.patch deleted file mode 100644 index 2876058bd..000000000 --- a/package/openssl/openssl-optional-ipv6.patch +++ /dev/null @@ -1,55 +0,0 @@ -[PATCH] openssl: fix build without IPv6 support - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - crypto/bio/bss_dgram.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -Index: openssl-0.9.8n/crypto/bio/bss_dgram.c -=================================================================== ---- openssl-0.9.8n.orig/crypto/bio/bss_dgram.c -+++ openssl-0.9.8n/crypto/bio/bss_dgram.c -@@ -61,6 +61,12 @@ - - #include <stdio.h> - #include <errno.h> -+#include <features.h> -+ -+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__) -+#define NO_IPV6 -+#endif -+ - #define USE_SOCKETS - #include "cryptlib.h" - -@@ -429,12 +435,14 @@ static long dgram_ctrl(BIO *b, int cmd, - &sockopt_val, sizeof(sockopt_val))) < 0) - perror("setsockopt"); - break; -+#ifndef NO_IPV6 - case AF_INET6: - sockopt_val = IPV6_PMTUDISC_DO; - if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER, - &sockopt_val, sizeof(sockopt_val))) < 0) - perror("setsockopt"); - break; -+#endif - default: - ret = -1; - break; -@@ -470,6 +478,7 @@ static long dgram_ctrl(BIO *b, int cmd, - ret = data->mtu; - } - break; -+#ifndef NO_IPV6 - case AF_INET6: - if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU, (void *)&sockopt_val, - &sockopt_len)) < 0 || sockopt_val < 0) -@@ -485,6 +494,7 @@ static long dgram_ctrl(BIO *b, int cmd, - ret = data->mtu; - } - break; -+#endif - default: - ret = 0; - break; diff --git a/package/openssl/openssl-uclibc-susv3-legacy.patch b/package/openssl/openssl-uclibc-susv3-legacy.patch deleted file mode 100644 index eb1d27798..000000000 --- a/package/openssl/openssl-uclibc-susv3-legacy.patch +++ /dev/null @@ -1,18 +0,0 @@ -sys/timeb.h / ftime are legacy, so don't enable them for uClibc ---- - apps/speed.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: openssl-0.9.8g/apps/speed.c -=================================================================== ---- openssl-0.9.8g.orig/apps/speed.c -+++ openssl-0.9.8g/apps/speed.c -@@ -113,7 +113,7 @@ - #elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) - # define TIMES - #endif --#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */ -+#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) && !defined(__UCLIBC__) /* FIXME */ - # define TIMEB - #endif - diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index 22b14f255..de20b8191 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -3,19 +3,28 @@ # openssl # ############################################################# -OPENSSL_VERSION:=0.9.8o -OPENSSL_SITE:=http://www.openssl.org/source + +OPENSSL_VERSION = 1.0.0a +OPENSSL_SITE = http://www.openssl.org/source OPENSSL_INSTALL_STAGING = YES OPENSSL_DEPENDENCIES = zlib - -OPENSSL_TARGET_ARCH=generic32 +OPENSSL_TARGET_ARCH = generic32 # Some architectures are optimized in OpenSSL +ifeq ($(ARCH),arm) +ifneq ($(BR2_generic_arm),y) +ifneq ($(BR2_arm610),y) +ifneq ($(BR2_arm710),y) + OPENSSL_TARGET_ARCH = armv4 +endif +endif +endif +endif ifeq ($(ARCH),powerpc) -OPENSSL_TARGET_ARCH=ppc + OPENSSL_TARGET_ARCH = ppc endif ifeq ($(ARCH),x86_64) -OPENSSL_TARGET_ARCH=x86_64 + OPENSSL_TARGET_ARCH = x86_64 endif define OPENSSL_CONFIGURE_CMDS diff --git a/package/pppd/Config.in b/package/pppd/Config.in index daca87613..879b263cf 100644 --- a/package/pppd/Config.in +++ b/package/pppd/Config.in @@ -13,3 +13,9 @@ config BR2_PACKAGE_PPPD_FILTER Packet filtering abilities for pppd. If enabled, the pppd active-filter and pass-filter options are available. + +config BR2_PACKAGE_PPPD_RADIUS + depends on BR2_PACKAGE_PPPD + bool "radius" + help + Install RADIUS support for pppd diff --git a/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch b/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch new file mode 100644 index 000000000..0e71e2409 --- /dev/null +++ b/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch @@ -0,0 +1,24 @@ +--- ppp-2.4.5/include/linux/if_pppol2tp.h 2009-11-16 22:26:07.000000000 +0000 ++++ ppp-2.4.5/include/linux/if_pppol2tp.h 2010-07-16 22:35:22.000000000 +0100 +@@ -32,6 +32,20 @@ + __u16 d_tunnel, d_session; /* For sending outgoing packets */ + }; + ++/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 ++ * bits. So we need a different sockaddr structure. ++ */ ++struct pppol2tpv3_addr { ++ pid_t pid; /* pid that owns the fd. ++ * 0 => current */ ++ int fd; /* FD of UDP or IP socket to use */ ++ ++ struct sockaddr_in addr; /* IP address and port to send to */ ++ ++ __u32 s_tunnel, s_session; /* For matching incoming packets */ ++ __u32 d_tunnel, d_session; /* For sending outgoing packets */ ++}; ++ + /* Socket options: + * DEBUG - bitmask of debug message categories + * SENDSEQ - 0 => don't send packets with sequence numbers + diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 35fd451d7..05c1c32c9 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -9,7 +9,10 @@ PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz PPPD_SITE = ftp://ftp.samba.org/pub/ppp PPPD_TARGET_BINS = chat pppd pppdump pppstats PPPD_MANPAGES = $(if $(BR2_HAVE_DOCUMENTATION),chat pppd pppdump pppstats) -PPPD_MAKE = $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" -C $(PPPD_DIR) $(PPPD_MAKE_OPT) +PPPD_RADIUS_MANPAGES = $(if $(BR2_HAVE_DOCUMENTATION),pppd-radattr pppd-radius) +PPPD_RADIUS_CONF = dictionary dictionary.ascend dictionary.compat \ + dictionary.merit dictionary.microsoft \ + issue port-id-map realms server radiusclient.conf ifeq ($(BR2_PACKAGE_PPPD_FILTER),y) PPPD_DEPENDENCIES += libpcap @@ -20,15 +23,56 @@ ifeq ($(BR2_INET_IPV6),y) PPPD_MAKE_OPT += HAVE_INET6=y endif -$(eval $(call AUTOTARGETS,package,pppd)) - -$(PPPD_HOOK_POST_EXTRACT): +define PPPD_CONFIGURE_CMDS $(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux $(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux - touch $@ + ( cd $(@D); ./configure ) +endef + +define PPPD_BUILD_CMDS + $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \ + -C $(@D) $(PPPD_MAKE_OPT) +endef + +define PPPD_UNINSTALL_TARGET_CMDS + rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(PPPD_TARGET_BINS)) + rm -f $(TARGET_DIR)/usr/sbin/pppoe-discovery + rm -rf $(TARGET_DIR)/usr/lib/pppd + rm -rf $(TARGET_DIR)/etc/ppp/radius + for m in $(PPPD_MANPAGES); do \ + rm -f $(TARGET_DIR)/usr/share/man/man8/$$m.8; \ + done + for m in $(PPPD_RADIUS_MANPAGES); do \ + rm -f $(TARGET_DIR)/usr/share/man/man8/$$m.8; \ + done +endef + +ifeq ($(BR2_PACKAGE_PPPD_RADIUS),y) +define PPPD_INSTALL_RADIUS + $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radattr.so \ + $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radattr.so + $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radius.so \ + $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radius.so + $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radrealms.so \ + $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radrealms.so + for m in $(PPPD_RADIUS_CONF); do \ + $(INSTALL) -m 644 -D $(PPPD_DIR)/pppd/plugins/radius/etc/$$m \ + $(TARGET_DIR)/etc/ppp/radius/$$m; \ + done + $(SED) 's:/usr/local/etc:/etc:' \ + $(TARGET_DIR)/etc/ppp/radius/radiusclient.conf + $(SED) 's:/usr/local/sbin:/usr/sbin:' \ + $(TARGET_DIR)/etc/ppp/radius/radiusclient.conf + $(SED) 's:/etc/radiusclient:/etc/ppp/radius:g' \ + $(TARGET_DIR)/etc/ppp/radius/* + for m in $(PPPD_RADIUS_MANPAGES); do \ + $(INSTALL) -m 644 -D $(PPPD_DIR)/pppd/plugins/radius/$$m.8 \ + $(TARGET_DIR)/usr/share/man/man8/$$m.8; \ + done +endef +endif -$(PPPD_TARGET_INSTALL_TARGET): - $(call MESSAGE,"Installing to target") +define PPPD_INSTALL_TARGET_CMDS for sbin in $(PPPD_TARGET_BINS); do \ $(INSTALL) -D $(PPPD_DIR)/$$sbin/$$sbin \ $(TARGET_DIR)/usr/sbin/$$sbin; \ @@ -51,24 +95,11 @@ $(PPPD_TARGET_INSTALL_TARGET): $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/openl2tp.so $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/pppol2tp/pppol2tp.so \ $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/pppol2tp.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radattr.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radattr.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radius.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radius.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radrealms.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radrealms.so + $(PPPD_INSTALL_RADIUS) for m in $(PPPD_MANPAGES); do \ $(INSTALL) -m 644 -D $(PPPD_DIR)/$$m/$$m.8 \ $(TARGET_DIR)/usr/share/man/man8/$$m.8; \ done - touch $@ +endef -$(PPPD_TARGET_UNINSTALL): - $(call MESSAGE,"Uninstalling") - rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(PPPD_TARGET_BINS)) - rm -f $(TARGET_DIR)/usr/sbin/pppoe-discovery - for m in $(PPPD_MANPAGES); do \ - rm -f $(TARGET_DIR)/usr/share/man/man8/$$m.8; \ - done - rm -rf $(TARGET_DIR)/usr/lib/pppd - rm -f $(PPPD_TARGET_INSTALL_TARGET) $(PPPD_HOOK_POST_INSTALL) +$(eval $(call GENTARGETS,package,pppd)) diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk index ec4a8959e..ad669ac07 100644 --- a/package/startup-notification/startup-notification.mk +++ b/package/startup-notification/startup-notification.mk @@ -12,6 +12,9 @@ STARTUP_NOTIFICATION_INSTALL_TARGET = YES STARTUP_NOTIFICATION_DEPENDENCIES = xlib_libX11 STARTUP_NOTIFICATION_CONF_ENV = lf_cv_sane_realloc=yes +STARTUP_NOTIFICATION_CONF_OPT = --with-x \ + --x-includes="$(STAGING_DIR)/usr/include/X11" \ + --x-libraries="$(STAGING_DIR)/usr/lib" $(eval $(call AUTOTARGETS,package,startup-notification)) diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk index 03477d175..2b1cb8d8b 100644 --- a/package/torsmo/torsmo.mk +++ b/package/torsmo/torsmo.mk @@ -10,6 +10,8 @@ TORSMO_AUTORECONF = NO TORSMO_INSTALL_STAGING = NO TORSMO_INSTALL_TARGET = YES +# help2man doesn't work when cross compiling +TORSMO_CONF_ENV = ac_cv_path_HELP2MAN='' TORSMO_CONF_OPT = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries="-I$(STAGING_DIR)/usr/lib" --with-x TORSMO_DEPENDENCIES = xserver_xorg-server diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index c8c68d27b..64a56ccf2 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -19,6 +19,11 @@ VSFTPD_LIBS += -lssl VSFTPD_POST_CONFIGURE_HOOKS += VSFTPD_ENABLE_SSL endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +VSFTPD_DEPENDENCIES += libcap +VSFTPD_LIBS += -lcap +endif + define VSFTPD_BUILD_CMDS $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(@D) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 4b5023972..e3df2b4d8 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -6,17 +6,10 @@ config BR2_PACKAGE_WPA_SUPPLICANT http://hostap.epitest.fi/wpa_supplicant/ config BR2_PACKAGE_WPA_SUPPLICANT_EAP - bool "Enable WPA with EAP" + bool "Enable EAP" depends on BR2_PACKAGE_WPA_SUPPLICANT help - Enable WPA with EAP (IEEE 802.1X) - -config BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL - bool "Use openssl TLS (recommended)" - depends on BR2_PACKAGE_WPA_SUPPLICANT && BR2_PACKAGE_WPA_SUPPLICANT_EAP - select BR2_PACKAGE_OPENSSL - help - Use OpenSSL's TLS implementation instead of internal libtommath. + Enable support for EAP. config BR2_PACKAGE_WPA_SUPPLICANT_CLI bool "Install wpa_cli binary" diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index cebc4fb6b..bfd20ab1e 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -4,7 +4,7 @@ # ############################################################# -WPA_SUPPLICANT_VERSION = 0.6.10 +WPA_SUPPLICANT_VERSION = 0.7.3 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases WPA_SUPPLICANT_LIBTOOL_PATCH = NO WPA_SUPPLICANT_DEPENDENCIES = @@ -16,28 +16,34 @@ WPA_SUPPLICANT_DBUS_SERVICE = fi.epitest.hostap.WPASupplicant ifeq ($(BR2_PACKAGE_LIBNL),y) WPA_SUPPLICANT_DEPENDENCIES += libnl define WPA_SUPPLICANT_LIBNL_CONFIG - echo "CONFIG_DRIVER_NL80211=y" >>$(WPA_SUPPLICANT_CONFIG) + $(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(WPA_SUPPLICANT_CONFIG) endef endif ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y) -define WPA_SUPPLICANT_CRYPTO_CONFIG +define WPA_SUPPLICANT_EAP_CONFIG $(SED) "s/^CONFIG_EAP_*/#CONFIG_EAP_/g" $(WPA_SUPPLICANT_CONFIG) - echo "CONFIG_TLS=none" >>$(WPA_SUPPLICANT_CONFIG) endef -else -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL),y) - WPA_SUPPLICANT_DEPENDENCIES += openssl +endif + define WPA_SUPPLICANT_CRYPTO_CONFIG + echo "CONFIG_CRYPTO=internal" >>$(WPA_SUPPLICANT_CONFIG) + echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(WPA_SUPPLICANT_CONFIG) + echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(WPA_SUPPLICANT_CONFIG) +endef + +# Try to use openssl for TLS if it's already available +# gnutls is also supported for TLS +ifeq ($(BR2_PACKAGE_OPENSSL),y) + WPA_SUPPLICANT_DEPENDENCIES += openssl +define WPA_SUPPLICANT_TLS_CONFIG echo "CONFIG_TLS=openssl" >>$(WPA_SUPPLICANT_CONFIG) endef else -define WPA_SUPPLICANT_CRYPTO_CONFIG +define WPA_SUPPLICANT_TLS_CONFIG echo "CONFIG_TLS=internal" >>$(WPA_SUPPLICANT_CONFIG) - echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(WPA_SUPPLICANT_CONFIG) endef endif -endif ifeq ($(BR2_PACKAGE_DBUS),y) WPA_SUPPLICANT_DEPENDENCIES += host-pkg-config dbus @@ -45,7 +51,7 @@ ifeq ($(BR2_PACKAGE_DBUS),y) PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" define WPA_SUPPLICANT_DBUS_CONFIG - echo "CONFIG_CTRL_IFACE_DBUS=y" >>$(WPA_SUPPLICANT_CONFIG) + $(SED) "s/^#CONFIG_CTRL_IFACE_DBUS/CONFIG_CTRL_IFACE_DBUS/" $(WPA_SUPPLICANT_CONFIG) endef endif @@ -54,8 +60,14 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS echo "CFLAGS += $(TARGET_CFLAGS)" >>$(WPA_SUPPLICANT_CONFIG) echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(WPA_SUPPLICANT_CONFIG) echo "CC = $(TARGET_CC)" >>$(WPA_SUPPLICANT_CONFIG) + $(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(WPA_SUPPLICANT_CONFIG) + $(SED) "s/^#CONFIG_DELAYED_MIC/CONFIG_DELAYED_MIC/" $(WPA_SUPPLICANT_CONFIG) + $(SED) "s/^CONFIG_DRIVER_ATMEL/#CONFIG_DRIVER_ATMEL/" $(WPA_SUPPLICANT_CONFIG) + $(SED) "s/^CONFIG_SMARTCARD/#CONFIG_SMARTCARD/" $(WPA_SUPPLICANT_CONFIG) $(SED) "s/\/local//" $(@D)/wpa_supplicant/Makefile $(WPA_SUPPLICANT_CRYPTO_CONFIG) + $(WPA_SUPPLICANT_TLS_CONFIG) + $(WPA_SUPPLICANT_EAP_CONFIG) $(WPA_SUPPLICANT_LIBNL_CONFIG) $(WPA_SUPPLICANT_DBUS_CONFIG) endef @@ -78,10 +90,10 @@ endif define WPA_SUPPLICANT_INSTALL_DBUS $(INSTALL) -D \ - $(@D)/wpa_supplicant/dbus-wpa_supplicant.conf \ + $(@D)/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \ $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf $(INSTALL) -D \ - $(@D)/wpa_supplicant/dbus-wpa_supplicant.service \ + $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_SERVICE).service \ $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service endef diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk index c42ffa4a5..746564ffd 100644 --- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk +++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XCURSORGEN_VERSION = 1.0.3 +XAPP_XCURSORGEN_VERSION = 1.0.4 XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2 XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XCURSORGEN_AUTORECONF = NO diff --git a/package/x11r7/xapp_xinput/Config.in b/package/x11r7/xapp_xinput/Config.in index 55c47accf..2505dd349 100644 --- a/package/x11r7/xapp_xinput/Config.in +++ b/package/x11r7/xapp_xinput/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_XAPP_XINPUT bool "xinput" select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXI help xinput diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk index 20d23f283..423c7c2f0 100644 --- a/package/x11r7/xapp_xinput/xapp_xinput.mk +++ b/package/x11r7/xapp_xinput/xapp_xinput.mk @@ -8,6 +8,6 @@ XAPP_XINPUT_VERSION = 1.5.0 XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2 XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XINPUT_AUTORECONF = NO -XAPP_XINPUT_DEPENDENCIES = xlib_libX11 +XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi $(eval $(call AUTOTARGETS,package/x11r7,xapp_xinput)) diff --git a/package/x11r7/xapp_xmore/Config.in b/package/x11r7/xapp_xmore/Config.in index 877d6fb78..23fd1477b 100644 --- a/package/x11r7/xapp_xmore/Config.in +++ b/package/x11r7/xapp_xmore/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_XAPP_XMORE bool "xmore" select BR2_PACKAGE_XLIB_LIBXPRINTUTIL - select BR2_PACKAGE_XLIB_LIBXPRINTUTIL + select BR2_PACKAGE_XLIB_LIBXAW help plain text display program for the X Window System diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk index 8471ebb50..0b68e7196 100644 --- a/package/x11r7/xapp_xmore/xapp_xmore.mk +++ b/package/x11r7/xapp_xmore/xapp_xmore.mk @@ -8,6 +8,6 @@ XAPP_XMORE_VERSION = 1.0.1 XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2 XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XMORE_AUTORECONF = NO -XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXprintUtil +XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXaw $(eval $(call AUTOTARGETS,package/x11r7,xapp_xmore)) diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index fa795781c..d3cde7609 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -6,7 +6,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" - default BR2_KERNEL_HEADERS_2_6_35 + default BR2_KERNEL_HEADERS_2_6_36 help Select the version of kernel header files you wish to use. @@ -16,10 +16,6 @@ choice For the snapshot, you have to provide the linux-2.6.tar.bz2 tarball in your download dir. - config BR2_KERNEL_HEADERS_2_6_29 - bool "Linux 2.6.29.x kernel headers" - depends on BR2_DEPRECATED - config BR2_KERNEL_HEADERS_2_6_30 bool "Linux 2.6.30.x kernel headers" depends on BR2_DEPRECATED @@ -33,6 +29,7 @@ choice depends on BR2_DEPRECATED config BR2_KERNEL_HEADERS_2_6_33 + depends on BR2_DEPRECATED bool "Linux 2.6.33.x kernel headers" config BR2_KERNEL_HEADERS_2_6_34 @@ -41,6 +38,9 @@ choice config BR2_KERNEL_HEADERS_2_6_35 bool "Linux 2.6.35.x kernel headers" + config BR2_KERNEL_HEADERS_2_6_36 + bool "Linux 2.6.36.x kernel headers" + config BR2_KERNEL_HEADERS_VERSION bool "Linux 2.6 (manually specified version)" @@ -57,12 +57,12 @@ config BR2_DEFAULT_KERNEL_VERSION config BR2_DEFAULT_KERNEL_HEADERS string - default "2.6.29.6" if BR2_KERNEL_HEADERS_2_6_29 default "2.6.30.10" if BR2_KERNEL_HEADERS_2_6_30 default "2.6.31.14" if BR2_KERNEL_HEADERS_2_6_31 - default "2.6.32.24" if BR2_KERNEL_HEADERS_2_6_32 + default "2.6.32.25" if BR2_KERNEL_HEADERS_2_6_32 default "2.6.33.7" if BR2_KERNEL_HEADERS_2_6_33 default "2.6.34.7" if BR2_KERNEL_HEADERS_2_6_34 - default "2.6.35.6" if BR2_KERNEL_HEADERS_2_6_35 + default "2.6.35.8" if BR2_KERNEL_HEADERS_2_6_35 + default "2.6.36" if BR2_KERNEL_HEADERS_2_6_36 default "2.6" if BR2_KERNEL_HEADERS_SNAP default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 7b8989bbc..bb7ee3c40 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -13,14 +13,6 @@ LINUX_HEADERS_SITE:=127.0.0.1 LINUX_HEADERS_SOURCE:=unspecified-kernel-headers LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-libc-headers-null -KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \ - -e s/i.86/i386/ -e s/sun4u/sparc64/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ \ - -e s/parisc64/parisc/ \ - -e s/powerpc64/powerpc/ \ - -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ - -e s/sh.*/sh/") - include toolchain/kernel-headers/kernel-headers-new.makefile $(DL_DIR)/$(LINUX_HEADERS_SOURCE): diff --git a/toolchain/kernel-headers/linux-2.6.32.24-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.32.25-scsi-use-__uX-types-for-headers-exported-to-user-space.patch index 2fc6176e8..2fc6176e8 100644 --- a/toolchain/kernel-headers/linux-2.6.32.24-scsi-use-__uX-types-for-headers-exported-to-user-space.patch +++ b/toolchain/kernel-headers/linux-2.6.32.25-scsi-use-__uX-types-for-headers-exported-to-user-space.patch diff --git a/toolchain/kernel-headers/linux-2.6.35.6-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.35.8-scsi-use-__uX-types-for-headers-exported-to-user-space.patch index 1089c7106..1089c7106 100644 --- a/toolchain/kernel-headers/linux-2.6.35.6-scsi-use-__uX-types-for-headers-exported-to-user-space.patch +++ b/toolchain/kernel-headers/linux-2.6.35.8-scsi-use-__uX-types-for-headers-exported-to-user-space.patch |