.gitignore

@@ -1 +0,0 @@
-source/

Jenkinsfile

@@ -1,47 +1,56 @@
 node ("make") {
     stage('checkout') {
-        checkout([
+        checkout([$class: 'GitSCM', branches: [[name: 'v17.01.2']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[url: 'git://git.lede-project.org/source.git']]])
-            $class: 'GitSCM',
+        checkout([$class: 'GitSCM', branches: [[name: 'dev']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'firmware']], submoduleCfg: [], userRemoteConfigs: [[url: 'git://github.com/ffbsee/firmware.git']]])
-            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']
-            ]
-        ])
     }
 
-    dir("source") {
+    stage('feeds') {
-        stage('feeds') {
+        sh "./scripts/feeds update -a"
-            sh "./scripts/feeds update -a"
+        sh "./scripts/feeds install -a"
-            sh "./scripts/feeds install -a"
+    }
-        }
 
-        stage('patches') {
+    stage('patches') {
-            sh "cp -rf firmware/files firmware/package ."
+        sh "cp -rf firmware/files firmware/package ."
-            sh 'for file in firmware/patches/lede/*.patch; do patch -p1 < $file; done'
+        sh 'for file in firmware/patches/lede/*.patch; do patch -p1 < $file; done'
-            dir('feeds/routing') {
+        dir('feeds/routing') {
-                sh 'for file in ../../firmware/patches/routing/*.patch; do patch -p1 < $file; done'
+            sh 'for file in ../../firmware/patches/routing/*.patch; do patch -p1 < $file; done'
-            }
         }
+    }
 
-        stage('build') {
+    stage('build') {
-            sh "../build.sh"
+        sh '''#!/bin/sh
-        }
+
+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
+'
+
+for platform in $platforms; do
+	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
+
+	# Debug output
+	echo "Build: $platform"
+
+	# Build image
+	make defconfig
+	make -j4
+done
+'''
     }
 }

build.sh

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-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
-'
-
-for platform in $platforms; do
-	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
-
-	# Debug output
-	echo "Build: $platform"
-
-	# Build image
-	make defconfig
-	make -j4
-done

rename.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-if [ $# -ne 2 -o ! -d "$2" ]; then
-  echo "usage: $0 <ident> <folder>"
-  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"
-done
-
-exit 0