[U-Boot] [PATCH] .travis.yml: rework according to new travis-ci infra
- install using addons.apt - remove MAKEALL - split mpc85xx boards - remove TEST_CONFIG_CMD, just info - fetch mips toolchain via buildman - remove --list-error-boards param - conditional script - use TOOLCHAIN instead of INSTALL_TOOLCHAIN - add aarch64 - enable notifications via email Signed-off-by: Roger Meier <r.me...@siemens.com> Cc: Wolfgang Denk <w...@denx.de> Cc: Heiko Schocher <h...@denx.de> Cc: Tom Rini <tr...@ti.com> Cc: Daniel Schwierzeck <daniel.schwierz...@gmail.com> Cc: Andreas Färber <afaer...@suse.de> --- .travis.yml | 217 1 file changed, 88 insertions(+), 129 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e20e09..67674e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,23 +5,29 @@ language: c +addons: + apt: +packages: +- cppcheck +- sloccount +- sparse +- bc +- build-essential +- libsdl1.2-dev + cache: - apt install: - # install U-Boot build dependencies - - sudo apt-get install -qq cppcheck sloccount sparse bc libsdl-dev build-essential # install latest device tree compiler - git clone --depth=1 https://git.kernel.org/pub/scm/utils/dtc/dtc.git /tmp/dtc - make -j4 -C /tmp/dtc # prepare buildman environment - export BUILDMAN_ROOT="root:" - - export BUILDMAN_MIPS="mips:" - export BUILDMAN_PPC="ppc:" - export BUILDMAN_ARM="arm:" - export BUILDMAN_SANDBOX="sandbox:" - echo -e "[toolchain]\n${BUILDMAN_ROOT} /\n" > ~/.buildman - - echo -e "${BUILDMAN_MIPS} /opt/eldk-5.4/mips/sysroots/i686-eldk-linux/usr/bin/mips32-linux/\n" >> ~/.buildman - echo -e "${BUILDMAN_PPC} /opt/eldk-5.4/powerpc/sysroots/i686-eldk-linux/usr/bin/powerpc-linux/\n" >> ~/.buildman - echo -e "${BUILDMAN_ARM} /opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi/\n" >> ~/.buildman - echo -e "${BUILDMAN_SANDBOX} /usr/bin/gcc\n" >> ~/.buildman @@ -35,165 +41,121 @@ env: global: - PATH=/tmp/dtc:$PATH - BUILD_DIR=build -- CROSS_COMPILE="" - HOSTCC="cc" - HOSTCXX="c++" -- TEST_CONFIG_CMD="" before_script: - # install toolchains based on INSTALL_TOOLCHAIN} variable - - if [[ "${INSTALL_TOOLCHAIN}" == *arm* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/armv5te/eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *arm* ]]; then sh eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh -y ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *arm* ]]; then ls -al /opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *avr32* ]]; then ./tools/buildman/buildman --fetch-arch avr32 ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *i386* ]]; then ./tools/buildman/buildman sandbox --fetch-arch i386 ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *mips* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/mips/eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *mips* ]]; then sh eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh -y ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *ppc* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi + # install toolchains based on TOOLCHAIN} variable + - if [[ "${TOOLCHAIN}" == *aarch64* ]]; then ./tools/buildman/buildman --fetch-arch aarch64 ; fi + - if [[ "${TOOLCHAIN}" == *arm* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/armv5te/eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh ; fi + - if [[ "${TOOLCHAIN}" == *arm* ]]; then sh eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh -y ; fi + - if [[ "${TOOLCHAIN}" == *avr32* ]]; then ./tools/buildman/buildman --fetch-arch avr32 ; fi + - if [[ "${TOOLCHAIN}" == *i386* ]]; then ./tools/buildman/buildman sandbox --fetch-arch i386 ; fi + - if [[ "${TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi + - if [[ "${TOOLCHAIN}" == *mips* ]]; then ./tools/buildman/buildman --fetch-arch mips ; fi + - if [[ "${TOOLCHAIN}" == *ppc* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh ; fi + - if [[ "${TOOLCHAIN}" == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi script: # the execution sequence for each test - - echo ${TEST_CONFIG_CMD} - - ${TEST_CONFIG_CMD} - - echo ${TEST_CMD} - -
[U-Boot] [PATCH v4] .travis.yml: build u-boot on travis-ci
From: Meier, Roger r.me...@siemens.com Goal: - building all variants of U-Boot with multiple configurations - code quality checks and metrics - https://travis-ci.org/u-boot/u-boot/builds --- Changes for v4: - ignore HACKKIT board (suggested by Wolfgang Denk) - add /tmp/dtc as first element to PATH (suggested by Wolfgang Denk) Changes for v3: - fix patch format (recognized by Andreas Färber) - get in touch with GitHub about the orphan u-boot account and get it - install travis-ci hook on the account https://github.com/u-boot/u-boot/ - push master and travis branch to https://github.com/u-boot/u-boot/ - add Goal to the commit message Changes for v2: - use latest device tree compiler (suggested by Daniel Schwierzeck) - add sandbox (suggested by Daniel Schwierzeck) - seperate echo and execution of TEST_CMD - remove BUILD_NCPUS( part of script) - introduce ${TEST_CONFIG_CMD} - add libsdl-dev package which is required by sandbox - use buildman (suggested by Tom Rini) - generate ~/.buildman - split ppc into several jobs - install gcc-arm-linux-gnueabihf - use --inline-suppr option for cppcheck Signed-off-by: Roger Meier r.me...@siemens.com Cc: Wolfgang Denk w...@denx.de Cc: Tom Rini tr...@ti.com Cc: Daniel Schwierzeck daniel.schwierz...@gmail.com Cc: Andreas Färber afaer...@suse.de --- .travis.yml | 150 +++ 1 file changed, 150 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..90f0fd7 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,150 @@ +# Copyright Roger Meier r.me...@siemens.com +# SPDX-License-Identifier: GPL-2.0+ + +# build U-Boot on Travis CI - https://travis-ci.org/ + +language: c + +cache: + - apt + +install: + # install U-Boot build dependencies + - sudo apt-get install -qq cppcheck sloccount sparse bc libsdl-dev gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf + # install latest device tree compiler + - git clone --depth=1 https://git.kernel.org/pub/scm/utils/dtc/dtc.git /tmp/dtc + - make -j4 -C /tmp/dtc + # prepare buildman environment + - export BUILDMAN_ROOT=root: + - export BUILDMAN_MIPS=mips: + - export BUILDMAN_PPC=ppc: + - echo -e [toolchain]\\n${BUILDMAN_ROOT} /\n ~/.buildman + - echo -e ${BUILDMAN_MIPS} /opt/eldk-5.4/mips/sysroots/i686-eldk-linux/usr/bin/mips32-linux/ ~/.buildman + - echo -e ${BUILDMAN_PPC} /opt/eldk-5.4/powerpc/sysroots/i686-eldk-linux/usr/bin/powerpc-linux/ ~/.buildman + - export BUILDMAN_ALIAS=x86: + - echo -e [toolchain-alias]\\n${BUILDMAN_ALIAS} i386 ~/.buildman + - cat ~/.buildman + +env: + global: +- PATH=/tmp/dtc:$PATH +- BUILD_DIR=build +- CROSS_COMPILE= +- HOSTCC=cc +- HOSTCXX=c++ +- TEST_CONFIG_CMD= + +before_script: + # install toolchains based on INSTALL_TOOLCHAIN} variable + - if [[ ${INSTALL_TOOLCHAIN} == *ppc* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh ; fi + - if [[ ${INSTALL_TOOLCHAIN} == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi + - if [[ ${INSTALL_TOOLCHAIN} == *mips* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/mips/eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh ; fi + - if [[ ${INSTALL_TOOLCHAIN} == *mips* ]]; then sh eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh -y ; fi + +script: + # the execution sequence for each test + - echo ${TEST_CONFIG_CMD} + - ${TEST_CONFIG_CMD} + - echo ${TEST_CMD} + - ${TEST_CMD} + +matrix: + include: + # we need to build by vendor due to 50min time limit for builds + # each env setting here is a dedicated build +- env: +- TEST_CMD=./MAKEALL -a arm -v atmel + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v denx + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v freescale + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v siemens + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v ti + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CONFIG_CMD=make sandbox_defconfig + TEST_CMD=make -j4 + HOSTCC = gcc + HOSTCXX = g++ +- env: +- TEST_CONFIG_CMD=make sandbox_defconfig + TEST_CMD=make -j4 + HOSTCC = clang + HOSTCXX = clang++ +- env: +- TEST_CMD=./MAKEALL -a mips + INSTALL_TOOLCHAIN=mips + CROSS_COMPILE=/opt/eldk-5.4/mips/sysroots/i686-eldk-linux/usr/bin/mips32-linux/mips-linux- +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards atmel +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards denx +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards freescale arm +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards
[U-Boot] [PATCH v3] .travis.yml: build u-boot on travis-ci
From: Meier, Roger r.me...@siemens.com Goal: - building all variants of U-Boot with multiple configurations - code quality checks and metrics - https://travis-ci.org/u-boot/u-boot/builds Changes for v3: - fix patch format (recognized by Andreas Färber) - get in touch with GitHub about the orphan u-boot account and get it - install travis-ci hook on the account https://github.com/u-boot/u-boot/ - push master and travis branch to https://github.com/u-boot/u-boot/ - add Goal to the commit message Changes for v2: - use latest device tree compiler (suggested by Daniel Schwierzeck) - add sandbox (suggested by Daniel Schwierzeck) - seperate echo and execution of TEST_CMD - remove BUILD_NCPUS( part of script) - introduce ${TEST_CONFIG_CMD} - add libsdl-dev package which is required by sandbox - use buildman (suggested by Tom Rini) - generate ~/.buildman - split ppc into several jobs - install gcc-arm-linux-gnueabihf - use --inline-suppr option for cppcheck Signed-off-by: Roger Meier r.me...@siemens.com Cc: Wolfgang Denk w...@denx.de Cc: Tom Rini tr...@ti.com Cc: Daniel Schwierzeck daniel.schwierz...@gmail.com Cc: Andreas Färber afaer...@suse.de --- .travis.yml | 148 +++ 1 file changed, 148 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..7488a3f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,148 @@ +# Copyright Roger Meier r.me...@siemens.com +# SPDX-License-Identifier: GPL-2.0+ + +# build U-Boot on Travis CI - https://travis-ci.org/ + +language: c + +cache: + - apt + +install: + # install U-Boot build dependencies + - sudo apt-get install -qq cppcheck sloccount sparse bc libsdl-dev gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf + # install latest device tree compiler + - git clone --depth=1 https://git.kernel.org/pub/scm/utils/dtc/dtc.git /tmp/dtc + - make -j4 -C /tmp/dtc + # prepare buildman environment + - export BUILDMAN_ROOT=root: + - export BUILDMAN_MIPS=mips: + - export BUILDMAN_PPC=ppc: + - echo -e [toolchain]\\n${BUILDMAN_ROOT} /\n ~/.buildman + - echo -e ${BUILDMAN_MIPS} /opt/eldk-5.4/mips/sysroots/i686-eldk-linux/usr/bin/mips32-linux/ ~/.buildman + - echo -e ${BUILDMAN_PPC} /opt/eldk-5.4/powerpc/sysroots/i686-eldk-linux/usr/bin/powerpc-linux/ ~/.buildman + - export BUILDMAN_ALIAS=x86: + - echo -e [toolchain-alias]\\n${BUILDMAN_ALIAS} i386 ~/.buildman + - cat ~/.buildman + +env: + global: +- PATH=$PATH:/tmp/dtc +- BUILD_DIR=build +- CROSS_COMPILE= +- HOSTCC=cc +- HOSTCXX=c++ +- TEST_CONFIG_CMD= + +before_script: + # install toolchains based on INSTALL_TOOLCHAIN} variable + - if [[ ${INSTALL_TOOLCHAIN} == *ppc* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh ; fi + - if [[ ${INSTALL_TOOLCHAIN} == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi + - if [[ ${INSTALL_TOOLCHAIN} == *mips* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/mips/eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh ; fi + - if [[ ${INSTALL_TOOLCHAIN} == *mips* ]]; then sh eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh -y ; fi + +script: + # the execution sequence for each test + - echo ${TEST_CONFIG_CMD} + - ${TEST_CONFIG_CMD} + - echo ${TEST_CMD} + - ${TEST_CMD} + +matrix: + include: + # we need to build by vendor due to 50min time limit for builds + # each env setting here is a dedicated build +- env: +- TEST_CMD=./MAKEALL -a arm -v atmel + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v denx + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v freescale + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v siemens + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v ti + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CONFIG_CMD=make sandbox_defconfig + TEST_CMD=make -j4 + HOSTCC = gcc + HOSTCXX = g++ +- env: +- TEST_CONFIG_CMD=make sandbox_defconfig + TEST_CMD=make -j4 + HOSTCC = clang + HOSTCXX = clang++ +- env: +- TEST_CMD=./MAKEALL -a mips + INSTALL_TOOLCHAIN=mips + CROSS_COMPILE=/opt/eldk-5.4/mips/sysroots/i686-eldk-linux/usr/bin/mips32-linux/mips-linux- +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards atmel +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards denx +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards freescale arm +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards siemens +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards ti +- env: +- TEST_CMD=tools/buildman/buildman mips
[U-Boot] [PATCH v2] .travis.yml: build u-boot on travis-ci
--- Changes for v2: - use latest device tree compiler (suggested by Daniel Schwierzeck) - add sandbox (suggested by Daniel Schwierzeck) - seperate echo and execution of TEST_CMD - remove BUILD_NCPUS( part of script) - introduce ${TEST_CONFIG_CMD} - add libsdl-dev package which is required by sandbox - use buildman (suggested by Tom Rini) - generate ~/.buildman - split ppc into several jobs - install gcc-arm-linux-gnueabihf - use --inline-suppr option for cppcheck Signed-off-by: Roger Meier r.me...@siemens.com Cc: Wolfgang Denk w...@denx.de Cc: Tom Rini tr...@ti.com Cc: Daniel Schwierzeck daniel.schwierz...@gmail.com --- .travis.yml | 148 +++ 1 file changed, 148 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..7488a3f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,148 @@ +# Copyright Roger Meier r.me...@siemens.com +# SPDX-License-Identifier: GPL-2.0+ + +# build U-Boot on Travis CI - https://travis-ci.org/ + +language: c + +cache: + - apt + +install: + # install U-Boot build dependencies + - sudo apt-get install -qq cppcheck sloccount sparse bc libsdl-dev gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf + # install latest device tree compiler + - git clone --depth=1 https://git.kernel.org/pub/scm/utils/dtc/dtc.git /tmp/dtc + - make -j4 -C /tmp/dtc + # prepare buildman environment + - export BUILDMAN_ROOT=root: + - export BUILDMAN_MIPS=mips: + - export BUILDMAN_PPC=ppc: + - echo -e [toolchain]\\n${BUILDMAN_ROOT} /\n ~/.buildman + - echo -e ${BUILDMAN_MIPS} /opt/eldk-5.4/mips/sysroots/i686-eldk-linux/usr/bin/mips32-linux/ ~/.buildman + - echo -e ${BUILDMAN_PPC} /opt/eldk-5.4/powerpc/sysroots/i686-eldk-linux/usr/bin/powerpc-linux/ ~/.buildman + - export BUILDMAN_ALIAS=x86: + - echo -e [toolchain-alias]\\n${BUILDMAN_ALIAS} i386 ~/.buildman + - cat ~/.buildman + +env: + global: +- PATH=$PATH:/tmp/dtc +- BUILD_DIR=build +- CROSS_COMPILE= +- HOSTCC=cc +- HOSTCXX=c++ +- TEST_CONFIG_CMD= + +before_script: + # install toolchains based on INSTALL_TOOLCHAIN} variable + - if [[ ${INSTALL_TOOLCHAIN} == *ppc* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh ; fi + - if [[ ${INSTALL_TOOLCHAIN} == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi + - if [[ ${INSTALL_TOOLCHAIN} == *mips* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/mips/eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh ; fi + - if [[ ${INSTALL_TOOLCHAIN} == *mips* ]]; then sh eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh -y ; fi + +script: + # the execution sequence for each test + - echo ${TEST_CONFIG_CMD} + - ${TEST_CONFIG_CMD} + - echo ${TEST_CMD} + - ${TEST_CMD} + +matrix: + include: + # we need to build by vendor due to 50min time limit for builds + # each env setting here is a dedicated build +- env: +- TEST_CMD=./MAKEALL -a arm -v atmel + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v denx + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v freescale + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v siemens + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v ti + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CONFIG_CMD=make sandbox_defconfig + TEST_CMD=make -j4 + HOSTCC = gcc + HOSTCXX = g++ +- env: +- TEST_CONFIG_CMD=make sandbox_defconfig + TEST_CMD=make -j4 + HOSTCC = clang + HOSTCXX = clang++ +- env: +- TEST_CMD=./MAKEALL -a mips + INSTALL_TOOLCHAIN=mips + CROSS_COMPILE=/opt/eldk-5.4/mips/sysroots/i686-eldk-linux/usr/bin/mips32-linux/mips-linux- +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards atmel +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards denx +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards freescale arm +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards siemens +- env: +- TEST_CMD=tools/buildman/buildman --list-error-boards ti +- env: +- TEST_CMD=tools/buildman/buildman mips + INSTALL_TOOLCHAIN=mips +- env: +- TEST_CMD=tools/buildman/buildman mpc5xx + INSTALL_TOOLCHAIN=ppc +- env: +- TEST_CMD=tools/buildman/buildman mpc8xx + INSTALL_TOOLCHAIN=ppc +- env: +- TEST_CMD=tools/buildman/buildman mpc5xxx + INSTALL_TOOLCHAIN=ppc +- env: +- TEST_CMD=tools/buildman/buildman mpc512x + INSTALL_TOOLCHAIN=ppc +- env: +- TEST_CMD=tools/buildman/buildman mpc824x + INSTALL_TOOLCHAIN=ppc +- env: +- TEST_CMD
[U-Boot] [PATCH] .travis.yml: build u-boot on travis-ci
Signed-off-by: Roger Meier r.me...@siemens.com --- .travis.yml | 86 +++ 1 file changed, 86 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..027aff2 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,86 @@ +# Copyright Roger Meier r.me...@siemens.com +# SPDX-License-Identifier: GPL-2.0+ + +# build U-Boot on Travis CI - https://travis-ci.org/ + +language: c + +cache: + - apt + +install: + - sudo apt-get install -qq cppcheck sloccount sparse bc device-tree-compiler gcc-arm-linux-gnueabi + +env: + global: +- BUILD_DIR=build +- DOWNLOAD_URL= +- INSTALL_CMD= +- CROSS_COMPILE= +- HOSTCC = cc +- HOSTCXX = c++ + +before_script: + - if [[ $DOWNLOAD_URL != ]]; then wget $DOWNLOAD_URL ; fi + - if [[ $INSTALL_CMD != ]]; then $INSTALL_CMD ; fi + +script: + - export BUILD_NCPUS=`grep processor /proc/cpuinfo | wc -l` + - echo BUILD on $BUILD_NCPUS cpu's + - echo $TEST_CMD $TEST_CMD + +matrix: + include: +# arm and powerpc have too many boards for th 50min time limit +# so we need to build by vendor +- env: +- TEST_CMD=./MAKEALL -a arm -v atmel + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v denx + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v freescale + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v siemens + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a arm -v ti + CROSS_COMPILE=arm-linux-gnueabi- +- env: +- TEST_CMD=./MAKEALL -a x86 +- HOSTCC = gcc +- HOSTCXX = g++ +- env: +- TEST_CMD=./MAKEALL -a x86 +- HOSTCC = clang +- HOSTCXX = clang++ +- env: +- TEST_CMD=./MAKEALL -a powerpc -v freescale + CROSS_COMPILE=/opt/eldk-5.4/powerpc/sysroots/i686-eldk-linux/usr/bin/powerpc-linux/powerpc- + DOWNLOAD_URL=ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh; + INSTALL_CMD=sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y +- env: +- TEST_CMD=./MAKEALL -a mips + CROSS_COMPILE=/opt/eldk-5.4/mips/sysroots/i686-eldk-linux/usr/bin/mips32-linux/mips-linux- + DOWNLOAD_URL=ftp://ftp.denx.de/pub/eldk/5.4/targets/mips/eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh; + INSTALL_CMD=sh eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh -y +- env: +- TEST_CMD=./MAKEALL -a arm -v denx -v siemens + CROSS_COMPILE=/opt/eldk-5.4/armv7a-hf/sysroots/i686-eldk-linux/usr/bin/armv7ahf-vfp-neon-linux-gnueabi/arm-linux-gnueabi- + DOWNLOAD_URL=ftp://ftp.denx.de/pub/eldk/5.4/targets/armv7a-hf/eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh; + INSTALL_CMD=sh eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh -y +- env: +- TEST_CMD=cppcheck --force --quiet . +- env: +- TEST_CMD=grep -r TODO * +- env: +- TEST_CMD=grep -r FIXME * +- env: +- TEST_CMD=grep -r HACK * +- env: +- TEST_CMD=sloccount . + +notifications: + email: false -- 1.7.10.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4] Makefile: remove generated boards.cfg within make distclean
Signed-off-by: Roger Meier ro...@bufferoverflow.ch Cc: Masahiro Yamada yamad...@jp.panasonic.com Cc: Tom Rini tr...@ti.com Cc: Wolfgang Denk w...@denx.de Cc: Simon Glass s...@chromium.org --- Changes for v2: - remove boards.cfg within make distclean instead of mrproper - use mrproper instead of distclean within MAKEALL Changes for v3: - use @rm instead of rm as suggested by Masahiro Yamada Changes for v4: - remove the backslash after xargs rm -f - use mrproper instead of distclean within buildman --- MAKEALL |2 +- Makefile|1 + tools/buildman/builder.py |2 +- tools/buildman/builderthread.py |6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MAKEALL b/MAKEALL index 929fe88..392ea8d 100755 --- a/MAKEALL +++ b/MAKEALL @@ -658,7 +658,7 @@ build_target() { MAKE=${MAKE} O=${output_dir} fi - ${MAKE} distclean /dev/null + ${MAKE} mrproper /dev/null echo Building ${target} board... ${MAKE} -s ${target}_defconfig /dev/null diff --git a/Makefile b/Makefile index b5d5e01..c3d7afd 100644 --- a/Makefile +++ b/Makefile @@ -1287,6 +1287,7 @@ distclean: mrproper -o -name '.*.rej' -o -name '*%' -o -name 'core' \ -o -name '*.pyc' \) \ -type f -print | xargs rm -f + @rm -f boards.cfg backup: F=`basename $(srctree)` ; cd .. ; \ diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index d5b8454..a555bd8 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -308,7 +308,7 @@ class Builder: Args: commit: Commit object that is being built brd: Board object that is being built -stage: Stage that we are at (distclean, config, build) +stage: Stage that we are at (mrproper, config, build) cwd: Directory where make should be run args: Arguments to pass to make kwargs: Arguments to pass to command.RunPipe() diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index 32297e2..8214662 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -91,7 +91,7 @@ class BuilderThread(threading.Thread): commit: Commit object that is being built brd: Board object that is being built stage: Stage of the build. Valid stages are: -distclean - can be called to clean source +mrproper - can be called to clean source config - called to configure for a board build - the main make invocation - it does the build args: A list of arguments to pass to 'make' @@ -200,8 +200,8 @@ class BuilderThread(threading.Thread): # If we need to reconfigure, do that now if do_config: -result = self.Make(commit, brd, 'distclean', cwd, -'distclean', *args, env=env) +result = self.Make(commit, brd, 'mrproper', cwd, +'mrproper', *args, env=env) result = self.Make(commit, brd, 'config', cwd, *(args + config_args), env=env) config_out = result.combined -- 1.7.10.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3] Makefile: remove generated boards.cfg within make distclean
Signed-off-by: Roger Meier ro...@bufferoverflow.ch CC: Masahiro Yamada yamad...@jp.panasonic.com CC: Tom Rini tr...@ti.com CC: Wolfgang Denk w...@denx.de --- Changes for v2: - remove boards.cfg within make distclean instead of mrproper - use mrproper instead of distclean within MAKEALL Changes for v3: - use @rm instead of rm as suggested by Masahiro Yamada --- MAKEALL |2 +- Makefile |3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MAKEALL b/MAKEALL index 929fe88..392ea8d 100755 --- a/MAKEALL +++ b/MAKEALL @@ -658,7 +658,7 @@ build_target() { MAKE=${MAKE} O=${output_dir} fi - ${MAKE} distclean /dev/null + ${MAKE} mrproper /dev/null echo Building ${target} board... ${MAKE} -s ${target}_defconfig /dev/null diff --git a/Makefile b/Makefile index 666d291..6679408 100644 --- a/Makefile +++ b/Makefile @@ -1285,7 +1285,8 @@ distclean: mrproper -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ -o -name '.*.rej' -o -name '*%' -o -name 'core' \ -o -name '*.pyc' \) \ - -type f -print | xargs rm -f + -type f -print | xargs rm -f \ + @rm -f boards.cfg backup: F=`basename $(srctree)` ; cd .. ; \ -- 1.7.10.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] tools: genboardscfg.py, no exception if columns undetectable
Quoting Masahiro YAMADA yamad...@jp.panasonic.com: Hi Roger, (adding York to cc) 2014-08-07 23:19 GMT+09:00 Roger Meier ro...@bufferoverflow.ch: The existing terminalsize detection raised an exception on build server. Just removes the exception. This also deactivates the progress indicator. Remove a trainling whitespace. Signed-off-by: Roger Meier ro...@bufferoverflow.ch CC: Masahiro Yamada yamad...@jp.panasonic.com CC: Tom Rini tr...@ti.com Acked-by: Masahiro Yamada yamad...@jp.panasonic.com Tom, This problem seems fatal. Please apply this patch asap. Thanks! -- Best Regards Masahiro Yamada Yes, building on a build server is still not possible without this patch. It does not matter if you use buildman or MAKEALL. best! -roger ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] Makefile: remove generated boards.cfg within make distclean
Signed-off-by: Roger Meier ro...@bufferoverflow.ch CC: Masahiro Yamada yamad...@jp.panasonic.com CC: Tom Rini tr...@ti.com CC: Wolfgang Denk w...@denx.de --- Changes for v2: - remove boards.cfg within make distclean instead of mrproper - use mrproper instead of distclean within MAKEALL --- MAKEALL |2 +- Makefile |3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MAKEALL b/MAKEALL index 929fe88..392ea8d 100755 --- a/MAKEALL +++ b/MAKEALL @@ -658,7 +658,7 @@ build_target() { MAKE=${MAKE} O=${output_dir} fi - ${MAKE} distclean /dev/null + ${MAKE} mrproper /dev/null echo Building ${target} board... ${MAKE} -s ${target}_defconfig /dev/null diff --git a/Makefile b/Makefile index 666d291..067a301 100644 --- a/Makefile +++ b/Makefile @@ -1285,7 +1285,8 @@ distclean: mrproper -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ -o -name '.*.rej' -o -name '*%' -o -name 'core' \ -o -name '*.pyc' \) \ - -type f -print | xargs rm -f + -type f -print | xargs rm -f \ + rm -f boards.cfg backup: F=`basename $(srctree)` ; cd .. ; \ -- 1.7.10.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper
Signed-off-by: Roger Meier ro...@bufferoverflow.ch CC: Masahiro Yamada yamad...@jp.panasonic.com CC: Wolfgang Denk w...@denx.de --- Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 666d291..831e091 100644 --- a/Makefile +++ b/Makefile @@ -1221,7 +1221,7 @@ CLOBBER_FILES += u-boot* MLO* SPL System.map # Directories files removed with 'make mrproper' MRPROPER_DIRS += include/config include/generated spl tpl \ .tmp_objdiff -MRPROPER_FILES += .config .config.old include/autoconf.mk* include/config.h \ +MRPROPER_FILES += .config .config.old boards.cfg include/autoconf.mk* include/config.h \ ctags etags TAGS cscope* GPATH GTAGS GRTAGS GSYMS # clean - Delete most, but leave enough to build external modules -- 1.7.10.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] tools: genboardscfg.py, use default terminal size if undetectable
The existing terminalsize detection raised an exception on build server. Removes the exception and return a default value. Signed-off-by: Roger Meier ro...@bufferoverflow.ch CC: Masahiro Yamada yamad...@jp.panasonic.com --- tools/genboardscfg.py |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py index 734d90b..892c033 100755 --- a/tools/genboardscfg.py +++ b/tools/genboardscfg.py @@ -58,11 +58,9 @@ def get_terminal_columns(): try: ret = fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ, arg) except IOError as exception: -if exception.errno != errno.ENOTTY: -raise # If 'Inappropriate ioctl for device' error occurs, -# stdout is probably redirected. Return 0. -return 0 +# stdout is probably redirected. Return default size. +return (25, 80) return struct.unpack('', ret)[1] def get_devnull(): @@ -408,7 +406,7 @@ def __gen_boards_cfg(jobs): jobs: The number of jobs to run simultaneously Note: - The incomplete boards.cfg is left over when an error (including + The incomplete boards.cfg is left over when an error (including the termination by the keyboard interrupt) occurs on the halfway. check_top_directory() -- 1.7.10.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] tools: genboardscfg.py, use default terminal size if undetectable
The existing terminalsize detection raised an exception on build server. Removes the exception and return a default value. Signed-off-by: Roger Meier ro...@bufferoverflow.ch CC: Masahiro Yamada yamad...@jp.panasonic.com CC: Tom Rini tr...@ti.com --- Changes for v2: - use 24 instead of 25 lines --- tools/genboardscfg.py |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py index 734d90b..283c989 100755 --- a/tools/genboardscfg.py +++ b/tools/genboardscfg.py @@ -58,11 +58,9 @@ def get_terminal_columns(): try: ret = fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ, arg) except IOError as exception: -if exception.errno != errno.ENOTTY: -raise # If 'Inappropriate ioctl for device' error occurs, -# stdout is probably redirected. Return 0. -return 0 +# stdout is probably redirected. Return default size. +return (24, 80) return struct.unpack('', ret)[1] def get_devnull(): @@ -408,7 +406,7 @@ def __gen_boards_cfg(jobs): jobs: The number of jobs to run simultaneously Note: - The incomplete boards.cfg is left over when an error (including + The incomplete boards.cfg is left over when an error (including the termination by the keyboard interrupt) occurs on the halfway. check_top_directory() -- 1.7.10.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3] tools: genboardscfg.py, no exception if columns undetectable
The existing terminalsize detection raised an exception on build server. Just removes the exception. This also deactivates the progress indicator. Remove a trainling whitespace. Signed-off-by: Roger Meier ro...@bufferoverflow.ch CC: Masahiro Yamada yamad...@jp.panasonic.com CC: Tom Rini tr...@ti.com --- Changes for v2: - use 24 instead of 25 lines Changes for v3: - return integer with 0 columns instead of tuple, this also deactivates the progress indicator --- tools/genboardscfg.py |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py index 734d90b..cd9e69c 100755 --- a/tools/genboardscfg.py +++ b/tools/genboardscfg.py @@ -58,8 +58,6 @@ def get_terminal_columns(): try: ret = fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ, arg) except IOError as exception: -if exception.errno != errno.ENOTTY: -raise # If 'Inappropriate ioctl for device' error occurs, # stdout is probably redirected. Return 0. return 0 @@ -408,7 +406,7 @@ def __gen_boards_cfg(jobs): jobs: The number of jobs to run simultaneously Note: - The incomplete boards.cfg is left over when an error (including + The incomplete boards.cfg is left over when an error (including the termination by the keyboard interrupt) occurs on the halfway. check_top_directory() -- 1.7.10.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper
Hi Masahiro Quoting Masahiro Yamada yamad...@jp.panasonic.com: Hi Roger, On Thu, 7 Aug 2014 12:52:30 +0200 Roger Meier ro...@bufferoverflow.ch wrote: Signed-off-by: Roger Meier ro...@bufferoverflow.ch CC: Masahiro Yamada yamad...@jp.panasonic.com CC: Wolfgang Denk w...@denx.de --- Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 666d291..831e091 100644 --- a/Makefile +++ b/Makefile @@ -1221,7 +1221,7 @@ CLOBBER_FILES += u-boot* MLO* SPL System.map # Directories files removed with 'make mrproper' MRPROPER_DIRS += include/config include/generated spl tpl \ .tmp_objdiff -MRPROPER_FILES += .config .config.old include/autoconf.mk* include/config.h \ +MRPROPER_FILES += .config .config.old boards.cfg include/autoconf.mk* include/config.h \ ctags etags TAGS cscope* GPATH GTAGS GRTAGS GSYMS # clean - Delete most, but leave enough to build external modules -- 1.7.10.4 NAK. MAKEALL needs boards.cfg Before building each board, MAKEALL runs make distclean and boards.cfg gets lost. oops, did not recognize that. Thanks! With your patch, MAKEALL does not work at all. How should we ensure that boards.cfg is up-to-date? What about removing boards.cfg within make distclean and use make mrproper within MAKEALL? best! -roger This is my log of ./MAKEALL Could not find boards.cfg Generating boards.cfg ... (jobs: 8) 1177/1177 [===] Building cmi_mpc5xx board... textdata bss dec hex filename 106025 706162532 179173 2bbe5 ./u-boot awk: fatal: cannot open file `boards.cfg' for reading (No such file or directory) Building PATI board... make[2]: *** [include/autoconf.mk] Error 1 make[2]: *** [include/autoconf.mk.dep] Error 1 make[1]: *** [silentoldconfig] Error 1 size: './u-boot': No such file /bin/sh: 1: ppc_8xx-gcc: not found /bin/sh: 1: ppc_8xx-gcc: not found make[2]: *** [include/autoconf.mk] Error 1 make[2]: *** Waiting for unfinished jobs make[2]: *** [include/autoconf.mk.dep] Error 1 'make -f /home/yamada/workspace/u-boot-org/scripts/Makefile.autoconf obj=include include/autoconf.mk include/autoconf.mk.dep' Failed make[1]: *** [silentoldconfig] Error 1 make: *** No rule to make target `include/config/auto.conf', needed by `include/config/uboot.release'. Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] boards.cfg: show info about boards.cfg instead of MAINTAINERS
Signed-off-by: Roger Meier ro...@bufferoverflow.ch --- tools/checkpatch.pl |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/checkpatch.pl b/tools/checkpatch.pl index 896e2bc..88c5bc7 100755 --- a/tools/checkpatch.pl +++ b/tools/checkpatch.pl @@ -398,7 +398,7 @@ sub top_of_kernel_tree { my ($root) = @_; my @tree_check = ( - COPYING, CREDITS, Kbuild, MAINTAINERS, Makefile, + COPYING, CREDITS, Kbuild, Makefile, README, Documentation, arch, include, drivers, fs, init, ipc, kernel, lib, scripts, ); @@ -3701,7 +3701,7 @@ sub process { $vname has style problems, please review. If any of these errors are false positives, please report -them to the maintainer, see CHECKPATCH in MAINTAINERS. +them to the maintainer, see boards.cfg. EOM } -- 1.7.10.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/5] SPDX-License-Identifier: coverting more files
+-- drivers/net/npe/include/IxOsalAssert.h | 26 +-- drivers/net/npe/include/IxOsalBackward.h | 26 +-- drivers/net/npe/include/IxOsalBackwardAssert.h | 26 +-- drivers/net/npe/include/IxOsalBackwardBufferMgt.h | 26 +-- drivers/net/npe/include/IxOsalBackwardCacheMMU.h | 26 +-- drivers/net/npe/include/IxOsalBackwardMemMap.h | 26 +-- drivers/net/npe/include/IxOsalBackwardOsServices.h | 26 +-- drivers/net/npe/include/IxOsalBackwardOssl.h | 26 +-- drivers/net/npe/include/IxOsalBufferMgt.h | 53 +- drivers/net/npe/include/IxOsalBufferMgtDefault.h | 26 +-- drivers/net/npe/include/IxOsalConfig.h | 26 +-- drivers/net/npe/include/IxOsalEndianess.h | 26 +-- drivers/net/npe/include/IxOsalIoMem.h | 26 +-- drivers/net/npe/include/IxOsalMemAccess.h | 26 +-- drivers/net/npe/include/IxOsalOem.h| 26 +-- drivers/net/npe/include/IxOsalOsBufferMgt.h| 26 +-- drivers/net/npe/include/IxOsalOsIxp400.h | 26 +-- .../npe/include/IxOsalOsIxp400CustomizedMapping.h | 26 +-- drivers/net/npe/include/IxOsalTypes.h | 26 +-- drivers/net/npe/include/IxOsalUtilitySymbols.h | 26 +-- drivers/net/npe/include/IxParityENAcc.h| 26 +-- drivers/net/npe/include/IxPerfProfAcc.h| 26 +-- drivers/net/npe/include/IxQMgr.h | 26 +-- drivers/net/npe/include/IxQMgrAqmIf_p.h| 26 +-- drivers/net/npe/include/IxQMgrDefines_p.h | 26 +-- drivers/net/npe/include/IxQMgrDispatcher_p.h | 26 +-- drivers/net/npe/include/IxQMgrLog_p.h | 26 +-- drivers/net/npe/include/IxQMgrQAccess_p.h | 26 +-- drivers/net/npe/include/IxQMgrQCfg_p.h | 26 +-- drivers/net/npe/include/IxQueueAssignments.h | 26 +-- drivers/net/npe/include/IxSspAcc.h | 26 +-- drivers/net/npe/include/IxTimeSyncAcc.h| 26 +-- drivers/net/npe/include/IxTimerCtrl.h | 26 +-- drivers/net/npe/include/IxTypes.h | 26 +-- drivers/net/npe/include/IxUART.h | 26 +-- drivers/net/npe/include/IxVersionId.h | 26 +-- drivers/net/npe/include/ix_error.h | 26 +-- drivers/net/npe/include/ix_macros.h| 26 +-- drivers/net/npe/include/ix_os_type.h | 26 +-- drivers/net/npe/include/ix_ossl.h | 26 +-- drivers/net/npe/include/ix_symbols.h | 26 +-- drivers/net/npe/include/ix_types.h | 26 +-- drivers/net/npe/include/os_datatypes.h | 26 +-- drivers/net/npe/miiphy.c | 25 ++ drivers/usb/gadget/f_mass_storage.c| 30 +--- fs/yaffs2/yaffs_qsort.c| 24 +- include/api_public.h | 45 +- include/elf.h | 22 + include/miiphy.h | 29 ++-- 183 files changed, 264 insertions(+), 4480 deletions(-) create mode 100644 Licenses/bsd-3-clause.txt create mode 100644 Licenses/ibm-pibs.txt -- 1.8.1.4 Wow, this was a large patch. Thanks! Reviewed-by: Roger Meier ro...@bufferoverflow.ch I have just one little finding: --- a/drivers/net/npe/IxQMgrAqmIf.c +++ b/drivers/net/npe/IxQMgrAqmIf.c @@ -18,35 +18,7 @@ * -- Copyright Notice -- * * @par - * Copyright 2001-2005, Intel Corporation. - * All rights reserved. I will start a request at spdx-legal to include ibm-pibs to the SPDX license list. An other option might be a local prefix for the identifier, e.g. local.ibm-pibs all the best! -roger ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] libfdt: SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
Hi Wolfgang -Ursprüngliche Nachricht- Von: Wolfgang Denk [mailto:w...@denx.de] Gesendet: Sonntag, 28. Juli 2013 00:13 An: Roger Meier Cc: u-boot@lists.denx.de Betreff: Re: [PATCH] libfdt: SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause Dear Roger, In message 1374880358-7743-1-git-send-email-ro...@bufferoverflow.ch you wrote: Signed-off-by: Roger Meier ro...@bufferoverflow.ch --- Licenses/README | 13 ++-- Licenses/bsd-2-clause.txt| 25 ++ lib/libfdt/fdt.c | 47 +- lib/libfdt/fdt_empty_tree.c | 47 +- lib/libfdt/fdt_ro.c | 47 +- lib/libfdt/fdt_rw.c | 47 +- lib/libfdt/fdt_strerror.c| 47 +- lib/libfdt/fdt_sw.c | 47 +- lib/libfdt/fdt_wip.c | 47 +- lib/libfdt/libfdt_internal.h | 47 +- 10 files changed, 40 insertions(+), 374 deletions(-) create mode 100644 Licenses/bsd-2-clause.txt Thanks for pushing this forward. I have but one comment: +BSD 2-Clause License BSD-2-ClauseY bsd-2-clause.txthttps://spdx.org/licenses/BSD-2- Clause I don;t really like picking up the original license text from a second source (SPDX here) - I'd rather refer to some original version published by the creator of the license. Maybe we can find a better URI here? I agree, original version only we already have the SPDX Identifier. It's a difficult task with BSD licenses and I found no original source yet. Official information from Berkeley University: http://ipira.berkeley.edu/ ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change Other sources or information: http://www.linfo.org/bsdlicense.html http://opensource.org/licenses/BSD-2-Clause http://www.freebsd.org/copyright/license.html should I rebase without an URL for BSD-2-Clause as long as we have the license in text form anyway? Except for that: Acked-by: Wolfgang Denk w...@denx.de Thanks! -roger ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] SPDX-License-Identifier: adding a comment section?
Hi Wolfgang -Ursprüngliche Nachricht- Von: Wolfgang Denk [mailto:w...@denx.de] Gesendet: Sonntag, 28. Juli 2013 17:40 An: u-boot@lists.denx.de Cc: Roger Meier; Tom Rini; Albert ARIBAUD; Joe Hershberger Betreff: SPDX-License-Identifier: adding a comment section? I need some help / recommendations how we should handle non-trivial license issues. For example, please have a look at the NE2000 network driver code: drivers/net/ne2000.h drivers/net/ne2000.c drivers/net/ne2000_base.h drivers/net/ne2000_base.c Is this still in use somewhere? - First, these files include a statement that this code has been derived from Linux kernel and from eCOS sources and that it's released unter GPL, but without stating wehter this means GPL-v2 or GPL-v2+ or whatever. - Second, it includes the eCOS license header which basically says it's GPLv2+ plus some additional rights. - Third, if you track down the Linux source code mentioned above, this again says only GPL without additional specification. Two questions arise: - What should the resulting license(s) be in this specific case? I tend to interpret plain GPL as GPLv2+, so we could probably summarize the license terms here as eCos-2.0. What do you think? Agree, makes sense. - I feel it would be helpful for future investigations if we are able to document our current understanding, so we don't have to re-investigate all this again and again each time we run into these files. My proposal is to define an additional magic string SPDX-License-Comments: which could be used to mark a text section that would contain such explanations. Good idea, document the current understanding is worth to do. SPDX defines the property LicenseComments at file and package level. Wound this make sense, or do you have a better suggestion? No better idea available... -roger ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] dual licensed files
Thank you Wolfgang for simplifying license handling! What about dual licensed files? What do you prefer? SPDX-License-Identifier:GPL-2.0+ SPDX-License-Identifier:BSD-2-Clause or SPDX-License-Identifier:GPL-2.0+, BSD-2-Clause Other seperator? All the best! -roger ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] libfdt: SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
Signed-off-by: Roger Meier ro...@bufferoverflow.ch --- Licenses/README | 13 ++-- Licenses/bsd-2-clause.txt| 25 ++ lib/libfdt/fdt.c | 47 +- lib/libfdt/fdt_empty_tree.c | 47 +- lib/libfdt/fdt_ro.c | 47 +- lib/libfdt/fdt_rw.c | 47 +- lib/libfdt/fdt_strerror.c| 47 +- lib/libfdt/fdt_sw.c | 47 +- lib/libfdt/fdt_wip.c | 47 +- lib/libfdt/libfdt_internal.h | 47 +- 10 files changed, 40 insertions(+), 374 deletions(-) create mode 100644 Licenses/bsd-2-clause.txt diff --git a/Licenses/README b/Licenses/README index b1a59cc..3ed7aba 100644 --- a/Licenses/README +++ b/Licenses/README @@ -43,10 +43,11 @@ at [2]. [1] http://spdx.org/ [2] http://spdx.org/licenses/ -Full name SPDX Identifier OSI Approved File name URI +Full name SPDX Identifier OSI Approved File name URI === -GNU General Public License v2.0 only GPL-2.0 Y gpl-2.0.txt http://www.gnu.org/licenses/gpl-2.0.txt -GNU General Public License v2.0 or later GPL-2.0+Y gpl-2.0.txt http://www.gnu.org/licenses/gpl-2.0.txt -GNU Library General Public License v2 or later LGPL-2.0+ Y lgpl-2.0.txthttp://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt -GNU Lesser General Public License v2.1 or laterLGPL-2.1+ Y lgpl-2.1.txthttp://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt -eCos license version 2.0 eCos-2.0 eCos-2.0.txthttp://www.gnu.org/licenses/ecos-license.html +GNU General Public License v2.0 only GPL-2.0 Y gpl-2.0.txt http://www.gnu.org/licenses/gpl-2.0.txt +GNU General Public License v2.0 or later GPL-2.0+Y gpl-2.0.txt http://www.gnu.org/licenses/gpl-2.0.txt +GNU Library General Public License v2 or later LGPL-2.0+ Y lgpl-2.0.txthttp://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt +GNU Lesser General Public License v2.1 or laterLGPL-2.1+ Y lgpl-2.1.txt http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt +eCos license version 2.0 eCos-2.0 eCos-2.0.txthttp://www.gnu.org/licenses/ecos-license.html +BSD 2-Clause License BSD-2-ClauseY bsd-2-clause.txthttps://spdx.org/licenses/BSD-2-Clause diff --git a/Licenses/bsd-2-clause.txt b/Licenses/bsd-2-clause.txt new file mode 100644 index 000..af69764 --- /dev/null +++ b/Licenses/bsd-2-clause.txt @@ -0,0 +1,25 @@ +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the following +conditions are met: + +1. Redistributions of source code must retain the above + copyright notice, this list of conditions and the following + disclaimer. +2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials + provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/lib/libfdt/fdt.c b/lib/libfdt/fdt.c index 154e9a4..e146aba 100644 --- a/lib/libfdt/fdt.c +++ b/lib/libfdt/fdt.c @@ -1,52 +1,7 @@ /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library is free software; you can redistribute it and/or - * modify
Re: [U-Boot] [PATCH 0/5] Introducing SPDX-License-Identifiers
all, Quoting Marek Vasut ma...@denx.de: Dear Wolfgang Denk, Like many other projects, U-Boot has a tradition of including big blocks of License headers in all files. This not only blows up the source code with mostly redundant information, but also makes it very difficult to generate License Clearing Reports. An additional problem is that even the same lincenses are referred to by a number of slightly varying text blocks (full, abbreviated, different indentation, line wrapping and/or white space, with obsolete address information, ...) which makes automatic processing a nightmare. To make this easier, such license headers in the source files will be replaced with a single line reference to Unique Lincense Identifiers as defined by the Linux Foundation's SPDX project [1]. For example, in a source file the full GPL v2.0 or later header text will be replaced by a single line: I think we have a winner for this round of u-boot commit statistics ;-) For the MXS part and PXA part, series: Acked-by: Marek Vasut ma...@denx.de Wow this was a huge meal and I did the whole menu... Reviewed-by: Roger Meier r.me...@siemens.com Great to see such a resourceful approach to simplify the licensing topic. Thank you Wolfgang Denk for this effort! I have one question related to the following exception that was removed from COPYING file: --- a/COPYING +++ b/Licenses/gpl-2.0.txt - NOTE! This license does *not* cover the so-called standalone -applications that use U-Boot services by means of the jump table -provided by U-Boot exactly for this purpose - this is merely -considered normal use of U-Boot, and does *not* fall under the -heading of derived work. Do you plan to add this info to the new Licenses/README file again or do you consider to create kind of a U-Boot-exception? thanks again and good night! -roger ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot