Skip to content

W
White Rabbit Switch - Software
Commit 4c227ef1 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

buildroot: uplift to 2016.02 

Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent e4094bdf
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
build/download-info
View file @ 4c227ef1
...@@ -23,8 +23,8 @@ wrs-gw-v4.2-20150826.tar.gz 807117326f6d5b1b53ebc95ca093fc44 \ ...@@ -23,8 +23,8 @@ wrs-gw-v4.2-20150826.tar.gz 807117326f6d5b1b53ebc95ca093fc44 \
http://www.ohwr.org/attachments/download/4035/wrs-gw-v4.2-20150826.tar.gz http://www.ohwr.org/attachments/download/4035/wrs-gw-v4.2-20150826.tar.gz
# buildroot core and packages # buildroot core and packages
buildroot-2011.11.tar.bz2 7b852f4ef17c63857ca7b9388b782070 \ buildroot-2016.02.tar.bz2 fcf10ae55b0831f52d492b6939e95581 \
http://www.buildroot.org/downloads/buildroot-2011.11.tar.bz2 http://www.buildroot.org/downloads/buildroot-2016.02.tar.bz2
autoconf-2.65.tar.bz2 a6de1cc6434cd64038b0a0ae4e252b33 \ autoconf-2.65.tar.bz2 a6de1cc6434cd64038b0a0ae4e252b33 \
http://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.65.tar.bz2 http://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.65.tar.bz2
......
build/scripts/wrs_build_buildroot
View file @ 4c227ef1
...@@ -11,7 +11,7 @@ fi ...@@ -11,7 +11,7 @@ fi
wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR
wrs_echo "--- Buildroot compiler and filesystem" wrs_echo "--- Buildroot compiler and filesystem"
zipname="buildroot-2011.11.tar.bz2" zipname="buildroot-2016.02.tar.bz2"
wrs_download $zipname wrs_download $zipname
mkdir -p $WRS_OUTPUT_DIR/build || wrs_die "mkdir build" mkdir -p $WRS_OUTPUT_DIR/build || wrs_die "mkdir build"
...@@ -19,7 +19,7 @@ mkdir -p $WRS_OUTPUT_DIR/images || wrs_die "mkdir images" ...@@ -19,7 +19,7 @@ mkdir -p $WRS_OUTPUT_DIR/images || wrs_die "mkdir images"
# go to the build dir and compile it, using our configuration # go to the build dir and compile it, using our configuration
cd $WRS_OUTPUT_DIR/build cd $WRS_OUTPUT_DIR/build
dirname="buildroot-2011.11" dirname="buildroot-2016.02"
if [ ! -d $dirname ]; then if [ ! -d $dirname ]; then
unset WRS_NO_REPLACE_BUILDROOT unset WRS_NO_REPLACE_BUILDROOT
fi fi
...@@ -113,4 +113,4 @@ cd $buildrootdir ...@@ -113,4 +113,4 @@ cd $buildrootdir
unset CC unset CC
wrs_echo "Compiling buildroot" wrs_echo "Compiling buildroot"
# tell to buildroot to use our download directory # tell to buildroot to use our download directory
make BUILDROOT_DL_DIR=$WRS_DOWNLOAD_DIR || wrs_die "buildroot compilation" make BR2_DL_DIR=$WRS_DOWNLOAD_DIR || wrs_die "buildroot compilation"
build/scripts/wrs_build_wraprootfs
View file @ 4c227ef1
...@@ -22,7 +22,7 @@ DEVTAR="$WRS_BASE_DIR/../userspace/devices.tar.gz" ...@@ -22,7 +22,7 @@ DEVTAR="$WRS_BASE_DIR/../userspace/devices.tar.gz"
TMPFS=$(mktemp -d /tmp/rootfs.XXXXXX) TMPFS=$(mktemp -d /tmp/rootfs.XXXXXX)
chmod a+rx $TMPFS chmod a+rx $TMPFS
rootfs_vanilla="$WRS_OUTPUT_DIR/build/buildroot-2011.11/output/target" rootfs_vanilla="$WRS_OUTPUT_DIR/build/buildroot-2016.02/output/target"
rootfs_override="$WRS_BASE_DIR/../userspace/rootfs_override" rootfs_override="$WRS_BASE_DIR/../userspace/rootfs_override"
TMPSCRIPT=$(mktemp /tmp/rootfs-script.XXXXXX) TMPSCRIPT=$(mktemp /tmp/rootfs-script.XXXXXX)
......
build/scripts/wrs_functions
View file @ 4c227ef1
...@@ -101,7 +101,7 @@ wrs_unset_config () { ...@@ -101,7 +101,7 @@ wrs_unset_config () {
# We'll need to set CROSS_COMPILE to the buildroot one, if unset # We'll need to set CROSS_COMPILE to the buildroot one, if unset
wrs_default_compiler () { wrs_default_compiler () {
hostdir=$WRS_OUTPUT_DIR/build/buildroot-2011.11/output/host hostdir=$WRS_OUTPUT_DIR/build/buildroot-2016.02/output/host
if [ -e $hostdir/usr/bin/arm-linux-gcc ]; then if [ -e $hostdir/usr/bin/arm-linux-gcc ]; then
wrs_setenv_default CROSS_COMPILE $hostdir/usr/bin/arm-linux- wrs_setenv_default CROSS_COMPILE $hostdir/usr/bin/arm-linux-
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment