diff --git a/.editorconfig b/.editorconfig index 779f99a..4a7ea30 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,7 +2,7 @@ root = true [*] indent_style = space -indent_size = 4 +indent_size = 2 end_of_line = lf charset = utf-8 trim_trailing_whitespace = true diff --git a/Jenkinsfile b/Jenkinsfile index 1d81bb9..d1881bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,70 +1,69 @@ pipeline { - agent any - stages { - stage('checkout tools') { - steps { - 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" - } - } - } + agent any + stages { + stage('checkout tools') { + steps { + 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" + } + } + } + } } diff --git a/build.sh b/build.sh index d25aad0..f871e04 100755 --- a/build.sh +++ b/build.sh @@ -2,34 +2,34 @@ set -euo errexit platforms=' - CONFIG_TARGET_arm64=y - CONFIG_TARGET_ath25=y - CONFIG_TARGET_ar71xx=y - CONFIG_TARGET_brcm2708=y\nCONFIG_TARGET_brcm2708_bcm2708=y - CONFIG_TARGET_brcm2708=y\nCONFIG_TARGET_brcm2708_bcm2709=y - CONFIG_TARGET_bcm53xx=y - CONFIG_TARGET_brcm47xx=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_mt7621=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_rt288x=y + CONFIG_TARGET_arm64=y + CONFIG_TARGET_ath25=y + CONFIG_TARGET_ar71xx=y + CONFIG_TARGET_brcm2708=y\nCONFIG_TARGET_brcm2708_bcm2708=y + CONFIG_TARGET_brcm2708=y\nCONFIG_TARGET_brcm2708_bcm2709=y + CONFIG_TARGET_bcm53xx=y + CONFIG_TARGET_brcm47xx=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_mt7621=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_rt288x=y ' for platform in $platforms; do - echo "$platform" > .config + echo "$platform" > .config - echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config - echo "CONFIG_TARGET_ALL_PROFILES=y" >> .config - echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config - echo "CONFIG_PACKAGE_freifunk-basic=y" >> .config + echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config + echo "CONFIG_TARGET_ALL_PROFILES=y" >> .config + echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config + echo "CONFIG_PACKAGE_freifunk-basic=y" >> .config - # Debug output - echo "Build: $platform" + # Debug output + echo "Build: $platform" - # Build image - make defconfig - make -j4 - exit 1 + # Build image + make defconfig + make -j4 + exit 1 done diff --git a/rename.sh b/rename.sh index 7d2737b..baa6ce4 100755 --- a/rename.sh +++ b/rename.sh @@ -2,23 +2,23 @@ set -euo errexit if [ $# -ne 2 -o ! -d "$2" ]; then - echo "usage: $0 " - echo "E.g. $0 0.5.0 bin/ar71xxx/" - exit 1 + echo "usage: $0 " + echo "E.g. $0 0.5.0 bin/ar71xxx/" + exit 1 fi ident="$1" path="$2" for path in $(find "$path" -iname "lede*"); do - dir="${path%/*}" - file="${path##*/}" - if [ "$file" != "${file/$ident/}" ]; then - echo "Already contains '$ident': $path" - continue - fi - new_file="$ident"`echo "$file" | sed -e "s/lede-[^-]*-[^-]*//"` - mv "$path" "$dir/$new_file" + dir="${path%/*}" + file="${path##*/}" + if [ "$file" != "${file/$ident/}" ]; then + echo "Already contains '$ident': $path" + continue + fi + new_file="$ident"`echo "$file" | sed -e "s/lede-[^-]*-[^-]*//"` + mv "$path" "$dir/$new_file" done exit 0