Reindent.

This commit is contained in:
Robert Jacob 2017-07-08 19:41:11 +02:00
parent 3d0d4d8734
commit c373dfd769
4 changed files with 102 additions and 103 deletions

View File

@ -2,7 +2,7 @@ root = true
[*] [*]
indent_style = space indent_style = space
indent_size = 4 indent_size = 2
end_of_line = lf end_of_line = lf
charset = utf-8 charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true

133
Jenkinsfile vendored
View File

@ -1,70 +1,69 @@
pipeline { pipeline {
agent any agent any
stages { stages {
stage('checkout tools') { stage('checkout tools') {
steps { steps {
checkout scm checkout scm
} }
}
stage('checkout') {
steps {
checkout([
$class: 'GitSCM',
branches: [[name: 'v17.01.2']],
doGenerateSubmoduleConfigurations: false,
extensions: [
[$class: 'RelativeTargetDirectory', relativeTargetDir: 'source']
],
submoduleCfg: [],
userRemoteConfigs: [
[url: 'git://git.lede-project.org/source.git']
]
])
checkout([
$class: 'GitSCM',
branches: [[name: 'dev']],
doGenerateSubmoduleConfigurations: false,
extensions: [
[$class: 'RelativeTargetDirectory', relativeTargetDir: 'source/firmware']
],
submoduleCfg: [],
userRemoteConfigs: [
[url: 'git://github.com/ffbsee/firmware.git']
]
])
}
}
stage('feeds') {
steps {
dir("source") {
sh "./scripts/feeds update -a"
sh "./scripts/feeds install -a"
}
}
}
stage('patches') {
steps {
dir("source") {
sh "cp -rf firmware/files firmware/package ."
sh 'for file in firmware/patches/lede/*.patch; do patch -p1 < $file; done'
dir('feeds/routing') {
sh 'for file in ../../firmware/patches/routing/*.patch; do patch -p1 < $file; done'
}
}
}
}
stage('build') {
steps {
dir("source") {
sh "../build.sh"
}
}
}
} }
stage('checkout') {
steps {
checkout([
$class: 'GitSCM',
branches: [[name: 'v17.01.2']],
doGenerateSubmoduleConfigurations: false,
extensions: [
[$class: 'RelativeTargetDirectory', relativeTargetDir: 'source']
],
submoduleCfg: [],
userRemoteConfigs: [
[url: 'git://git.lede-project.org/source.git']
]
])
checkout([
$class: 'GitSCM',
branches: [[name: 'dev']],
doGenerateSubmoduleConfigurations: false,
extensions: [
[$class: 'RelativeTargetDirectory', relativeTargetDir: 'source/firmware']
],
submoduleCfg: [],
userRemoteConfigs: [
[url: 'git://github.com/ffbsee/firmware.git']
]
])
}
}
stage('feeds') {
steps {
dir("source") {
sh "./scripts/feeds update -a"
sh "./scripts/feeds install -a"
}
}
}
stage('patches') {
steps {
dir("source") {
sh "cp -rf firmware/files firmware/package ."
sh 'for file in firmware/patches/lede/*.patch; do patch -p1 < $file; done'
dir('feeds/routing') {
sh 'for file in ../../firmware/patches/routing/*.patch; do patch -p1 < $file; done'
}
}
}
}
stage('build') {
steps {
dir("source") {
sh "../build.sh"
}
}
}
}
} }

View File

@ -2,34 +2,34 @@
set -euo errexit set -euo errexit
platforms=' platforms='
CONFIG_TARGET_arm64=y CONFIG_TARGET_arm64=y
CONFIG_TARGET_ath25=y CONFIG_TARGET_ath25=y
CONFIG_TARGET_ar71xx=y CONFIG_TARGET_ar71xx=y
CONFIG_TARGET_brcm2708=y\nCONFIG_TARGET_brcm2708_bcm2708=y CONFIG_TARGET_brcm2708=y\nCONFIG_TARGET_brcm2708_bcm2708=y
CONFIG_TARGET_brcm2708=y\nCONFIG_TARGET_brcm2708_bcm2709=y CONFIG_TARGET_brcm2708=y\nCONFIG_TARGET_brcm2708_bcm2709=y
CONFIG_TARGET_bcm53xx=y CONFIG_TARGET_bcm53xx=y
CONFIG_TARGET_brcm47xx=y CONFIG_TARGET_brcm47xx=y
CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_rt305x=y CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_rt305x=y
CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_mt7620=y CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_mt7620=y
CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_mt7621=y CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_mt7621=y
CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_mt7628=y CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_mt7628=y
CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_rt3883=y CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_rt3883=y
CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_rt288x=y CONFIG_TARGET_ramips=y\nCONFIG_TARGET_ramips_rt288x=y
' '
for platform in $platforms; do for platform in $platforms; do
echo "$platform" > .config echo "$platform" > .config
echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
echo "CONFIG_TARGET_ALL_PROFILES=y" >> .config echo "CONFIG_TARGET_ALL_PROFILES=y" >> .config
echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
echo "CONFIG_PACKAGE_freifunk-basic=y" >> .config echo "CONFIG_PACKAGE_freifunk-basic=y" >> .config
# Debug output # Debug output
echo "Build: $platform" echo "Build: $platform"
# Build image # Build image
make defconfig make defconfig
make -j4 make -j4
exit 1 exit 1
done done

View File

@ -2,23 +2,23 @@
set -euo errexit set -euo errexit
if [ $# -ne 2 -o ! -d "$2" ]; then if [ $# -ne 2 -o ! -d "$2" ]; then
echo "usage: $0 <ident> <folder>" echo "usage: $0 <ident> <folder>"
echo "E.g. $0 0.5.0 bin/ar71xxx/" echo "E.g. $0 0.5.0 bin/ar71xxx/"
exit 1 exit 1
fi fi
ident="$1" ident="$1"
path="$2" path="$2"
for path in $(find "$path" -iname "lede*"); do for path in $(find "$path" -iname "lede*"); do
dir="${path%/*}" dir="${path%/*}"
file="${path##*/}" file="${path##*/}"
if [ "$file" != "${file/$ident/}" ]; then if [ "$file" != "${file/$ident/}" ]; then
echo "Already contains '$ident': $path" echo "Already contains '$ident': $path"
continue continue
fi fi
new_file="$ident"`echo "$file" | sed -e "s/lede-[^-]*-[^-]*//"` new_file="$ident"`echo "$file" | sed -e "s/lede-[^-]*-[^-]*//"`
mv "$path" "$dir/$new_file" mv "$path" "$dir/$new_file"
done done
exit 0 exit 0