Skip to content

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

Merge branch 'adam-buildroot_2016_02' 

Perform uplift of the buildroot to the 2016.02.
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parents e4094bdf 88d2e085
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2843 additions and 1335 deletions
build/download-info
View file @ 3da5579a
......@@ -23,154 +23,6 @@ wrs-gw-v4.2-20150826.tar.gz 807117326f6d5b1b53ebc95ca093fc44 \
http://www.ohwr.org/attachments/download/4035/wrs-gw-v4.2-20150826.tar.gz
# buildroot core and packages
buildroot-2011.11.tar.bz2 7b852f4ef17c63857ca7b9388b782070 \
http://www.buildroot.org/downloads/buildroot-2011.11.tar.bz2
buildroot-2016.02.tar.bz2 fcf10ae55b0831f52d492b6939e95581 \
http://www.buildroot.org/downloads/buildroot-2016.02.tar.bz2
autoconf-2.65.tar.bz2 a6de1cc6434cd64038b0a0ae4e252b33 \
http://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.65.tar.bz2
automake-1.11.1.tar.bz2 c2972c4d9b3e29c03d5f2af86249876f \
http://ftp.gnu.org/pub/gnu/automake/automake-1.11.1.tar.bz2
bash-4.1.tar.gz 9800d8724815fd84994d9be65ab5e7b8 \
http://ftp.gnu.org/pub/gnu/bash/bash-4.1.tar.gz
binutils-2.21.1.tar.bz2 bde820eac53fa3a8d8696667418557ad \
http://ftp.gnu.org/pub/gnu/binutils/binutils-2.21.1.tar.bz2
bridge-utils-1.5.tar.gz ec7b381160b340648dede58c31bb2238 \
http://kent.dl.sourceforge.net/sourceforge/bridge/bridge-utils-1.5.tar.gz
busybox-1.19.3.tar.bz2 c3938e1ac59602387009bbf1dd1af7f6 \
http://www.busybox.net/downloads/busybox-1.19.3.tar.bz2
dhcpdump-1.8.tar.gz 099c786997c424f196414f9575f1fb90 \
http://www.mavetju.org/download/dhcpdump-1.8.tar.gz
dropbear-0.53.1.tar.gz 6b8d901859d9b8a18e2f6bfe0a892a03 \
http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.gz
ethtool-3.0.tar.gz a339cbdcbe1c1fbe377c36d84231bda6 \
http://www.kernel.org/pub/software/network/ethtool/ethtool-3.0.tar.gz
expat-2.0.1.tar.gz ee8b492592568805593f81f8cdf2a04c \
http://kent.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz
fakeroot_1.9.5.tar.gz 95c0c78c734b9782ec8d47e99c8e3fc8 \
http://snapshot.debian.org/archive/debian/20080427T000000Z/pool/main/f/fakeroot/fakeroot_1.9.5.tar.gz
gcc-4.3.6.tar.bz2 55ddf934bc9f8d1eaff7a77e7d598a85 \
http://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2
gdb-7.3.1.tar.bz2 b89a5fac359c618dda97b88645ceab47 \
http://ftp.gnu.org/pub/gnu/gdb/gdb-7.3.1.tar.bz2
gmp-5.0.2.tar.bz2 0bbaedc82fb30315b06b1588b9077cd3 \
http://ftp.gnu.org/pub/gnu/gmp/gmp-5.0.2.tar.bz2
gperf-3.0.4.tar.gz c1f1db32fb6598d6a93e6e88796a8632 \
http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz
ifplugd-0.28.tar.gz df6f4bab52f46ffd6eb1f5912d4ccee3 \
http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz
iproute2-2.6.39.tar.gz 8a3b6bc77c2ecf752284aa4a6fc630a6 \
http://devresources.linuxfoundation.org/dev/iproute2/download/iproute2-2.6.39.tar.gz
libdaemon-0.14.tar.gz 509dc27107c21bcd9fbf2f95f5669563 \
http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.14.tar.gz
libelf-0.8.12.tar.gz e21f8273d9f5f6d43a59878dc274fec7 \
http://www.mr511.de/software/libelf-0.8.12.tar.gz
libffi-3.0.9.tar.gz 1f300a7a7f975d4046f51c3022fa5ff1 \
ftp://sources.redhat.com/pub/libffi/libffi-3.0.9.tar.gz
libpcap-1.1.1.tar.gz 1bca27d206970badae248cfa471bbb47 \
http://www.tcpdump.org/release/libpcap-1.1.1.tar.gz
libtool-2.2.10.tar.gz b745d220e88163fcd9eea0a90ccf21b0 \
http://ftp.gnu.org/pub/gnu/libtool/libtool-2.2.10.tar.gz
lighttpd-1.4.29.tar.gz 4130d2440777b7911e62de6a89c98a90 \
http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.29.tar.gz
linux-3.1.4.tar.bz2 52643e5a013d450ad69627c3cac490cb \
http://www.kernel.org/pub//linux/kernel/v3.x//linux-3.1.4.tar.bz2
lsof_4.85.tar.bz2 102ee2081172bbe76dccaa6cceda8573 \
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof//lsof_4.85.tar.bz2
ltrace_0.5.3.orig.tar.gz 3fa7fe715ab879db08bd06d1d59fd90f \
http://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.3.orig.tar.gz
ltrace_0.5.3-2.1.diff.gz 38bc944c53ab602a7854aa4fa71c1f46 \
http://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.3-2.1.diff.gz
lua-5.1.4.tar.gz d0870f2de55d59c1c8419f36e8fac150 \
http://www.lua.org/ftp/lua-5.1.4.tar.gz
lzo-2.06.tar.gz 95380bd4081f85ef08c5209f4107e9f8 \
http://www.oberhumer.com/opensource/lzo/download/lzo-2.06.tar.gz
make-3.81.tar.bz2 354853e0b2da90c527e35aabb8d6f1e6 \
http://ftp.gnu.org/pub/gnu/make/make-3.81.tar.bz2
m4-1.4.15.tar.bz2 c7c32540bc3842d5550f88d47ef551d8 \
http://ftp.gnu.org/pub/gnu/m4/m4-1.4.15.tar.bz2
mpfr-3.0.1.tar.bz2 bfbecb2eacb6d48432ead5cfc3f7390a \
http://www.mpfr.org/mpfr-3.0.1/mpfr-3.0.1.tar.bz2
mtd-utils-1.4.6.tar.bz2 a0418afcf6026824a5fa5e9051793f3c \
ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.4.6.tar.bz2
nano-2.2.6.tar.gz 03233ae480689a008eb98feb1b599807 \
http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz
ncurses-5.7.tar.gz cce05daf61a64501ef6cd8da1f727ec6 \
http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.7.tar.gz
openssl-1.0.0e.tar.gz 7040b89c4c58c7a1016c0dfa6e821c86 \
http://www.openssl.org/source/openssl-1.0.0e.tar.gz
pcre-7.9.tar.gz 2256d0a1d0a358265165ca70e7cfc47a \
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.9.tar.gz
pkg-config-0.25.tar.gz a3270bab3f4b69b7dc6dbdacbcae9745 \
http://pkgconfig.freedesktop.org/releases/pkg-config-0.25.tar.gz
procps-3.2.8.tar.gz 9532714b6846013ca9898984ba4cd7e0 \
http://procps.sourceforge.net/procps-3.2.8.tar.gz
php-5.2.17.tar.bz2 b27947f3045220faf16e4d9158cbfe13 \
http://sources.buildroot.net//php-5.2.17.tar.bz2
Python-2.7.2.tar.bz2 ba7b2f11ffdbf195ee0d111b9455a5bd \
http://www.python.org/ftp/python/2.7.2/Python-2.7.2.tar.bz2
readline-6.2.tar.gz 67948acb2ca081f23359d0256e9a271c \
http://ftp.gnu.org/pub/gnu/readline/readline-6.2.tar.gz
rsync-3.0.9.tar.gz 5ee72266fe2c1822333c407e1761b92b \
http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz
rsyslog-5.8.0.tar.gz 37562d0e71a24938a9ed7f242bd32d35 \
http://www.rsyslog.com/files/download/rsyslog//rsyslog-5.8.0.tar.gz
screen-4.0.3.tar.gz 8506fd205028a96c741e4037de6e3c42 \
http://ftp.gnu.org/pub/gnu/screen/screen-4.0.3.tar.gz
strace-4.5.20.tar.bz2 64dfe10d9db0c1e34030891695ffca4b \
http://kent.dl.sourceforge.net/sourceforge/strace/strace-4.5.20.tar.bz2
tcpdump-4.1.1.tar.gz d0dd58bbd6cd36795e05c6f1f74420b0 \
http://www.tcpdump.org/release/tcpdump-4.1.1.tar.gz
uClibc-0.9.32.tar.bz2 cfcb6c25d8ebe12817499d8749ee8ae1 \
http://www.uclibc.org/downloads/uClibc-0.9.32.tar.bz2
zlib-1.2.5.tar.bz2 be1e89810e66150f5b0327984d8625a0 \
http://kent.dl.sourceforge.net/sourceforge/libpng/zlib-1.2.5.tar.bz2
monit-5.10.tar.gz 5b5b5cc7939b975bbbef73bd6426750a \
http://mmonit.com/monit/dist/monit-5.10.tar.gz
build/scripts/wrs_build_wraprootfs
View file @ 3da5579a
......@@ -22,7 +22,7 @@ DEVTAR="$WRS_BASE_DIR/../userspace/devices.tar.gz"
TMPFS=$(mktemp -d /tmp/rootfs.XXXXXX)
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"
TMPSCRIPT=$(mktemp /tmp/rootfs-script.XXXXXX)
......@@ -36,6 +36,11 @@ cp -r $rootfs_vanilla/* $TMPFS
cp -r $WRS_OUTPUT_DIR/images/wr/* $TMPFS/wr
cp -r $WRS_OUTPUT_DIR/images/lib/* $TMPFS/lib
rm -f $TMPFS/etc/init.d/*
rm -f $TMPFS/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
# remove symlink from the buildroot
rm -rf $TMPFS/etc/dropbear
mkdir -p $TMPFS/etc/dropbear; chown -R root:root $TMPFS/etc/dropbear
cp -r $rootfs_override/* $TMPFS
# remove leftovers from on-going edits in rootfs_override
find $TMPFS -name '*~' | xargs rm -f
......@@ -52,7 +57,6 @@ if [ -f $WRS_BASE_DIR/authorized_keys ]; then
fi
chmod g-w $TMPFS/root $TMPFS/root/.ssh
chown -R root:root $TMPFS/root
mkdir -p $TMPFS/etc/dropbear; chown -R root:root $TMPFS/etc/dropbear
chmod a+rx $TMPFS
##### now move stuff to usr (we need usr to be in flash, / remains initramfs)
......@@ -64,6 +68,8 @@ mv $TMPFS/wr $TMPFS/usr; ln -s usr/wr $TMPFS
mv $TMPFS/var $TMPFS/usr; ln -s usr/var $TMPFS
# var/run links to ../tmp, so create /usr/tmp
ln -s ../tmp $TMPFS/usr/tmp
# var/run links to ../run, overwrite it to point to ../tmp
ln -sf ../tmp $TMPFS/var/run
# mv ubi commands to /sbin: they are needed for boot time
mv $TMPFS/usr/sbin/ubi* $TMPFS/sbin
......
build/scripts/wrs_buildroot_build 0 → 100755
View file @ 3da5579a
#!/bin/bash
# check variables, like all scripts herein do
WRS_SCRIPT_NAME=$(basename $0)
if [ -z "$WRS_BASE_DIR" ]; then
echo "$0: Plesae set WRS_BASE_DIR" >& 2
exit 1
fi
. ${WRS_BASE_DIR}/scripts/wrs_functions
wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR
wrs_echo "--- Buildroot: compiler and filesystem"
cd $WRS_OUTPUT_DIR/build/${buildroot_dirname}
buildrootdir=$(/bin/pwd)
cd $buildrootdir
# We don't want CC to be pre-set at this point (some of us do :)
unset CC
wrs_echo "Compiling buildroot"
# make 3.82 splits the work differently. When using buildroot with
# the make > 3.81 buildroot uses BR2_JLEVEL= (preferably 0 for automatic number
# of jobs setting).
# For make =< 3.81 BR2_JLEVEL= is ignored and build is done using only one job.
# Passing -j allows to build with many jobs, but many warning messages are
# printed:
# make[2]: warning: -jN forced in submake: disabling jobserver mode.
makefails=$(make -v | awk 'NR==1 {if ($NF <= 3.81) print "oldmake"}')
if [ "x$makefails" = "xoldmake" ]; then
JLEVEL="-j$WRS_MAKE_J_NUMBER"
fi
# tell to buildroot to use our download directory
make BR2_DL_DIR=$WRS_DOWNLOAD_DIR $JLEVEL || wrs_die "buildroot compilation"
build/scripts/wrs_buildroot_download 0 → 100755
View file @ 3da5579a
#!/bin/bash
# check variables, like all scripts herein do
WRS_SCRIPT_NAME=$(basename $0)
if [ -z "$WRS_BASE_DIR" ]; then
echo "$0: Plesae set WRS_BASE_DIR" >& 2
exit 1
fi
. ${WRS_BASE_DIR}/scripts/wrs_functions
wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR
wrs_echo "--- Buildroot: download packages"
cd $WRS_OUTPUT_DIR/build/${buildroot_dirname}
buildrootdir=$(/bin/pwd)
cd $buildrootdir
echo "current dir "`pwd`
# tell to buildroot to use our download directory
make BR2_DL_DIR=$WRS_DOWNLOAD_DIR source || wrs_die "buildroot download"
build/scripts/wrs_build_buildroot → build/scripts/wrs_buildroot_init
View file @ 3da5579a
......@@ -10,17 +10,16 @@ fi
wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR
wrs_echo "--- Buildroot compiler and filesystem"
zipname="buildroot-2011.11.tar.bz2"
wrs_download $zipname
wrs_echo "--- Buildroot: unpack and configure"
wrs_download $buildroot_zipname
mkdir -p $WRS_OUTPUT_DIR/build || wrs_die "mkdir build"
mkdir -p $WRS_OUTPUT_DIR/images || wrs_die "mkdir images"
# go to the build dir and compile it, using our configuration
cd $WRS_OUTPUT_DIR/build
dirname="buildroot-2011.11"
if [ ! -d $dirname ]; then
if [ ! -d $buildroot_dirname ]; then
unset WRS_NO_REPLACE_BUILDROOT
fi
......@@ -28,8 +27,8 @@ if [ -n "$WRS_NO_REPLACE_BUILDROOT" ]; then
wrs_echo "Preserving current buildroot build"
else
wrs_echo "Uncompressing buildroot"
rm -rf $dirname
tar xjf ${WRS_DOWNLOAD_DIR}/$zipname || wrs_die "untar $zipname"
rm -rf $buildroot_dirname
tar xjf ${WRS_DOWNLOAD_DIR}/$buildroot_zipname || wrs_die "untar $buildroot_zipname"
fi
# select configuration: old default, overridden by Kconfig and environment
......@@ -53,27 +52,17 @@ if [ ! -f "$CFG" ]; then
fi
wrs_echo "Configuring with \"$CFG\""
cd $WRS_OUTPUT_DIR/build/${dirname}
cd $WRS_OUTPUT_DIR/build/${buildroot_dirname}
cp $CFG .config
# If busybox configuration is inside wr-switch-sw (currently it is),
# fix the config filename
sed -i "s,__WR_SWITCH_SW__,$WRS_BASE_DIR/../configs/buildroot," .config
# replace "-j" level. First remove it in case it's left in
sed -i /^BR2_JLEVEL/d .config
# make 3.82 splits the work differently, and compilation fails. So no -j
makefails=$(make -v | awk 'NR==1 {if ($NF > 3.81) print "fail"}')
if [ "x$makefails" = "xfail" ]; then
echo "BR2_JLEVEL=1" >> .config
# Actually, it seems it fails anyways. I give up and document the issue
else
echo "BR2_JLEVEL=$WRS_MAKE_J_NUMBER" >> .config
fi
# apply any pending patches (only if we untarred a fresh copy)
if [ -z "$WRS_NO_REPLACE_BUILDROOT" ]; then
wrs_echo "Patching buildroot"
cd $WRS_OUTPUT_DIR/build/${dirname}
cd $WRS_OUTPUT_DIR/build/${buildroot_dirname}
for n in $WRS_BASE_DIR/../patches/buildroot/*patch; do
# the shell passes the "*" over if no matches are there, so check
if test -f "$n"; then
......@@ -104,13 +93,3 @@ fi
# re-digest the config we built
wrs_echo "Reconfiguring buildroot"
make oldconfig || wrs_die "buildroot config"
buildrootdir=$(/bin/pwd)
cd $buildrootdir
# We don't want CC to be pre-set at this point (some of us do :)
unset CC
wrs_echo "Compiling buildroot"
# tell to buildroot to use our download directory
make BUILDROOT_DL_DIR=$WRS_DOWNLOAD_DIR || wrs_die "buildroot compilation"
build/scripts/wrs_download
View file @ 3da5579a
......@@ -11,7 +11,7 @@ fi
wrs_check_vars WRS_DOWNLOAD_DIR
cd $WRS_DOWNLOAD_DIR
wrs_echo "--- Downloading all files"
wrs_echo "--- Downloading base packages"
# download all files
DLLIST=${WRS_BASE_DIR}/download-info
......
build/scripts/wrs_functions
View file @ 3da5579a
......@@ -101,7 +101,7 @@ wrs_unset_config () {
# We'll need to set CROSS_COMPILE to the buildroot one, if unset
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
wrs_setenv_default CROSS_COMPILE $hostdir/usr/bin/arm-linux-
fi
......@@ -181,5 +181,9 @@ else
if [ $? -ne 0 ]; then wrs_die "Configuration failed"; fi
fi
# buildroot definitions
buildroot_zipname="buildroot-2016.02.tar.bz2"
buildroot_dirname="buildroot-2016.02"
# and import the configuration variables
. $WRS_CONFIG_DIR/.config
build/wrs_build-all
View file @ 3da5579a
......@@ -129,23 +129,25 @@ wrs_build_step () {
failed_step=false; # this is set to "true" but the wrs_build_step function
# Now build the stuff one step at a time, only if not already done.
# Steps 0 and 9 are redone in any case:
# Steps 0 and 11 are redone in any case:
# step 0 is downloading, and re-cecking md5sum has no side effects
# step 9 is wrapping the filesystem: we need to re-wrap is something changed
redo_step "0 9"
# step 11 is wrapping the filesystem: we need to re-wrap is something changed
redo_step "0 11"
# done-marker script name
wrs_build_step 00-download wrs_download
wrs_build_step 01-buildroot wrs_build_buildroot
wrs_build_step 01-buildroot_init wrs_buildroot_init
wrs_build_step 02-buildroot_download wrs_buildroot_download
wrs_build_step 03-buildroot_build wrs_buildroot_build
wrs_default_compiler
wrs_build_step 02-at91boot wrs_build_at91boot
wrs_build_step 03-barebox wrs_build_barebox
wrs_build_step 04-kernel wrs_build_kernel
wrs_build_step 05-modules wrs_build_modules
wrs_build_step 06-ptp wrs_build_ptp
wrs_build_step 07-wrs-userspace wrs_build_userspace
wrs_build_step 08-wrs-gateware wrs_build_gateware
wrs_build_step 09-wrap-rootfs wrs_build_wraprootfs
wrs_build_step 04-at91boot wrs_build_at91boot
wrs_build_step 05-barebox wrs_build_barebox
wrs_build_step 06-kernel wrs_build_kernel
wrs_build_step 07-modules wrs_build_modules
wrs_build_step 08-ptp wrs_build_ptp
wrs_build_step 09-wrs-userspace wrs_build_userspace
wrs_build_step 10-wrs-gateware wrs_build_gateware
wrs_build_step 11-wrap-rootfs wrs_build_wraprootfs
if $failed_step; then
wrs_die "One or more build steps failed"
......
configs/buildroot/wrs_release_br2_config
View file @ 3da5579a
This diff is collapsed.
doc/wrs-developer-manual.in
View file @ 3da5579a
......@@ -35,7 +35,7 @@
@setchapternewpage off
@set update-month July 2015
@set update-month June 2016
@c the release name below is substituted at build time
@set release __RELEASE_GIT_ID__
......@@ -179,7 +179,7 @@ The purpose of the build-script rewrite is achieving the following targets:
retrieved. Even if you ``make distclean'' in the build scripts you
will not need re-get everything from the network. In a similar
mood, people who already have a local copy of the big packages
(kernel, barebox, white-rabbit svn) will not need to re-download not
(kernel, barebox, white-rabbit) will not need to re-download not
even the first time they build the WRS software.
@end itemize
......@@ -215,7 +215,8 @@ repository. Please note that the repository uses @i{git} submodules,
so it depends on other @code{ohwr} repositories too, which in turn
have not been tagged because the submodule mechanism ensures you'll
get the exact version you need. Anyways, all relevant commit identifiers
are shown in the SNMP version fields (within @t{WR-SWITCH-MIB.txt}).
are shown by command @t{wrs_version -t} or in the SNMP version fields
(within @t{WR-SWITCH-MIB.txt}).
The LM32 program is provided as a pre-compiled binary in
@code{binaries/rt_cpu.bin}. The respective source code is the
......@@ -335,11 +336,12 @@ Every downloaded file is saved to the @code{downloads} directory
(@code{$WRS_DOWNLOAD_DIR} if set, or the default place
@code{$WRS_OUTPUT_DIR/downloads}). You should
arrange not to remove that directory when you recompile over and over
during development. I chose to make the first
script download everything, before starting any build, to help
telling download errors from other
issues. Also, after downloading is over you can work
even without a network connection.
during development. Download process is divided into two parts. Firstly,
our buildsystem downloads only base packages (at91bootstrap, barebox,
linux kernel, switch's gateware and the builroot). The rest of packages are
downloaded by the buildroot.
In the first step the script downloads mentioned packages, before starting
any build, to help telling download errors from other issues.
For each upstream archive needed, the following steps are performed:
......@@ -358,14 +360,18 @@ main build directory.
The messages of a download run are like the following ones:
@smallexample
2012-01-12 18:30:46: --- Downloading all files
2012-01-12 18:30:53: Retrieved at91bootstrap-3-3.0.tar.gz from upstream
2012-01-12 18:31:00: Retrieved buildroot-2011.11.tar.bz2 from upstream
[...]
2012-01-12 18:37:53: Retrieved uClibc-0.9.32.tar.bz2 from upstream
2012-01-12 18:37:56: Retrieved zlib-1.2.5.tar.bz2 from upstream
2016-06-02 17:10:46: --- Downloading base packages
2016-06-02 17:10:50: Retrieved at91bootstrap-3-3.0.tar.gz from upstream
2016-06-02 17:10:51: Retrieved barebox-2014.04.0.tar.bz2 from upstream
2016-06-02 17:11:21: Retrieved linux-2.6.39.tar.bz2 from upstream
2016-06-02 17:11:22: Retrieved wrs-gw-v4.2-20150826.tar.gz from upstream
2016-06-02 17:11:27: Retrieved buildroot-2016.02.tar.bz2 from upstream
@end smallexample
After buildroot is downloaded, it is unpacked and then configured. Buildroot
uses simillar mechanism to the one described above to download packages that
it needs. Buildroot prints the progress of download of each package.
After downloading is over you can work even without a network connection.
@c ==========================================================================
@node Building Procedure
......@@ -396,35 +402,38 @@ minutes it takes to build @i{buildroot}, but you can safely ignore them,
trusting the build process will complete successfully.
The progress messages look like what is shown here below. The log
file will be rather big (6 or 7MB or so), as all the compilation steps are
file will be rather big (~18MB), as all the compilation steps are
quite verbose.
The following example shows a run on a quad core system (18k
bogoMips in total). If files had already been downloaded, the first
The following example shows a run on a quad core, dual hyperthreaded system
(8*6800 bogoMips in total). If files had already been downloaded, the first few
step takes only a few seconds, as shown, to verify the checksums:
@smallexample
2015-08-28 10:01:57: --- Downloading all files
2015-08-28 10:02:02: --- Buildroot compiler and filesystem
2015-08-28 10:02:02: Uncompressing buildroot
2015-08-28 10:02:02: Patching buildroot
2015-08-28 10:02:02: Reconfiguring buildroot
2015-08-28 10:02:04: Compiling buildroot
2015-08-28 10:26:40: --- AT91Boot
2015-08-28 10:26:40: Patching AT91Boot
2015-08-28 10:26:40: Building AT91Boot
2015-08-28 10:26:41: --- Barebox
2015-08-28 10:26:44: Patching Barebox
2015-08-28 10:26:44: Building Barebox
2015-08-28 10:26:58: --- Linux kernel for switch
2015-08-28 10:29:15: --- Kernel modules from this package
2015-08-28 10:29:19: --- PTP daemon (ppsi repository as a submodule)
2015-08-28 10:29:26: --- User space tools
2015-08-28 10:29:33: --- Deploying FPGA firmware
2015-08-28 10:29:33: Using pre-built binaries from wrs-gw-v4.2-20150826.tar.gz
2015-08-28 10:29:33: --- Wrapping filesystem
2015-08-28 10:29:46: --- Packing into wr-switch-sw-v4.2-20150828_binaries.tar
2015-08-28 10:29:46: Complete build succeeded, apparently
2016-06-02 17:26:39: --- Downloading base packages
2016-06-02 17:26:39: --- Buildroot: unpack and configure
2016-06-02 17:26:39: Uncompressing buildroot
2016-06-02 17:26:40: Configuring with "[...]/../configs/buildroot/wrs_release_br2_config"
2016-06-02 17:26:40: Patching buildroot
2016-06-02 17:26:40: Reconfiguring buildroot
2016-06-02 17:26:41: --- Buildroot: download packages
2016-06-02 17:26:48: --- Buildroot: compiler and filesystem
2016-06-02 17:26:48: Compiling buildroot
2016-06-02 17:47:54: --- AT91Boot
2016-06-02 17:47:54: Patching AT91Boot
2016-06-02 17:47:54: Building AT91Boot
2016-06-02 17:47:55: --- Barebox
2016-06-02 17:47:55: Patching Barebox
2016-06-02 17:47:55: Building Barebox
2016-06-02 17:48:03: --- Linux kernel for switch
2016-06-02 17:48:52: --- Kernel modules from this package
2016-06-02 17:48:56: --- PTP daemon (ppsi repository as a submodule)
2016-06-02 17:49:05: --- User space tools
2016-06-02 17:49:15: --- Deploying FPGA firmware
2016-06-02 17:49:15: Using pre-built binaries from wrs-gw-v4.2-20150826.tar.gz
2016-06-02 17:49:16: --- Wrapping filesystem
2016-06-02 17:49:21: --- Packing into wr-switch-sw-v4.2-20160602_binaries.tar
2016-06-02 17:49:21: Complete build succeeded, apparently
@end smallexample
You may prefer to save @i{stderr} with @i{stdout} to the log file
......@@ -505,7 +514,7 @@ it creates a file in the @code{build/_done} directory.
When you rebuild everything, steps for which the marker file exists
are not rebuilt. To force rebuilding of one specific part, just remove
the marker. Markers are numbered, reflecting the order of compilation
steps, but they also have a name: names like @code{04-kernel} should be
steps, but they also have a name: names like @code{06-kernel} should be
self-explicative.
To ease the rebuilding of a specific module a shortcut has been created
......@@ -513,7 +522,7 @@ in the @code{wrs_build-all} script. For example if you want to recompile
the kernel alone you should execute.
@example
/path/to/wr-switch-sw/build/wrs_build-all --step=04
/path/to/wr-switch-sw/build/wrs_build-all --step=06
@end example
You can list all compiled modules by calling
......@@ -595,7 +604,7 @@ top-level source directory.
@c to read explanation.
If you want to change the configuration, you can do so after the first
build iteration: change directory to @code{build/buildroot-2011.11}
build iteration: change directory to @code{build/buildroot-2016.02}
and run @code{make menuconfig} (this the Buildroot configuration,
not the one of wr-switch-sw). After making your choices, copy back
the file @code{.config} to @t{configs/buildroot} in this package,
......@@ -719,7 +728,7 @@ To use the same compiler the scripts use, you need this setting (which is split
in two lines with a local variable to fit the page with in documentation):
@smallexample
BR=${WRS_OUTPUT_DIR}/build/buildroot-2011.11
BR=${WRS_OUTPUT_DIR}/build/buildroot-2016.02
export CROSS_COMPILE=${BR}/output/host/usr/bin/arm-linux-
@end smallexample
......@@ -914,7 +923,7 @@ Manual}.
The archives include a number of device special files in
@i{dev}. The pre-created devices come from
@i{userspace/devices.tar.gz}. Note that the buildroot output
directory, @i{build/buildroot-2011.11/output/target} does not
directory, @i{build/buildroot-2016.02/output/target} does not
include any device (and no white-rabbit specific files), so it
cannot be used as a root filesystem by itself.
......@@ -1436,6 +1445,25 @@ used in partial updates during development, please see
@t{/etc/init.d/wrs-boot-procedure} (in the source archive it is
distributed in @t{userspace/rootfs_override/}.
@c ==========================================================================
@node Restore default Barebox environment
@section Restore default Barebox environment
In some cases it might be necessary to restore default Barebox's environment.
Please note that so far switch uses only "Barebox-environment-backup"
partition. It doesn't use "Barebox-Environment".
Erasing can be performed from Barebox's commnad line:
@smallexample
erase /dev/env0
@end smallexample
or from Linux:
@smallexample
flash_erase /dev/mtd0 0 0
@end smallexample
@c ##########################################################################
@node WRS Internals
@chapter WRS Internals
......
doc/wrs-user-manual.in
View file @ 3da5579a
......@@ -1601,7 +1601,7 @@ WR-SWITCH-MIB::wrsPstatsHCRXFrames.2 = Counter64: 544
Another example is to print all objects exported by switch.
@smallexample
snmpwalk -c public -v 2c wrs -m all \
-M ${WRS_OUTPUT_DIR}/build/buildroot-2011.11/output/build/netsnmp-5.6.1.1/mibs/\
-M ${WRS_OUTPUT_DIR}/build/buildroot-2016.02/output/build/netsnmp-5.7.3/mibs/\
:${WR_SWITCH_SW}/userspace/snmpd/ \
1
@end smallexample
......@@ -1632,7 +1632,7 @@ Command @t{snmptable} can also be used to get simillar results:
@smallexample
snmptable -Cw 80 -c public -v 2c 192.168.1.10 -m all \
-M $WRS_OUTPUT_DIR/build/buildroot-2011.11/output/build/netsnmp-5.6.1.1/mibs/\
-M $WRS_OUTPUT_DIR/build/buildroot-2016.02/output/build/netsnmp-5.7.3/mibs/\
:userspace/snmpd/ WR-SWITCH-MIB::wrsPstatsHCTable
@end smallexample
Output is in text form and looks like:
......
kernel/wr_pstats/Makefile
View file @ 3da5579a
......@@ -8,5 +8,5 @@ all modules:
$(MAKE) -C $(LINUX) SUBDIRS=$(shell /bin/pwd) modules
clean:
rm -f *.mod.c *.o *.ko *.i .*cmd Module.symvers modules.order *~
rm -f *.mod.c *.o *.ko *.i .*cmd modules.order *~
rm -rf .tmp_versions
kernel/wr_pstats/Module.symvers 0 → 100644
View file @ 3da5579a
0x00000000 wr_nic_pstats_callback /home/awujek/wrs/wr-switch-sw/kernel/wr_nic/wr-nic EXPORT_SYMBOL
patches/barebox/v2014.04/env/bin/init
View file @ 3da5579a
......@@ -70,6 +70,11 @@ gpio_set_value 1 0
PS1="wrs-$eth0.ethaddr# "
# skip 2x16 lines, to keep barebox messages in the console's history
# otherwise mesages will be cleared by "menu -s ..." command
echo -e \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
echo -e \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
# Create the menu
#menu -r -m boot
menu -a -m boot -d "Welcome on WRSv3 Boot Sequence"
......
patches/buildroot/0001-Add-patch-to-fix-gets-firing-error-during-m4-compila.patch deleted 100644 → 0
View file @ e4094bdf
From 1e059efd441c14337ba1feb970ce6ca5191ae154 Mon Sep 17 00:00:00 2001
From: Benoit Rat <benoit@sevensols.com>
Date: Fri, 26 Jul 2013 12:08:04 +0200
Subject: [PATCH] Add patch to fix "gets" firing error during m4 compilation
---
package/m4/m4-1.4.15-fix_gets_firing_error.patch | 27 ++++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 package/m4/m4-1.4.15-fix_gets_firing_error.patch
diff --git a/package/m4/m4-1.4.15-fix_gets_firing_error.patch b/package/m4/m4-1.4.15-fix_gets_firing_error.patch
new file mode 100644
index 0000000..dac6bda
--- /dev/null
+++ b/package/m4/m4-1.4.15-fix_gets_firing_error.patch
@@ -0,0 +1,27 @@
+From e6f044da4b928e6ac48743732e1764a1fe9f8a00 Mon Sep 17 00:00:00 2001
+From: Benoit Rat <benoit@sevensols.com>
+Date: Fri, 26 Jul 2013 11:38:02 +0200
+Subject: [PATCH] gets generate error on new compiler
+
+---
+ lib/stdio.in.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/stdio.in.h b/lib/stdio.in.h
+index e98378a..98d03aa 100644
+--- a/lib/stdio.in.h
++++ b/lib/stdio.in.h
+@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#if HAVE_RAW_DECL_GETS
++ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+
+ #if 1
+ # if 0
+--
+1.8.1.2
+
--
1.8.1.2
patches/buildroot/0001-package-binutils-install-nm-on-the-target.patch 0 → 100644
View file @ 3da5579a
From 3b3cc3f24f3d86403abd3160e1285f6bc23e9d9d Mon Sep 17 00:00:00 2001
From: Adam Wujek <adam.wujek@cern.ch>
Date: Fri, 13 May 2016 16:55:34 +0200
Subject: [PATCH] package/binutils: install nm on the target
We don't need other binaries from the binutils package for wr-switch.
Library needed by nm (libbfd-2.24.so) is installed when BR2_PACKAGE_BINUTILS is
selected.
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
---
package/binutils/binutils.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index ca39f0b..7ea35fe 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -101,6 +101,8 @@ ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y)
define BINUTILS_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install
$(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install
+# also install nm
+ $(INSTALL) -m 755 $(@D)/binutils/nm-new $(TARGET_DIR)/usr/bin/nm
endef
endif
--
1.9.1
patches/buildroot/0002-gcc-no-docs.patch deleted 100644 → 0
View file @ e4094bdf
--- ./toolchain/gcc/4.3.6/gcc-no-docs.patch.orig 2014-05-27 12:06:43.000000000 +0200
+++ ./toolchain/gcc/4.3.6/gcc-no-docs.patch 2014-05-27 12:05:55.000000000 +0200
@@ -0,0 +1,194 @@
+--- gcc-4.3.6/gcc/configure.ac.orig 2014-05-27 11:57:52.000000000 +0200
++++ gcc-4.3.6/gcc/configure.ac 2014-05-27 12:02:59.000000000 +0200
+@@ -847,17 +847,10 @@
+
+ # See if makeinfo has been installed and is modern enough
+ # that we can use it.
+-ACX_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
+- [GNU texinfo.* \([0-9][0-9.]*\)],
+- [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
+-if test $gcc_cv_prog_makeinfo_modern = no; then
+- AC_MSG_WARN([
+-*** Makeinfo is missing or too old.
+-*** Info documentation will not be built.])
+- BUILD_INFO=
+-else
+- BUILD_INFO=info
+-fi
++
++ MAKEINFO="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing makeinfo"
++ BUILD_INFO=
++
+ AC_SUBST(BUILD_INFO)
+
+ # Is pod2man recent enough to regenerate manpages?
+--- gcc-4.3.6/gcc/configure.orig 2014-05-27 11:57:52.000000000 +0200
++++ gcc-4.3.6/gcc/configure 2014-05-27 12:02:25.000000000 +0200
+@@ -7838,82 +7838,8 @@
+ fi
+
+
+-# See if makeinfo has been installed and is modern enough
+-# that we can use it.
+-
+- # Extract the first word of "makeinfo", so it can be a program name with args.
+-set dummy makeinfo; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_MAKEINFO+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$MAKEINFO"; then
+- ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_MAKEINFO="makeinfo"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-MAKEINFO=$ac_cv_prog_MAKEINFO
+-if test -n "$MAKEINFO"; then
+- echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+-echo "${ECHO_T}$MAKEINFO" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+- if test -n "$MAKEINFO"; then
+- # Found it, now check the version.
+- echo "$as_me:$LINENO: checking for modern makeinfo" >&5
+-echo $ECHO_N "checking for modern makeinfo... $ECHO_C" >&6
+-if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_prog_version=`eval $MAKEINFO --version 2>&1 |
+- sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
+-
+- case $ac_prog_version in
+- '') gcc_cv_prog_makeinfo_modern=no;;
+- 4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*) gcc_cv_prog_makeinfo_modern=yes;;
+- *) gcc_cv_prog_makeinfo_modern=no;;
+- esac
+-
+-fi
+-echo "$as_me:$LINENO: result: $gcc_cv_prog_makeinfo_modern" >&5
+-echo "${ECHO_T}$gcc_cv_prog_makeinfo_modern" >&6
+- else
+- gcc_cv_prog_makeinfo_modern=no
+- fi
+- if test $gcc_cv_prog_makeinfo_modern = no; then
+ MAKEINFO="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing makeinfo"
+- fi
+-
+-if test $gcc_cv_prog_makeinfo_modern = no; then
+- { echo "$as_me:$LINENO: WARNING:
+-*** Makeinfo is missing or too old.
+-*** Info documentation will not be built." >&5
+-echo "$as_me: WARNING:
+-*** Makeinfo is missing or too old.
+-*** Info documentation will not be built." >&2;}
+- BUILD_INFO=
+-else
+- BUILD_INFO=info
+-fi
+-
++ BUILD_INFO=
+
+ # Is pod2man recent enough to regenerate manpages?
+ echo "$as_me:$LINENO: checking for recent Pod::Man" >&5
+--- gcc-4.3.6/libiberty/configure.ac.orig 2014-05-27 11:58:00.000000000 +0200
++++ gcc-4.3.6/libiberty/configure.ac 2014-05-27 12:01:18.000000000 +0200
+@@ -62,32 +62,10 @@
+ AC_SUBST(MAINT)dnl
+ AC_SUBST(NOTMAINT)dnl
+
+-# Do we have a single-tree copy of texinfo? Even if we do, we can't
+-# rely on it - libiberty is built before texinfo.
+-AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, )
+-if test "x$MAKEINFO" = "x"; then
++ # Hack: don't build docs, new makeinfo errors for formatting aesthetics
+ MAKEINFO="@echo makeinfo missing; true"
+- BUILD_INFO=
+-else
+- BUILD_INFO=info
+- case "$MAKEINFO" in
+- */missing\ makeinfo*)
+- BUILD_INFO=
+- AC_MSG_WARN([
+-*** Makeinfo is missing. Info documentation will not be built.])
+- ;;
+- *)
+- case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in
+- x*\ [[1-3]].* )
+- MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required; true"
+- BUILD_INFO=
+- AC_MSG_WARN([
+-*** Makeinfo is too old. Info documentation will not be built.])
+- ;;
+- esac
+- ;;
+- esac
+-fi
++ MAKEINFO=true
++
+ AC_SUBST(MAKEINFO)
+ AC_SUBST(BUILD_INFO)
+
+--- gcc-4.3.6/libiberty/configure.orig 2014-05-27 11:58:00.000000000 +0200
++++ gcc-4.3.6/libiberty/configure 2014-05-27 12:01:23.000000000 +0200
+@@ -1431,43 +1431,8 @@
+
+ fi
+ fi
+-MAKEINFO=$ac_cv_prog_MAKEINFO
+-if test -n "$MAKEINFO"; then
+- echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+-echo "${ECHO_T}$MAKEINFO" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-if test "x$MAKEINFO" = "x"; then
+ MAKEINFO="@echo makeinfo missing; true"
+ BUILD_INFO=
+-else
+- BUILD_INFO=info
+- case "$MAKEINFO" in
+- */missing\ makeinfo*)
+- BUILD_INFO=
+- { echo "$as_me:$LINENO: WARNING:
+-*** Makeinfo is missing. Info documentation will not be built." >&5
+-echo "$as_me: WARNING:
+-*** Makeinfo is missing. Info documentation will not be built." >&2;}
+- ;;
+- *)
+- case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in
+- x*\ [1-3].* )
+- MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required; true"
+- BUILD_INFO=
+- { echo "$as_me:$LINENO: WARNING:
+-*** Makeinfo is too old. Info documentation will not be built." >&5
+-echo "$as_me: WARNING:
+-*** Makeinfo is too old. Info documentation will not be built." >&2;}
+- ;;
+- esac
+- ;;
+- esac
+-fi
+-
+
+
+ # Extract the first word of "perl", so it can be a program name with args.
patches/buildroot/0002-package-procps-ng-install-libprocps.pc-in-staging-us.patch 0 → 100644
View file @ 3da5579a
From 0e07a5edeb1c596e1af9cd9de153b80761b45aef Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Sat, 26 Mar 2016 14:27:36 +0100
Subject: [PATCH] package/procps-ng: install libprocps.pc in
staging/usr/lib/pkgconfig/
Since 834893a965a993e8a73e30b448426f626419f3c8, pkg-config --libs libprocps
doesn't work anymore because libprocps.pc is installed in
STAGING_DIR/lib/pkgconfig/ instead of STAGING_DIR/usr/lib/pkgconfig/.
Add --libdir=/usr/lib in PROCPS_NG_CONF_OPTS to fixes the issue.
Note that libprocps.so is now installed in /usr/lib/ instead of /lib/.
Fixes:
http://autobuild.buildroot.net/results/2e5/2e5100ccf1ed336c26b83930e7149941c97fc4d2/
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/procps-ng/procps-ng.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk
index fb1b236..51a70a5 100644
--- a/package/procps-ng/procps-ng.mk
+++ b/package/procps-ng/procps-ng.mk
@@ -35,7 +35,11 @@ endif
# Make sure binaries get installed in /bin, so that they overwrite
# their busybox counterparts.
-PROCPS_NG_CONF_OPTS += --exec-prefix=/
+# Make sure libprocps.pc is installed in STAGING_DIR/usr/lib/pkgconfig/
+# otherwise it's installed in STAGING_DIR/lib/pkgconfig/ breaking
+# pkg-config --libs libprocps.
+PROCPS_NG_CONF_OPTS += --exec-prefix=/ \
+ --libdir=/usr/lib
# Allows unicode characters to show in 'watch'
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
--
1.9.1
patches/buildroot/0003-autoconfig-doc.patch deleted 100644 → 0
View file @ e4094bdf
--- ./package/autoconf/autoconf-2.65-doc-hack-for-new-makeinfo.patch.orig 2014-05-27 15:01:44.000000000 +0200
+++ ./package/autoconf/autoconf-2.65-doc-hack-for-new-makeinfo.patch 2014-05-27 15:02:15.000000000 +0200
@@ -0,0 +1,12 @@
+--- ./doc/autoconf.texi.orig 2014-05-27 14:51:18.713711000 +0200
++++ ./doc/autoconf.texi 2014-05-27 14:54:28.133711000 +0200
+@@ -23310,8 +23310,7 @@
+ be a single shell word that expands into a single file name.
+ @end defmac
+
+-@defmac AT_CHECK (@var{commands}, @dvar{status, 0}, @ovar{stdout}, @
+- @ovar{stderr}, @ovar{run-if-fail}, @ovar{run-if-pass})
++@defmac AT_CHECK (@var{commands}, @dvar{status, 0}, @ovar{stdout}, @ovar{stderr}, @ovar{run-if-fail}, @ovar{run-if-pass})
+ @defmacx AT_CHECK_UNQUOTED (@var{commands}, @dvar{status, 0}, @ovar{stdout}, @
+ @ovar{stderr}, @ovar{run-if-fail}, @ovar{run-if-pass})
+ @atindex{CHECK}
patches/buildroot/0003-busybox-tweak-IPv6-largefile-handling.patch 0 → 100644
View file @ 3da5579a
From 7a5be2a042f3c1d55c5599ad819333a2150955ff Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 4 Mar 2016 16:47:38 +0100
Subject: [PATCH 2/2] busybox: tweak IPv6/largefile handling
Fixes #8736
When IPv6 and largefile options were removed from Buildroot, the code to
force these options in busybox were still left in.
There's no strong reason to forcefully enable these options (only to disable
options if the system cannot support it like we do for nommu), so instead
enable the options in our default defconfig, allowing people to override
this if they use a custom config.
While we're at it, enable the prefer-ipv4 option so network applets like
ntpd doesn't fail when dual stacked hosts are resolved from a system without
IPv6 support enabled in the kernel.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/busybox/busybox.mk | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 7f6dbd6..7c904c8 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -107,16 +107,6 @@ define BUSYBOX_SET_MMU
endef
endif
-define BUSYBOX_SET_LARGEFILE
- $(call KCONFIG_ENABLE_OPT,CONFIG_LFS,$(BUSYBOX_BUILD_CONFIG))
- $(call KCONFIG_ENABLE_OPT,CONFIG_FDISK_SUPPORT_LARGE_DISKS,$(BUSYBOX_BUILD_CONFIG))
-endef
-
-define BUSYBOX_SET_IPV6
- $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IPV6,$(BUSYBOX_BUILD_CONFIG))
- $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG))
-endef
-
# If we're using static libs do the same for busybox
ifeq ($(BR2_STATIC_LIBS),y)
define BUSYBOX_PREFER_STATIC
@@ -219,8 +209,6 @@ endef
define BUSYBOX_KCONFIG_FIXUP_CMDS
$(BUSYBOX_SET_MMU)
- $(BUSYBOX_SET_LARGEFILE)
- $(BUSYBOX_SET_IPV6)
$(BUSYBOX_PREFER_STATIC)
$(BUSYBOX_SET_MDEV)
$(BUSYBOX_SET_CRYPT_SHA)
--
1.9.1
patches/buildroot/0004-add-monit.patch deleted 100644 → 0
View file @ e4094bdf
This diff is collapsed.
userspace/libwr/include/libwr/util.h
View file @ 3da5579a
This diff is collapsed.
userspace/libwr/ptpd_netif.c
View file @ 3da5579a
This diff is collapsed.
userspace/libwr/util.c
View file @ 3da5579a
This diff is collapsed.
userspace/rootfs_override/etc/ifplugd/ifplugd.action deleted 100755 → 0
View file @ e4094bdf
This diff is collapsed.
userspace/rootfs_override/etc/ifplugd/ifplugd.conf deleted 100644 → 0
View file @ e4094bdf
# our ifplugd (0.28) is not reading this file, so force it
# empty in WR switch to avoid getting mad in tracking its use
userspace/rootfs_override/etc/init.d/hwinfo
View file @ 3da5579a
This diff is collapsed.
userspace/rootfs_override/usr/bin/nm deleted 100755 → 0
View file @ e4094bdf
This diff is collapsed.
userspace/rootfs_override/usr/lib/libbfd-2.21.1.so deleted 100755 → 0
View file @ e4094bdf
This diff is collapsed.
userspace/tools/com.c
View file @ 3da5579a
This diff is collapsed.
userspace/tools/mapper.c
View file @ 3da5579a
This diff is collapsed.
userspace/tools/wmapper.c
View file @ 3da5579a
This diff is collapsed.
userspace/tools/wr_mon.c
View file @ 3da5579a
This diff is collapsed.
userspace/tools/wrs_vlans.c
View file @ 3da5579a
This diff is collapsed.
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