Commit Graph

7301 Commits

Author SHA1 Message Date
Thomas Petazzoni
d25c560ab2 cramfs/jffs2: use the new ROOTFS_DEVICE_TABLE variable
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-17 04:36:23 +02:00
Thomas Petazzoni
64ec20e6c0 fs: change the way the device table is configured
Until now, the location of the device table was specified by a
variable in board Makefiles. Unfortunately, this variable is not
accessible from fs/common.mk, since the target/ code is included
*after* fs/common.mk.

Anyway, the general idea is to move away from these boards Makefile,
and provide configuration option for things like the device table
location.

Therefore, this patch adds a BR2_ROOTFS_DEVICE_TABLE option which
allows to specify which device table should be used.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-17 04:36:23 +02:00
Thomas Petazzoni
e5da1b8520 cramfs: fix installation
The installation procedure of cramfs was broken when
$(HOST_DIR)/usr/bin didn't exist (i.e, cramfsck was installed as
$(HOST_DIR)/usr/bin directly). Use install -D with a proper
destination argument to make it work.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-17 04:36:22 +02:00
Thomas Petazzoni
55098e5048 busybox: make sure architecture flags are used at link time
When compiling Busybox, according to readelf -A, all object files were
properly compiled according to the select architecture (-march=armv4t
for example), but the final busybox binary could be of a different
architecture (ARMv5t even if ARMv4t was selected).

This patch changes the way we configure/compile Busybox so that our
CFLAGS aren't anymore passed through the make EXTRA_CFLAGS variable,
but through the .config CONFIG_EXTRA_CFLAGS variable. Unfortunately,
those variables don't have exactly the same semantic for the Busybox
build system.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-17 02:10:58 +02:00
Thomas Petazzoni
05c75314c9 external-toolchain: Support for multilib toolchains
Multilib toolchains provide different versions of the base libraries
for different architecture variants. For example, the ARM Codesourcery
toolchain provides base libraries for ARMv5 (default), ARMv4t and
Thumb2.

Depending on the -march= argument passed to gcc, the sysroot used by
the compiler is therefore different. This means that the sysroot
location in CROSS-gcc -v cannot be used. Instead, we must use
CROSS-gcc -print-sysroot when available and fall back to the old way
if unavailable.

Moreover, we cannot simply copy the full sysroot as we used to do,
because the sysroot organization of multilib toolchain is more
complicated. In Codesourcery toolchains, we have :

 /
   etc      -- for ARMv5
   lib      -- for ARMv5
   sbin     -- for ARMv5
   usr      -- for ARMv5 (includes headers)
   armv4t
     etc    -- for ARMv4t
     lib    -- for ARMv4t
     sbin   -- for ARMv4t
     usr    -- for ARMv4t (no headers!)
   thumb2
     etc    -- for Thumb2
     lib    -- for Thumb2
     sbin   -- for Thumb2
     usr    -- for Thumb2 (no headers!)

So we have the default ARMv5 architecture variant that is installed in
the main directory, and we have subdirectories for the ARMv4t and
Thumb2 architecture variants.

Copying the full sysroot to the staging directory doesn't work. All
our packages are based on the fact that they should install libraries
in staging/usr/lib. But if ARMv4t is used, the compiler would only
look in staging/armv4t/usr/lib for libraries (even when overriding the
sysroot with the --sysroot option, the multilib compiler suffixes the
sysroot directory with the architecture variant if it matches a
recognized one).

Therefore, we have to copy only the sysroot that we are interested
in. This is rendered a little bit complicated by the fact that the
armv4t and thumb2 sysroot do not contain the headers since they are
shared with the armv5 sysroot.

So, this patch :

 * Modifies how we compute SYSROOT_DIR in order to use -print-sysroot
   if it exists. SYSROOT_DIR contains the location of the main sysroot
   directory, i.e the sysroot for the default architecture variant.

 * Defines ARCH_SUBDIR as the subdirectory in the main sysroot for the
   currently selected architecture variant (in our case, it can be
   ".", "armv4t" or "thumb2"). ARCH_SYSROOT_DIR is defined as the full
   path to the sysroot of the currently selected architecture variant.

 * Modifies copy_toolchain_lib_root (which copies a library to the
   target/ directory) so that libraries are taken from
   ARCH_SYSROOT_DIR instead of SYSROOT_DIR. This ensures that
   libraries for the correct architecture variant are properly copied
   to the target.

 * Modifies copy_toolchain_sysroot (which copies the sysroot to the
   staging/ directory), so that it copies the contents of
   ARCH_SYSROOT_DIR, and if needed, adds the headers from the main
   sysroot directory and a symbolic link (armv4t -> . or thumb2 -> .)
   to make the compiler believe that its sysroot is really in armv4t/
   or thumb2/.

Tested with Codesourcery 2009q1 ARM toolchain, Crosstool-NG ARM glibc
and ARM uClibc toolchains.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-17 02:09:38 +02:00
Thomas Petazzoni
ea2505ee56 external-toolchain: support libraries outside of /lib
The copy_toolchain_lib_root function was making the assumption that
all libraries were stored inside the /lib directory of the sysroot
directory. However, this isn't true for certain toolchains,
particularly for the libstdc++ library.

The function is therefore reworked to find the library and its related
symlink either in /lib or /usr/lib in the sysroot, and copies it at
the same location in the target directory.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-17 02:09:38 +02:00
Thomas Petazzoni
7b7a4be0e1 external toolchains: take into account architecture variant
Until now, many TARGET_CFLAGS where missing when using an external
toolchain, due to how package/Makefile.in was written. Now, a lot more
definitions are common between the Buildroot toolchain case and the
external toolchain case.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-17 02:09:38 +02:00
Peter Korsgaard
65e209ca07 openssl: fix build without ipv6 support
Closes #1567

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-15 16:26:15 +02:00
Thomas Brandstetter
7874370907 pciutils: convert to the generic-tools infrastructure
Signed-off-by: Thomas Brandstetter <thomas.brandstetter@me.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-15 14:07:35 +02:00
Peter Korsgaard
237f5a8520 mtd: host compilation needs host-zlib
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-15 14:02:22 +02:00
Will Wagner
d362cc504d mtd: mkfs.jffs2 requires zlib to build
[Peter: lzo needed as well]
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-15 14:01:41 +02:00
Peter Korsgaard
376549b755 iso9660: menu.lst fixup after move to fs
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-15 13:51:33 +02:00
Will Wagner
a7e276bc3d initramfs: trivial fix following move to fs
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-15 13:50:37 +02:00
Peter Korsgaard
9f018b77ff busybox: 1.16.1 dnsd / hwclock fixes
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-14 20:41:15 +02:00
Paulius Zaleckas
c8b4f397e6 libdrm: enable/disable features according to driver selection
Also cleanup autotools symbols and add libatomic_ops dependency
for Intel part.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-14 17:04:47 +02:00
Paulius Zaleckas
71a041c852 Add libatomic_ops 1.2 needed by libdrm Intel support
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-14 17:03:58 +02:00
Peter Korsgaard
b827af3bb4 Merge branch 'autotools-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot 2010-04-13 21:50:46 +02:00
Thomas Petazzoni
157526cb05 libid3tag: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:58 +02:00
Thomas Petazzoni
7100a85e37 libmad: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:54 +02:00
Thomas Petazzoni
3b838d8640 aumix: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:50 +02:00
Thomas Petazzoni
8e4a53cf8c madplay: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:46 +02:00
Thomas Petazzoni
c901bef2c8 findutils: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:46 +02:00
Thomas Petazzoni
9005b04bc0 ipkg: remove useless configure options
These options are part of the default set of options passed to
./configure by the AUTOTARGETS infrastructure.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:42 +02:00
Thomas Petazzoni
3be78a238e argus: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:38 +02:00
Thomas Petazzoni
e300d684bc tar: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:34 +02:00
Thomas Petazzoni
98611b3a5e bison: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:33 +02:00
Thomas Petazzoni
6ad9d38641 Remove incorrect 'dummy' example
Since the introduction of the AUTOTARGETS infrastructure, the dummy
example is no longer correct. Moreover, the documentation now contains
extensive details about how new packages should be added, either using
the GENTARGETS or the AUTOTARGETS infrastructures.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:33 +02:00
Thomas Petazzoni
73e346effc libcgi: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:29 +02:00
Thomas Petazzoni
41d7e35fcf libsysfs: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:26 +02:00
Thomas Petazzoni
503062a355 libraw1394: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:21 +02:00
Thomas Petazzoni
6862ed36d5 libcgicc: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:17 +02:00
Thomas Petazzoni
aca0487261 libosip2: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:13 +02:00
Thomas Petazzoni
0dae022b7a patch: convert to the autotools infrastructure and bump version
Bumping the version from 2.5.9 to 2.6 allows to avoid adding a patch
(merged upstream) to fix patch's Makefile install target.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:08 +02:00
Thomas Petazzoni
25afa562f6 smartmontools: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:04 +02:00
Thomas Petazzoni
61fc526a16 setserial: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:03 +02:00
Thomas Petazzoni
55184f55a8 udpcast: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:55:00 +02:00
Thomas Petazzoni
f2e9f7604a x11vnc: cleanup useless config options
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:54:59 +02:00
Thomas Petazzoni
516708f94f vtun: convert to the autotools infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-13 16:54:56 +02:00
Thomas Petazzoni
9554403ad0 Update defconfigs after BR2_RECENT removal
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-12 15:28:12 +02:00
Thomas Petazzoni
e5d07810b2 Remove the BR2_RECENT option
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-12 15:28:12 +02:00
Thomas Petazzoni
02bc426214 Get rid of all usages of BR2_RECENT
Since BR2_RECENT was enabled by default, we do not want entries marked
BR2_RECENT (and thus appearing by default in Buildroot) to disappear.

Therefore, all the entries marked BR2_RECENT are converted as
non-deprecated. We can later decide, on a per-entry basis, to add
BR2_DEPRECATED to some of them. But at least, this commit doesn't
change the default current behaviour of Buildroot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-12 15:26:37 +02:00
Thomas Petazzoni
04ba0089a6 Get rid of the OPTIMIZE_FOR_CPU variable
This variable, together with the FIXME comment, has been added has
part of Eric Andersen's « Major buildroot facelift, step one » commit
that occured in October 2004.

Since then, no real usage has been made of OPTIMIZE_FOR_CPU, and the
initial intention has probably been lost in the memories of the
implementors.

Therefore, get rid of the variable, and just use $(ARCH) at the two
locations the variable was used.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-11 21:10:35 +02:00
Thomas Petazzoni
423399ba56 Get rid of useless OpenMP related code
It seems that there was an intention to add BR2_ENABLE_OPENMP someday,
but it was in June 2007 (commit
c81807a9d7) and since then, nothing
occured. Therefore, get rid of this code, and just pass
--disable-openmp to gettext to keep the current behaviour.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-11 21:10:35 +02:00
Thomas Petazzoni
1d1b55a250 Remove variables useless after BR2_PREFER_IMA removal
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-11 21:10:35 +02:00
Thomas Petazzoni
72f913bb3b Get rid of unused variables
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-11 21:10:34 +02:00
Thomas Petazzoni
4ca8e41a76 Update defconfigs after BR2_ENABLE_LOCALE_PREGENERATED removal
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-11 21:10:34 +02:00
Thomas Petazzoni
51a7a978a3 Remove BR2_ENABLE_LOCALE_PREGENERATED
The option is marked broken since october 2009, and even the uClibc
configuration help text says that using pregenerated locales is highly
discouraged.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-11 21:10:34 +02:00
Thomas Petazzoni
ce3bd8da2a Get rid of now unused HOST_ARCH computation code
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-11 21:10:34 +02:00
Thomas Petazzoni
ec66816ad5 Update defconfigs after BR2_GNU_BUILD_SUFFIX removal
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-11 21:10:33 +02:00
Thomas Petazzoni
60281cbfe4 Guess build system and remove BR2_GNU_BUILD_SUFFIX
Instead of having a configuration option BR2_GNU_BUILD_SUFFIX, let's
use config.guess to guess the build system type.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-04-11 21:10:33 +02:00