Compare commits

..

46 Commits

Author SHA1 Message Date
Peter Korsgaard
8ab57bf933 Makefile: release: create tarball from current branch, not master
To support stable bugfix releases.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-17 13:42:07 +02:00
Peter Korsgaard
ad2600ce21 Update for 2013.08.1
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-17 13:21:15 +02:00
Thomas Petazzoni
63344acefa Makefile: make $(BUILD_DIR)/.root rule idempotent
The $(BUILD_DIR)/.root rule is executed as part of the 'dirs'
target. The 'dirs' target is re-executed at every execution of 'make
external-deps', and make external-deps explicitly tells make to ignore
targets that have already been made (through the -B option). This
means that the $(BUILD_DIR)/.root rule has to be idempotant, which was
not the case this the introduction of the lib32/lib64 symbolic link.

Running 'make external-deps' three times in a row was sufficient to
trigger an error due to symbolic links being incorrectly created. This
patch fixes that.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-15 23:34:25 +02:00
Axel Lin
bd315a19ef Config.in: Fixup after BR2_ELF2FLT got renamed to BR2_PACKAGE_HOST_ELF2FLT
The BR2_ELF2FLT option has been renamed to BR2_PACKAGE_HOST_ELF2FLT, thus
use the new name to fix dependency.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-11 12:23:37 +02:00
Martin Creutziger
f9edec63c5 ti-gfx.mk: correct typo
There is a simple typo in package/ti-gfx/ti-gfx.mk, which the
following patch corrects.

Signed-off-by: Martin Creutziger <buildroot@martin.creutziger.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-11 12:23:21 +02:00
Samuel Martin
790beb354f legacy: marked BR2_PACKAGE_GCC_TARGET and BR2_HAVE_DEVFILES as removed
These 2 symbols were removed when the gcc has been converted to the
Buildroot package infrastructures.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-11 12:22:59 +02:00
Peter Korsgaard
53d8d9c14a Update for 2013.08
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-31 00:33:13 +02:00
Thomas Petazzoni
eb53a09fd5 strongswan: fix build failure when host == target architecture
The strongswan configure.in uses the AC_LIB_PREFIX macro, which adds
--with-lib-prefix and --without-lib-prefix options, and which, by
default assumes that adding ${prefix}/lib to LDFLAGS and
${prefix}/include to CPPFLAGS is a good idea. Obviously, when
cross-compiling, it is definitely not a good idea.

In the specific case of strongswan, the result is that when testing if
the backtrace() function was available, the small C program was being
built and linked with -L/usr/lib. So when the host architecture and
target architecture are identical, it may find the backtrace()
function in the host C library, without looking at the target C
library:

configure:16457: /home/test/outputs/a637f916962b6136dd6dd4f4b9ff4e1cab568ef3/output/host/usr/bin/x86_64-unknown-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -pipe -Os  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -L/usr/lib conftest.c  >&5
/home/test/outputs/a637f916962b6136dd6dd4f4b9ff4e1cab568ef3/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-unknown-linux-uclibc/4.6.3/../../../../x86_64-unknown-linux-uclibc/bin/ld: warning: libc.so.0, needed by /home/test/outputs/a637f916962b6136dd6dd4f4b9ff4e1cab568ef3/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-unknown-linux-uclibc/4.6.3/../../../../x86_64-unknown-linux-uclibc/lib/../lib64/libgcc_s.so, may conflict with libc.so.6

Passing --without-lib-prefix prevents this default behavior from
happening, and no stupid value is added to CPPFLAGS or LDFLAGS.

Fixes:

  http://autobuild.buildroot.net/results/a637f916962b6136dd6dd4f4b9ff4e1cab568ef3/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-30 14:10:50 +02:00
Markos Chandras
014dd9b153 ltrace: Add missing mips->mipsel symlink
Restore missing mips->mipsel symlink. It appears ltrace was
packaged incorrectly and the symlink got lost. See
http://lists.alioth.debian.org/pipermail/ltrace-devel/2013-August/000938.html

[Peter: add a comment explaining why]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-30 14:09:45 +02:00
Peter Korsgaard
13d917aaff gen-manual-lists.py: fixup after 2440385 (config: reorder top-level menu)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-30 00:29:27 +02:00
Peter Korsgaard
4e4a0a3477 Prepare for 2013.08-rc3
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-30 00:03:48 +02:00
Peter Korsgaard
27df440b62 linux: bump 3.10.x stable version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-29 23:59:33 +02:00
Peter Korsgaard
51a087fde3 linux-headers: bump 3.{0,4,10}.x stable versions
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-29 23:58:13 +02:00
Peter Korsgaard
aab3a0ba79 dbus: launch helper should be setuid root
Closes #6464

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-29 23:30:55 +02:00
Peter Korsgaard
13ce6ddf59 CHANGES: update with recent changes
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-29 23:22:08 +02:00
Markos Chandras
7e9264956b directfb: Add patch to use 'gcc' for linking objects
Fixes
http://autobuild.buildroot.net/results/fab819eee4002a9c392c48c1ebaca5c5b6555567/

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-29 22:57:03 +02:00
Arnout Vandecappelle
04fe6b1344 dvb-apps: Fix generate-keynames.sh script for cross-compilation
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-29 22:56:35 +02:00
Baruch Siach
313dd5d5f2 kexec: fix homepage URL
The old one gives 404 error.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-29 12:15:32 +02:00
Luca Ceresoli
a831a0e065 mesa3d: fix download URL
The MesaLib 7.10.3 tarball has been moved on ftp.freedesktop.org from
pub/mesa/7.10.3/ to pub/mesa/old_versions/7.x/7.10.3/.
A bump to a newer release is only coming after Buildroot 2013.08, so for now
let us just change URL to let the download work properly.

Reported-by: Ryan Wilkins <ryan@deadfrog.net>
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-29 12:15:17 +02:00
Thomas Petazzoni
10f1903f4f kmod: fix build failure on gcc < 4.6 caused by _Static_assert()
This commit introduces a patch to kmod that ensures _Static_assert()
is only used if available. The patch has been submitted upstream.

Fixes:

  http://autobuild.buildroot.net/results/9daf0f46642020591731e20d3bf9041ff6259846/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 23:59:26 +02:00
Arnout Vandecappelle
339868d244 bash: fails in parallel build
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 23:58:27 +02:00
Yann E. MORIN
244038576b config: reorder top-level menu
Reorder the entries in the top-menu, in a more significant order.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 16:21:34 +02:00
Thomas De Schampheleire
e5088380d3 redis: fix build with ccache enabled
Some parts of redis fail to build when ccache is enabled, due to one of our
own patches. The construct
    make CC=$(CC) target1 target2
would result in
    make CC=ccache <tuple>-gcc target1 target2

and here <tuple>-gcc would be treated as a target and the compiler used
would be just 'ccache'.

Reported-by: Johan Sagaert <sagaert.johan@skynet.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 16:20:12 +02:00
Markos Chandras
027ef3f2b2 gcc-final: Drop obsolete code for handling lib64
Since 5628776c4a
"toolchain-external: fix lib64 symlinks"

lib64 is a symlink to lib so there is no reason to copy the libraries
to lib64 anymore. This fixes multiple building problems
for buildroot toolchains:

[...]
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libuClibc-0.9.33.2.so'
and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libuClibc-0.9.33.2.so'
are the same file
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil-0.9.33.2.so'
and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil-0.9.33.2.so'
are the same file
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil.so.0'
and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil.so.0'
are the same file
rmdir: failed to remove
'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64': Not a directory
[...]

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 16:17:19 +02:00
Peter Korsgaard
ca47afb41e qt5webkit: needs gui support in qt
Fixes http://autobuild.buildroot.net/results/439ce2c3c33a92966808071d4fc7231d50453c79/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 14:13:00 +02:00
Spenser Gilliland
3e1f853211 sunxi-mali: bug fixes for pc and init script
fix bad escape sequences in init script and add correct lib for pc file.

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 13:44:55 +02:00
Markos Chandras
86116e4f25 minidlna: Fix automagic dependency to libiconv
minidlna will detect and use the libiconv library if
the package is selected. In that case, we need to link
against -liconv.

Fixes the following linking problem:

tagutils/tagutils.o: In function `do_iconv.constprop.6':
tagutils.c:(.text+0x4d5c): undefined reference to `libiconv_open'
tagutils.c:(.text+0x4da0): undefined reference to `libiconv'
tagutils.c:(.text+0x4e08): undefined reference to `libiconv_close'

[Peter: wrap COMMON_LIBS line]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 00:16:25 +02:00
Samuel Martin
5628776c4a toolchain-external: fix lib64 symlinks
* Always link lib64 or lib32 to lib
* Only copy the architecture's lib directory to staging
* Also cleanup a couple of mkdirs (concerning some 'lib' directories).

Before this patch:

$ ls -ld host/usr/x86_64-buildroot-linux-gnu/sysroot/{,usr/}lib* target/{usr/,}lib*
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:26 host/usr/x86_64-buildroot-linux-gnu/sysroot/lib/
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:27 host/usr/x86_64-buildroot-linux-gnu/sysroot/lib64/
drwxr-xr-x 5 samuel users 4.0K Oct 30  2012 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/
drwxr-xr-x 5 samuel users 4.0K Aug 12 22:27 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib64/
drwxr-xr-x 3 samuel users 4.0K Oct 30  2012 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/libexec/
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:27 target/lib/
lrwxrwxrwx 1 samuel users    3 Aug 12 22:27 target/lib64 -> lib/
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:27 target/usr/lib/
lrwxrwxrwx 1 samuel users    3 Aug 12 22:27 target/usr/lib64 -> lib/

$ find . -type l -xtype l # find broken symlinks
find: `./host/usr/x86_64-buildroot-linux-gnu/sysroot/lib64/lib': Too many levels of symbolic links
find: `./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib64/lib': Too many levels of symbolic links
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_files.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_nis.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_compat.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_nisplus.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libutil.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libthread_db.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libcidn.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libcrypt.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libm.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_hesiod.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnsl.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/librt.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_db.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libanl.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libBrokenLocale.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libnss_dns.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libresolv.so
./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libdl.so
./target/etc/resolv.conf
./target/dev/log

After this patch:
$ ls -ld host/usr/x86_64-buildroot-linux-gnu/sysroot/{,usr/}lib* target/{usr/,}lib*
drwxr-xr-x 2 samuel users 4.0K Oct 30  2012 host/usr/x86_64-buildroot-linux-gnu/sysroot/lib/
lrwxrwxrwx 1 samuel users    5 Aug 12 22:36 host/usr/x86_64-buildroot-linux-gnu/sysroot/lib64 -> lib/
drwxr-xr-x 5 samuel users 4.0K Oct 30  2012 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/
lrwxrwxrwx 1 samuel users    5 Aug 12 22:36 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib64 -> lib/
drwxr-xr-x 3 samuel users 4.0K Oct 30  2012 host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/libexec/
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:36 target/lib/
lrwxrwxrwx 1 samuel users    3 Aug 12 22:36 target/lib64 -> lib/
drwxr-xr-x 2 samuel users 4.0K Aug 12 22:36 target/usr/lib/
lrwxrwxrwx 1 samuel users    3 Aug 12 22:36 target/usr/lib64 -> lib/

$ find . -type l -xtype l # find broken symlinks
./target/etc/resolv.conf
./target/dev/log

Fixes http://autobuild.buildroot.net/results/23fb6b1479d2b5906b72c9437b06ab4700ff246d/

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-27 23:39:28 +02:00
Thomas Petazzoni
f09636710b pulseaudio: fix NEON usage
The NEON intrinsics used by Pulseaudio are only available in either
-mfloat-abi=softfp or -mfloat-abi=hard, not in
-mfloat-abi=soft. Therefore having NEON support in the processor is
not sufficient, we also should *not* be using soft-float.

Moreover, looking at BR2_ARM_ENABLE_NEON to know if the processor has
NEON support is incorrect. This option is only here to allow the user
to tell whether the processor has NEON support or not, for the ARM
cores that only have optional NEON support. Instead, the
BR2_ARM_CPU_HAS_NEON option really indicates whether NEON is available
or not (it is either set automatically by the ARM cores that always
have NEON support, or when BR2_ARM_ENABLE_NEON is enabled by the user
to confirm that his ARM processor has NEON support).

This fixes build failures such as
http://autobuild.buildroot.org/results/675/675c96059be348b594cc92980bef391126931c83/build-end.log

[Peter: add comment about reason for soft abi check]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-27 23:02:23 +02:00
Thomas Petazzoni
796621c56a package/Makefile.in: fix ABI name for EABIhf targets
The current code to set ABI on ARM does the following:

ifeq ($(BR2_arm)$(BR2_armeb),y)
... set ABI without 'hf' suffix ...
else ifeq ($(BR2_ARM_EABIHF),y)
... set ABI with 'hf' suffix ...
endif

But since $(BR2_arm)$(BR2_armeb) will always be 'y' in the cases where
BR2_ARM_EABIHF is 'y', it means that the 'else' part of the condition
will never be used.

Fix this by appending 'hf' to the ABI variable when BR2_ARM_EABIHF is
selected.

[Peter: put EABIhf handling under arm/armeb conditional for consistency]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-27 22:46:11 +02:00
Gustavo Zacarias
1e4068a330 configs/mpc8315erdb: bump to the latest and greatest versions
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-27 22:42:21 +02:00
Gustavo Zacarias
be1a44df5a configs/p1010rdb: bump to the latest and greatest versions
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-27 22:41:35 +02:00
Danomi Manchego
0be2fe9a8c openssh: fix tab/spacing in init script
Several of the lines in S50sshd script have a strange mix of spaces
and tabs, that at least do not look consistent with neighboring lines.
This patch makes the spacing consistent, and also strips the trailing
spaces.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-27 22:34:47 +02:00
Arnout Vandecappelle
282456212f linux-fusion: bump version to 9.0.2
Fixes build with recent kernels.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-27 22:34:12 +02:00
Markos Chandras
0b363ba5f3 python-setuptools: Add missing $(TARGET_DIR) to PYTHONPATH
The $(TARGET_DIR) variable is required when building
python-setuptools for the target otherwise the build system detects
the host installation which leads to permission error problems
like these:

Setuptools installation detected at /usr/lib64/python2.7/site-packages
Renaming /usr/lib64/python2.7/site-packages/setuptools-0.9.8-py2.7.egg-info to
/usr/lib64/python2.7/site-packages/setuptools-0.9.8-py2.7.egg-info.OLD.1377005697.88
OSError: [Errno 13] Permission denied

Moreover, remove the PYTHONPATH variable for host variant since it's
not needed.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-27 22:32:55 +02:00
Arnout Vandecappelle
5871b79199 apply-patches: run patch in batch mode
If the file to be patched is missing, then `patch' will interactively
ask for a file to be patched. This is annoying in e.g. the autobuilders
because they have to wait for a timeout instead of failing.

Giving the '-t' (batch mode) option to patch fixes this: it will skip the
missing file, and return a non-zero exit code. So the build cleanly
fails.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-27 22:28:32 +02:00
Peter Korsgaard
f627ebeb79 Makefile: fix kernel modules test
Commit fde2605765 (Makefile: test before search for kernel modules)
changed the way we strip kernel modules, but it fails when modules aren't
available (as test -d returns with a non zero exit code).

Fix it by including the test -d call in a proper shell conditional.

Reported-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-26 00:34:45 +02:00
Thomas Petazzoni
fde2605765 Makefile: test before search for kernel modules
The 'find $(TARGET_DIR)/lib/modules' used to find and strip kernel
modules fails when no kernel modules have been installed. While the
'|| true' prevents the entire build from failing, there are still some
error messages displayed, which is not nice.

Instead, test if the directory exists before doing the find. We also
remove the '|| true' in order to really abort the build if a
problematic error occurs.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
2013-08-23 20:42:40 +02:00
Gustavo Zacarias
467b8d1f69 openssl: don't build tests
These require shared libraries and we save a tiny amount of build time.
Fixes:
http://autobuild.buildroot.net/results/88e/88e5e07e94e49879907186ff35ce66944f867ec2/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-23 20:41:54 +02:00
Thomas Petazzoni
8484ed9c07 acl: add patch to fix static installation
Just like 'attr', 'acl' doesn't use automake to control the
build/installation of its components, and the static-only installation
process was not installing libacl.a. We add a patch that fixes this.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
2013-08-23 20:41:32 +02:00
Thomas Petazzoni
cd2cac813e attr: add patch to fix static installation
When attr is built static-only, it forgets to install its libattr.a
file, which leads to the build failure of packages such as 'acl' that
rely on attr.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
2013-08-23 20:40:56 +02:00
Alexander Lukichev
24c5dbcef2 gcc: fix libstdc++_pic for AVR32
It is not clear why 300-libstdc++-pic.patch pre-applied to
gcc-4.2.2-avr32-2.1.5 seems to have come from some older version
of gcc (as early as 4.0.3). This older patch incorrectly refers to
object files to be included in the library libstdc++_pic.a as *.o,
while their location seems to be in .libs/*.o (see the contents at
e.g. https://github.com/ZigFisher/Midge/blob/master/toolchain/gcc/4.0.3/300-libstdc%2B%2B-pic.patch ).
The same patch for gcc 4.1.0 refers to the files as .libs/*.o (see
https://github.com/ZigFisher/Midge/blob/master/toolchain/gcc/4.1.0/300-libstdc%2B%2B-pic.patch ).
This patch corrects rules in Makefile.in.

Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com>
Acked-by: Simon Dawson <spdawson@gmail.com>
Tested-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-22 23:06:52 +02:00
Arnout Vandecappelle
8e2696eab6 generatelocales: fix 'cut' invocation
'cut' needs to be invoked with the -s option to make sure it doesn't
print anything when the delimiter isn't found. This is particularly
important for the charmap detection, because UTF-8 is appended if
the charmap is empty. But without -s, it will never be empty.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-22 23:05:43 +02:00
Jérôme Pouiller
a737dfccd5 strongswan: fix typo in tnccs_20 dependencies
It looks like there is a typing error in dependencies of tnccs_20 in strongswan
configure script. Add a patch to solve it.

Resolve issues detected here:
    http://autobuild.buildroot.net/results/b069e304c42660e7f7eba0b358f95dbaf879df64
    http://autobuild.buildroot.net/results/7355ddbaa213f4fcfd1b6d37b25bed1aab525723

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-22 23:04:59 +02:00
Yann E. MORIN
f01809d2b7 package/libbsd: further reduce the set of supported archs
Support for a,out on ARM will be dropped in Linux 3.11 (and is already
missing in the -rc).

m68k is marked BROKEN in Buildroot, so it is never ever tested.

The x86 familly is the only one left with support for a.out, now.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-22 23:02:28 +02:00
Thomas Petazzoni
4ed05f0ff6 qt5: change upstream URL
The Qt5 upstream URL has changed, which leads to build failures in the
autobuilders.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-18 19:49:43 +02:00
49 changed files with 428 additions and 98 deletions

36
CHANGES
View File

@@ -1,3 +1,39 @@
2013.08.1, Released September 17th, 2013:
Handle the removed GCC and development files on target options
through Config.in.legacy.
Rootfs /lib symlink handling fixed (triggered by make external-deps)
Updated/fixed packages: elf2flt, ti-gfx
2013.08, Released August 31th, 2013:
Minor fixes.
Documentation build fixed.
Updated/fixed packages: ltrace, strongswan
2013.08-rc3, Released August 29th, 2013:
Fixes all over the tree.
External toolchain lib32/lib64 handling, ABI name for EABIhf,
misc fixes for generatelocales, apply-patches and module
stripping.
Top level menu names reordered and renamed for clarity.
Updated/fixed packages: acl, attr, bash, dbus, directfb,
dvb-apps, kexec, kmod, libbsd, linux-fusion, mesa3d, minidlna,
openssh, openssl, pulseaudio, python-setuptools, qt5,
qt5webkit, redis, strongswan, sunxi-mali
Issues resolved (http://bugs.uclibc.org):
#6464: dbus-daemon-launch-helper needs setuid
2013.08-rc2, Released August 16th 2013:
Documentation improvements.

View File

@@ -286,7 +286,7 @@ choice
config BR2_STRIP_strip
bool "strip"
depends on !BR2_ELF2FLT
depends on !BR2_PACKAGE_HOST_ELF2FLT
help
Binaries and libraries in the target filesystem will be
stripped using the normal 'strip' command. This allows to
@@ -297,7 +297,7 @@ config BR2_STRIP_strip
config BR2_STRIP_sstrip
bool "sstrip"
select BR2_PACKAGE_SSTRIP_HOST
depends on !BR2_ELF2FLT
depends on !BR2_PACKAGE_HOST_ELF2FLT
help
Binaries and libraries in the target filesystem will be
stripped using the 'sstrip' command, which strips a little
@@ -450,14 +450,14 @@ source "toolchain/Config.in"
source "system/Config.in"
source "package/Config.in"
source "linux/Config.in"
source "package/Config.in.host"
source "package/Config.in"
source "fs/Config.in"
source "boot/Config.in"
source "linux/Config.in"
source "package/Config.in.host"
source "Config.in.legacy"

View File

@@ -96,6 +96,23 @@ config BR2_VFP_FLOAT
been replaced with a choice of options that allows to select
between various VFP versions/capabilities.
config BR2_PACKAGE_GCC_TARGET
bool "gcc on the target filesystem has been removed"
select BR2_LEGACY
help
The support for gcc in the target filesystem was deprecated
since a while, and has been removed completely from Buildroot.
See Buildroot's documentation for more explanations.
config BR2_HAVE_DEVFILES
bool "development files in target filesystem has been removed"
select BR2_LEGACY
help
The installation of the development files in the target
filesystem was deprecated since a while, and has been removed
completely from Buildroot.
See Buildroot's documentation for more explanations.
###############################################################################
comment "Legacy options removed in 2013.05"

View File

@@ -24,7 +24,7 @@
#--------------------------------------------------------------
# Set and export the version string
export BR2_VERSION:=2013.08-rc2
export BR2_VERSION:=2013.08.1
# Check for minimal make version (note: this check will break at make 10.x)
MIN_MAKE_VERSION=3.81
@@ -422,10 +422,20 @@ world: toolchain $(TARGETS_ALL)
$(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR):
@mkdir -p $@
# We make a symlink lib32->lib or lib64->lib as appropriate
# MIPS64/n32 requires lib32 even though it's a 64-bit arch.
ifeq ($(BR2_ARCH_IS_64)$(BR2_MIPS_NABI32),y)
LIB_SYMLINK = lib64
else
LIB_SYMLINK = lib32
endif
$(STAGING_DIR):
@mkdir -p $(STAGING_DIR)/bin
@mkdir -p $(STAGING_DIR)/lib
@ln -snf lib $(STAGING_DIR)/$(LIB_SYMLINK)
@mkdir -p $(STAGING_DIR)/usr/lib
@ln -snf lib $(STAGING_DIR)/usr/$(LIB_SYMLINK)
@mkdir -p $(STAGING_DIR)/usr/include
@mkdir -p $(STAGING_DIR)/usr/bin
@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
@@ -441,6 +451,9 @@ $(BUILD_DIR)/.root:
--exclude .hg --exclude=CVS --exclude '*~' \
$(TARGET_SKELETON)/ $(TARGET_DIR)/
cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
@ln -snf lib $(TARGET_DIR)/$(LIB_SYMLINK)
@mkdir -p $(TARGET_DIR)/usr
@ln -snf lib $(TARGET_DIR)/usr/$(LIB_SYMLINK)
touch $@
$(TARGET_DIR): $(BUILD_DIR)/.root
@@ -476,8 +489,9 @@ ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y)
find $(TARGET_DIR)/usr/lib/ -name '*.py' -print0 | xargs -0 rm -f
endif
$(STRIP_FIND_CMD) | xargs $(STRIPCMD) 2>/dev/null || true
find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \
xargs -r $(KSTRIPCMD) || true
if test -d $(TARGET_DIR)/lib/modules; then \
find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \
xargs -r $(KSTRIPCMD); fi
# See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads
# besides the one in which crash occurred; or SIGTRAP kills my program when
@@ -543,8 +557,8 @@ ifneq ($(GENERATE_LOCALE),)
target-generatelocales: host-localedef
$(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/
$(Q)for locale in $(GENERATE_LOCALE) ; do \
inputfile=`echo $${locale} | cut -f1 -d'.'` ; \
charmap=`echo $${locale} | cut -f2 -d'.'` ; \
inputfile=`echo $${locale} | cut -f1 -d'.' -s` ; \
charmap=`echo $${locale} | cut -f2 -d'.' -s` ; \
if test -z "$${charmap}" ; then \
charmap="UTF-8" ; \
fi ; \
@@ -827,7 +841,7 @@ release: OUT=buildroot-$(BR2_VERSION)
# Create release tarballs. We need to fiddle a bit to add the generated
# documentation to the git output
release:
git archive --format=tar --prefix=$(OUT)/ master > $(OUT).tar
git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar
$(MAKE) O=$(OUT) manual-html manual-txt manual-pdf
tar rf $(OUT).tar $(OUT)
gzip -9 -c < $(OUT).tar > $(OUT).tar.gz

View File

@@ -16,9 +16,9 @@ BR2_KERNEL_HEADERS_3_8=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.8"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.8.config"
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.10.config"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb"
@@ -31,4 +31,4 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="MPC8315ERDB_NAND"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.04"
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.07"

View File

@@ -15,9 +15,9 @@ BR2_KERNEL_HEADERS_3_8=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.8"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.8.config"
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.10.config"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb"
@@ -30,4 +30,4 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="P1010RDB_NOR"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.04"
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.07"

View File

@@ -6,23 +6,23 @@
<p>
The latest stable release is <b>2013.05</b>, which can be downloaded
The latest stable release is <b>2013.08</b>, which can be downloaded
here:<p>
<a href="/downloads/buildroot-2013.05.tar.gz">buildroot-2013.05.tar.gz</a>
<a href="/downloads/buildroot-2013.08.tar.gz">buildroot-2013.08.tar.gz</a>
or
<a href="/downloads/buildroot-2013.05.tar.bz2">buildroot-2013.05.tar.bz2</a>.
<a href="/downloads/buildroot-2013.08.tar.bz2">buildroot-2013.08.tar.bz2</a>.
<p>
The latest release candidate is <b>2013.08-rc2</b>, which can be
<!--
The latest release candidate is <b>2013.08-rc3</b>, which can be
downloaded here:<p>
<a href="/downloads/buildroot-2013.08-rc2.tar.gz">buildroot-2013.08-rc2.tar.gz</a>
<a href="/downloads/buildroot-2013.08-rc3.tar.gz">buildroot-2013.08-rc3.tar.gz</a>
or
<a href="/downloads/buildroot-2013.08-rc2.tar.bz2">buildroot-2013.08-rc2.tar.bz2</a>.
<a href="/downloads/buildroot-2013.08-rc3.tar.bz2">buildroot-2013.08-rc3.tar.bz2</a>.
<p>
-->
This and earlier releases can always be downloaded from
<a href="/downloads/">http://buildroot.net/downloads/</a>.

View File

@@ -5,6 +5,28 @@
<p>
<ul>
<li><b>31 August 2013 -- 2013.08 released</b>
<p>The stable 2013.08 release is out - Thanks to everyone
contributing and testing the release candidates. See the
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.08">CHANGES</a>
file for more details
and go to the <a href="/downloads/">downloads page</a> to pick up the
<a href="/downloads/buildroot-2013.08.tar.bz2">2013.08 release</a>.</p>
<li><b>29 August 2013 -- 2013.08-rc3 released</b>
<p>Another week, another release candidate with more cleanups and
build fixes. See the <a
href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.08_rc3">CHANGES</a>
file for details.</p>
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
<a href="/downloads/buildroot-2013.08-rc3.tar.bz2">2013.08-rc3
release candidate</a>, and report any problems found to the <a
href="lists.html">mailing list</a> or <a
href="https://bugs.uclibc.org">bug tracker</a>.</p>
<li><b>16 August 2013 -- 2013.08-rc2 released</b>
<p>We have a new release candidate! Lots of changes all over the

View File

@@ -21,7 +21,7 @@ choice
prompt "Kernel version"
config BR2_LINUX_KERNEL_LATEST_VERSION
bool "3.10.7"
bool "3.10.10"
config BR2_LINUX_KERNEL_SAME_AS_HEADERS
bool "Same as toolchain kernel headers"
@@ -75,7 +75,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
config BR2_LINUX_KERNEL_VERSION
string
default "3.10.7" if BR2_LINUX_KERNEL_LATEST_VERSION
default "3.10.10" if BR2_LINUX_KERNEL_LATEST_VERSION
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

View File

@@ -1,4 +1,4 @@
menu "Package Selection for the target"
menu "Target packages"
source "package/busybox/Config.in"

View File

@@ -46,11 +46,9 @@ ABI=gnueabi
else
ABI=eabi
endif
else ifeq ($(BR2_ARM_EABIHF),y)
ifeq ($(LIBC),uclibc)
ABI=gnueabihf
else
ABI=eabihf
ifeq ($(BR2_ARM_EABIHF),y)
ABI:=$(ABI)hf
endif
endif

View File

@@ -0,0 +1,29 @@
Support installation of .a file when doing static linking
When doing static linking (i.e ENABLE_SHARED != yes), the acl build
logic wasn't installing any library at all, not even the .a file which
is needed for static linking. This patch fixes that.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/include/buildmacros
===================================================================
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -97,7 +97,15 @@
INSTALL_LTLIB_STATIC = \
cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
+ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \
+ ../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
+ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+ ../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \
+ if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
+ fi
INSTALL_MAN = \
@for d in $(MAN_PAGES); do \

View File

@@ -0,0 +1,29 @@
Support installation of .a file when doing static linking
When doing static linking (i.e ENABLE_SHARED != yes), the attr build
logic wasn't installing any library at all, not even the .a file which
is needed for static linking. This patch fixes that.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/include/buildmacros
===================================================================
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -97,7 +97,15 @@
INSTALL_LTLIB_STATIC = \
cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
+ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \
+ ../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
+ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+ ../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \
+ if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
+ fi
INSTALL_MAN = \
@for d in $(MAN_PAGES); do \

View File

@@ -16,6 +16,10 @@ BASH_CONF_ENV += \
bash_cv_func_sigsetjmp=present \
bash_cv_printf_a_format=yes
# Parallel build sometimes fails because some of the generator tools
# are built twice (i.e. while executing).
BASH_MAKE = $(MAKE1)
# The static build needs some trickery
ifeq ($(BR2_PREFER_STATIC_LIB),y)
BASH_CONF_OPT += --enable-static-link --without-bash-malloc

View File

@@ -10,6 +10,10 @@ DBUS_LICENSE = AFLv2.1 GPLv2+
DBUS_LICENSE_FILES = COPYING
DBUS_INSTALL_STAGING = YES
define DBUS_PERMISSIONS
/usr/libexec/dbus-daemon-launch-helper f 4755 0 0 - - - - -
endef
DBUS_DEPENDENCIES = host-pkgconf
DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes

View File

@@ -0,0 +1,35 @@
Add patch to use 'gcc' instead of 'ld' for linking
The patch has been sent upstream but it has not been merged yet
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
From 176ce06b40897a357fe76a558af517197325f188 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Wed, 28 Aug 2013 10:56:32 +0100
Subject: [PATCH] rules/libobject.make: Use gcc for linking
Invoking 'ld' directly may miss some necessary linker flags which
are usually passed by gcc. Therefore, use gcc for linking.
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
rules/libobject.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/libobject.make b/rules/libobject.make
index bc670da..2cba658 100644
--- a/rules/libobject.make
+++ b/rules/libobject.make
@@ -3,7 +3,7 @@
if test -d $<.tmp; then rmdir $<.tmp; fi
mkdir $<.tmp
(cd $<.tmp && $(AR) x ../../$<)
- $(LD) -o $@ -r $<.tmp/*.o
+ $(CC) -nostdlib -o $@ -r $<.tmp/*.o
rm -f $<.tmp/*.o && rmdir $<.tmp
.PHONY: $(LTLIBRARIES:%.la=.libs/%.a)
--
1.8.3.2

View File

@@ -11,6 +11,8 @@ DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
DIRECTFB_LICENSE = LGPLv2.1+
DIRECTFB_LICENSE_FILES = COPYING
DIRECTFB_INSTALL_STAGING = YES
DIRECTFB_AUTORECONF = YES
DIRECTFB_CONF_OPT = \
--localstatedir=/var \
--disable-explicit-deps \

View File

@@ -0,0 +1,30 @@
Fix generate-keynames.sh script for cross-compilation
generate-keynames.sh reads /usr/include/linux to find the keyname
symbols. However, when cross-compiling, the include path points
somewhere else. Allow the user to pass CROSS_ROOT to point to the
root of the cross-compilation environment.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
diff -rup dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh
--- dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh 2012-12-06 10:38:07.000000000 +0100
+++ dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh 2013-08-29 21:47:09.717991439 +0200
@@ -18,7 +18,7 @@ echo "};" >> $1
echo >> $1
echo >> $1
echo "static struct input_key_name key_name [] = {" >> $1
-for x in $(cat /usr/include/linux/input.h input_fake.h | \
+for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \
egrep "#define[ \t]+KEY_" | grep -v KEY_MAX | \
cut -f 1 | cut -f 2 -d " " | sort -u) ; do
echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1
@@ -26,7 +26,7 @@ done
echo "};" >> $1
echo >> $1
echo "static struct input_key_name btn_name [] = {" >> $1
-for x in $(cat /usr/include/linux/input.h input_fake.h | \
+for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \
egrep "#define[ \t]+BTN_" | \
cut -f 1 | cut -f 2 -d " " | sort -u) ; do
echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1

View File

@@ -34,7 +34,8 @@ endif
DVB_APPS_INSTALL_STAGING = YES
define DVB_APPS_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(DVB_APPS_LDFLAGS)" $(MAKE) -C $(@D) V=1
$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(DVB_APPS_LDFLAGS)" \
$(MAKE) -C $(@D) CROSS_ROOT=$(STAGING_DIR) V=1
endef
define DVB_APPS_INSTALL_STAGING_CMDS

View File

@@ -0,0 +1,20 @@
libstdc++-v3: fix the effects of pre-applied 300-libstdc++-pic.patch
This version of GCC comes with a number of pre-applied patches, among which is
300-libstdc++-pic.patch that makes a PIC version of libstdc++. The resulting
Makefile.in incorrectly refers to object files that should be insde the library.
Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com>
diff -uNrp host-gcc-final-4.2.2-avr32-2.1.5.orig/libstdc++-v3/src/Makefile.in host-gcc-final-4.2.2-avr32-2.1.5/libstdc++-v3/src/Makefile.in
--- host-gcc-final-4.2.2-avr32-2.1.5.orig/libstdc++-v3/src/Makefile.in 2008-07-04 00:18:42.000000000 +0300
+++ host-gcc-final-4.2.2-avr32-2.1.5/libstdc++-v3/src/Makefile.in 2013-08-08 16:15:56.201258882 +0300
@@ -804,7 +804,7 @@ install_debug:
install-exec-local:
ifeq ($(enable_shared),yes)
- $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
endif

View File

@@ -55,20 +55,6 @@ endif
HOST_GCC_FINAL_CONF_OPT += \
$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
# Handle lib64
define HOST_GCC_FINAL_HANDLE_LIB64
if [ -d "$(STAGING_DIR)/lib64" ]; then \
if [ ! -e "$(STAGING_DIR)/lib" ]; then \
mkdir -p "$(STAGING_DIR)/lib"; \
fi; \
mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \
rmdir "$(STAGING_DIR)/lib64"; \
rm "$(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/lib64";\
fi
endef
HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_HANDLE_LIB64
# Make sure we have 'cc'
define HOST_GCC_FINAL_CREATE_CC_SYMLINKS
if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \

View File

@@ -7,7 +7,7 @@ config BR2_PACKAGE_KEXEC
Kexec is a user space utiltity for loading another kernel
and asking the currently running kernel to do something with it.
http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
https://www.kernel.org/pub/linux/utils/kernel/kexec/
config BR2_PACKAGE_KEXEC_ZLIB
bool "zlib support"

View File

@@ -0,0 +1,57 @@
From d4a1e5daf0d50aa79ae0ed2f947f5657343cf2f7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 28 Aug 2013 17:31:40 +0200
Subject: [PATCH] Add configure check for _Static_assert()
Commit 8efede20ef ("Use _Static_assert") introduced the usage of
_Static_assert(). However, _Static_assert() is a fairly new thing,
since it was introduced only in gcc 4.6. In order to support older
compilers, this patch adds a configure.in test that checks whether
_Static_assert() is usable or not, and adjust the behavior of the
assert_cc() macro accordingly.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Upstream-status: submitted
http://article.gmane.org/gmane.linux.kernel.modules/1136
---
configure.ac | 6 ++++++
libkmod/macro.h | 4 ++++
2 files changed, 10 insertions(+)
diff --git a/configure.ac b/configure.ac
index 40e54cf..cbe12f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,12 @@ AC_CHECK_MEMBERS([struct stat.st_mtim], [], [], [#include <sys/stat.h>])
# Check kernel headers
AC_CHECK_HEADERS_ONCE([linux/module.h])
+AC_MSG_CHECKING([whether _Static_assert() is supported])
+AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE([[_Static_assert(1, "Test");]])],
+ [AC_DEFINE([HAVE_STATIC_ASSERT], [1], [Define is _Static_assert() is available])
+ AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])])
#####################################################################
# --with-
diff --git a/libkmod/macro.h b/libkmod/macro.h
index c6ba855..5992026 100644
--- a/libkmod/macro.h
+++ b/libkmod/macro.h
@@ -21,8 +21,12 @@
#include <stddef.h>
+#if defined(HAVE_STATIC_ASSERT)
#define assert_cc(expr) \
_Static_assert((expr), #expr)
+#else
+#define assert_cc(expr)
+#endif
#if HAVE_TYPEOF
#define check_types_match(expr1, expr2) \
--
1.8.1.2

View File

@@ -10,6 +10,9 @@ KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
KMOD_INSTALL_STAGING = YES
KMOD_DEPENDENCIES = host-pkgconf
# Some patches are touching configure.in
KMOD_AUTORECONF = YES
# license info for libkmod only, conditionally add more below
KMOD_LICENSE = LGPLv2.1+
KMOD_LICENSE_FILES = libkmod/COPYING

View File

@@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBBSD
bool "libbsd"
# libbsd requires a.out.h, which is only available for those
# architectures: arm, m68k, x86 (and alpha, but we don't care.)
depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 )
depends on ( BR2_i386 || BR2_x86_64 )
depends on BR2_TOOLCHAIN_HAS_THREADS
help
This library provides useful functions commonly found on BSD
@@ -14,5 +14,5 @@ config BR2_PACKAGE_LIBBSD
http://libbsd.freedesktop.org/
comment "libbsd requires a toolchain with thread support"
depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 )
depends on ( BR2_i386 || BR2_x86_64 )
depends on !BR2_TOOLCHAIN_HAS_THREADS

View File

@@ -4,7 +4,7 @@
#
################################################################################
LINUX_FUSION_VERSION = 9.0.0
LINUX_FUSION_VERSION = 9.0.2
LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
LINUX_FUSION_INSTALL_STAGING = YES

View File

@@ -72,16 +72,16 @@ config BR2_DEFAULT_KERNEL_VERSION
config BR2_DEFAULT_KERNEL_HEADERS
string
default "3.0.91" if BR2_KERNEL_HEADERS_3_0
default "3.0.94" if BR2_KERNEL_HEADERS_3_0
default "3.1.10" if BR2_KERNEL_HEADERS_3_1
default "3.2.50" if BR2_KERNEL_HEADERS_3_2
default "3.3.8" if BR2_KERNEL_HEADERS_3_3
default "3.4.58" if BR2_KERNEL_HEADERS_3_4
default "3.4.60" if BR2_KERNEL_HEADERS_3_4
default "3.5.7" if BR2_KERNEL_HEADERS_3_5
default "3.6.11" if BR2_KERNEL_HEADERS_3_6
default "3.7.10" if BR2_KERNEL_HEADERS_3_7
default "3.8.13" if BR2_KERNEL_HEADERS_3_8
default "3.9.11" if BR2_KERNEL_HEADERS_3_9
default "3.10.7" if BR2_KERNEL_HEADERS_3_10
default "3.10.10" if BR2_KERNEL_HEADERS_3_10
default "2.6" if BR2_KERNEL_HEADERS_SNAP
default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

View File

@@ -13,6 +13,13 @@ LTRACE_CONF_OPT = --disable-werror
LTRACE_LICENSE = GPLv2
LTRACE_LICENSE_FILES = COPYING
# symlink missing from tarball
define LTRACE_MIPS_SYMLINK
cd $(@D)/sysdeps/linux-gnu; ln -sf mipsel mips
endef
LTRACE_POST_EXTRACT_HOOKS += LTRACE_MIPS_SYMLINK
# ltrace can use libunwind only if libc has backtrace() support
# We don't normally do so for uClibc and we can't know if it's external
ifeq ($(BR2_PACKAGE_LIBUNWIND),y)

View File

@@ -19,12 +19,23 @@ MINIDLNA_CFLAGS=$(TARGET_CFLAGS) \
-I"$(STAGING_DIR)/usr/include/libavcodec" \
-I"$(STAGING_DIR)/usr/include/libavformat"
MINIDLNA_COMMON_LIBS = \
-lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec \
-lid3tag -lFLAC -logg -lvorbis
ifeq ($(BR2_PACKAGE_GETTEXT),y)
MINIDLNA_DEPENDENCIES += gettext
# we need to link with libintl
MINIDLNA_MAKE_OPTS += LIBS='-lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -lintl'
MINIDLNA_COMMON_LIBS += -lintl
endif
ifeq ($(BR2_PACKAGE_LIBICONV),y)
MINIDLNA_DEPENDENCIES += libiconv
MINIDLNA_COMMON_LIBS += -liconv
endif
MINIDLNA_MAKE_OPTS += LIBS='$(MINIDLNA_COMMON_LIBS)'
define MINIDLNA_BUILD_CMDS
PREFIX=$(STAGING_DIR)/usr \
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \

View File

@@ -55,7 +55,19 @@ endef
PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FORCE_CC
endif
PULSEAUDIO_CONF_OPT += $(if $(BR2_ARM_ENABLE_NEON),--enable-neon-opt=yes,--enable-neon-opt=no)
# neon intrinsics not available with float-abi=soft
ifeq ($(BR2_ARM_SOFT_FLOAT),)
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
PULSEAUDIO_USE_NEON = y
endif
endif
ifeq ($(PULSEAUDIO_USE_NEON),y)
PULSEAUDIO_CONF_OPT += --enable-neon-opt=yes
else
PULSEAUDIO_CONF_OPT += --enable-neon-opt=no
endif
# pulseaudio alsa backend needs pcm/mixer apis
ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
PULSEAUDIO_CONF_OPT += --disable-alsa

View File

@@ -23,7 +23,7 @@ if [ ! -f /etc/ssh_host_dsa_key ] ; then
echo Generating DSA Key...
echo THIS CAN TAKE A MINUTE OR TWO DEPENDING ON YOUR PROCESSOR!
echo
/usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N ''
/usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N ''
fi
# Check for the SSH2 ECDSA key
@@ -33,35 +33,35 @@ if [ ! -f /etc/ssh_host_ecdsa_key ]; then
echo
/usr/bin/ssh-keygen -t ecdsa -f /etc/ssh_host_ecdsa_key -C '' -N ''
fi
umask 077
start() {
echo -n "Starting sshd: "
echo -n "Starting sshd: "
/usr/sbin/sshd
touch /var/lock/sshd
echo "OK"
}
}
stop() {
echo -n "Stopping sshd: "
killall sshd
killall sshd
rm -f /var/lock/sshd
echo "OK"
echo "OK"
}
restart() {
stop
start
}
}
case "$1" in
start)
start
start
;;
stop)
stop
stop
;;
restart|reload)
restart
restart
;;
*)
echo "Usage: $0 {start|stop|restart}"

View File

@@ -85,6 +85,7 @@ define OPENSSL_CONFIGURE_CMDS
)
$(SED) "s:-march=[-a-z0-9] ::" -e "s:-mcpu=[-a-z0-9] ::g" $(@D)/Makefile
$(SED) "s:-O[0-9]:$(OPENSSL_CFLAGS):" $(@D)/Makefile
$(SED) "s: build_tests::" $(@D)/Makefile
endef
define HOST_OPENSSL_BUILD_CMDS

View File

@@ -20,19 +20,18 @@ endef
define PYTHON_SETUPTOOLS_BUILD_CMDS
(cd $(@D); \
PYTHONPATH="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
PYTHONPATH="$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
$(HOST_DIR)/usr/bin/python setup.py build)
endef
define HOST_PYTHON_SETUPTOOLS_INSTALL_CMDS
(cd $(@D); \
PYTHONPATH="$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
$(HOST_DIR)/usr/bin/python setup.py install --prefix=$(HOST_DIR)/usr)
endef
define PYTHON_SETUPTOOLS_INSTALL_TARGET_CMDS
(cd $(@D); \
PYTHONPATH="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
PYTHONPATH="$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
$(HOST_DIR)/usr/bin/python setup.py install --executable=/usr/bin/python \
--single-version-externally-managed --root=/ --prefix=$(TARGET_DIR)/usr)
endef

View File

@@ -1,5 +1,5 @@
QT5_VERSION = 5.0.2
QT5_SITE = http://releases.qt-project.org/qt5/$(QT5_VERSION)/submodules/
QT5_SITE = http://download.qt-project.org/archive/qt/5.0/$(QT5_VERSION)/submodules/
include package/qt5/*/*.mk
define QT5_LA_PRL_FILES_FIXUP

View File

@@ -2,6 +2,7 @@ config BR2_PACKAGE_QT5WEBKIT
bool "qt5webkit"
select BR2_PACKAGE_QT5BASE
select BR2_PACKAGE_QT5BASE_ICU
select BR2_PACKAGE_QT5BASE_GUI
select BR2_PACKAGE_SQLITE
# This module does not support static linking
depends on !BR2_PREFER_STATIC_LIB

View File

@@ -39,7 +39,7 @@ diff -ur old/src/Makefile new/src/Makefile
echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
- -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
+ -(cd ../deps && $(MAKE) CC=$(CC) $(DEPENDENCY_TARGETS))
+ -(cd ../deps && $(MAKE) CC="$(CC)" $(DEPENDENCY_TARGETS))
.PHONY: persist-settings

View File

@@ -0,0 +1,26 @@
It looks like there is a typing error in dependencies of tnccs_20.
Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
--- a/configure 2013-08-19 12:09:33.934651935 +0200
+++ b/configure 2013-08-19 11:50:34.465118187 +0200
@@ -15897,7 +15897,7 @@
radius=true;
fi
-if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then
+if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_20 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then
tnc_tnccs=true;
fi
--- a/configure.in 2013-08-19 12:08:41.762913778 +0200
+++ b/configure.in 2013-08-19 11:50:22.222886206 +0200
@@ -317,7 +317,7 @@
radius=true;
fi
-if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then
+if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_20 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then
tnc_tnccs=true;
fi

View File

@@ -11,6 +11,7 @@ STRONGSWAN_LICENSE = GPLv2+
STRONGSWAN_LICENSE_FILES = COPYING LICENSE
STRONGSWAN_DEPENDENCIES = host-pkgconf
STRONGSWAN_CONF_OPT += \
--without-lib-prefix \
--enable-pkcs11=yes \
--enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
--enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \

View File

@@ -5,7 +5,7 @@ install_driver() {
OPTS=$2
modprobe $DRIVER $OPTS
maj=$(awk "$$2==\"${DRIVER}\" { print $$1; }" /proc/devices)
maj=$(awk "\$2==\"${DRIVER}\" { print \$1; }" /proc/devices)
rm -f /dev/${DRIVER}

View File

@@ -7,6 +7,6 @@ Name: glesv2
Description: ARM Mali implementation of OpenGL ESv2
Version: 2.0
Requires:
Libs: -L${libdir} -lGLESv2 -lGLES_CM -lUMP
Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -lUMP
Cflags: -I${includedir}/GLES2

View File

@@ -29,7 +29,7 @@ TI_GFX_OMAPES = 5.x
TI_GFX_PLATFORM = omap3630
endif
ifeq ($(BR2_PACKAGE_TI_GFX_ES6),y)
TI_GFX_OMPAES = 6.x
TI_GFX_OMAPES = 6.x
TI_GFX_PLATFORM = ti81xx
endif
ifeq ($(BR2_PACKAGE_TI_GFX_ES8),y)

View File

@@ -6,7 +6,7 @@
MESA3D_VERSION = 7.10.3
MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/$(MESA3D_VERSION)
MESA3D_LICENSE = MIT, SGI, Khronos
MESA3D_LICENSE_FILES = docs/license.html

View File

@@ -80,7 +80,7 @@ function apply_patch {
echo ""
echo "Applying $patch using ${type}: "
echo $patch >> ${builddir}/.applied_patches_list
${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}"
${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t
if [ $? != 0 ] ; then
echo "Patch failed! Please fix ${patch}!"
exit 1

View File

@@ -185,7 +185,7 @@ class Buildroot:
list_info = {
'target-packages': {
'filename': "package-list",
'root_menu': "Package Selection for the target",
'root_menu': "Target packages",
'filter': "_is_package",
'sorted': True,
'sub_menu': True,

View File

@@ -125,7 +125,7 @@ copy_toolchain_lib_root = \
# $1: main sysroot directory of the toolchain
# $2: arch specific sysroot directory of the toolchain
# $3: arch specific subdirectory in the sysroot
# $4: directory of libraries ('lib' or 'lib64')
# $4: directory of libraries ('lib', 'lib32' or 'lib64')
# $5: support lib directories (for toolchains storing libgcc_s,
# libstdc++ and other gcc support libraries outside of the
# sysroot)
@@ -135,9 +135,11 @@ copy_toolchain_sysroot = \
ARCH_SUBDIR="$(strip $3)"; \
ARCH_LIB_DIR="$(strip $4)" ; \
SUPPORT_LIB_DIR="$(strip $5)" ; \
for i in etc $${ARCH_LIB_DIR} sbin usr ; do \
for i in etc $${ARCH_LIB_DIR} sbin usr usr/$${ARCH_LIB_DIR}; do \
if [ -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \
rsync -au --chmod=Du+w --exclude 'usr/lib/locale' $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
rsync -au --chmod=Du+w --exclude 'usr/lib/locale' \
--exclude lib --exclude lib32 --exclude lib64 \
$${ARCH_SYSROOT_DIR}/$$i/ $(STAGING_DIR)/$$i/ ; \
fi ; \
done ; \
if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \
@@ -158,19 +160,6 @@ copy_toolchain_sysroot = \
fi ; \
find $(STAGING_DIR) -type d | xargs chmod 755
#
# Create lib64 -> lib and usr/lib64 -> usr/lib symbolic links in the
# target and staging directories. This is needed for some 64 bits
# toolchains such as the Crosstool-NG toolchains, for which the path
# to the dynamic loader and other libraries is /lib64, but the
# libraries are stored in /lib.
#
create_lib64_symlinks = \
(cd $(TARGET_DIR) ; ln -s lib lib64) ; \
(cd $(TARGET_DIR)/usr ; ln -s lib lib64) ; \
(cd $(STAGING_DIR) ; ln -s lib lib64) ; \
(cd $(STAGING_DIR)/usr ; ln -s lib lib64)
#
# Check the availability of a particular glibc feature. This function
# is used to check toolchain options that are always supported by

View File

@@ -449,7 +449,6 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
fi ; \
fi ; \
ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
mkdir -p $(TARGET_DIR)/lib ; \
if test -z "$(BR2_PREFER_STATIC_LIB)" ; then \
$(call MESSAGE,"Copying external toolchain libraries to target...") ; \
for libs in $(LIB_EXTERNAL_LIBS); do \
@@ -461,9 +460,6 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
fi ; \
$(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \
$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) ; \
if [ -L $${ARCH_SYSROOT_DIR}/lib64 -o -d $${ARCH_SYSROOT_DIR}/lib64 ] ; then \
$(call create_lib64_symlinks) ; \
fi ; \
if test "$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" = "y"; then \
$(call MESSAGE,"Copying gdbserver") ; \
gdbserver_found=0 ; \