Merge pull request #766 from freifunk-berlin/rename_packages

Rename to packageslist to not conflict with packages-folder, that is used by the buildsystem now.
freifunk-berlin · Apr 14, 2020 · acacc6a · acacc6a
2 parents b71cbcc + aff82c1
commit acacc6a
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ bin
 ^openwrt
 firmwares
 dl
+/packages
diff --git a/assemble_firmware.sh b/assemble_firmware.sh
@@ -15,7 +15,7 @@ set -e
 IB_FILE=""
 PROFILES=""
 TEMP_DIR=""
-PKGLIST_DIR="$(dirname "$0")/packages"
+PKGLIST_DIR="$(dirname "$0")/packagelists"
 DEST_DIR="$(dirname "$0")/firmwares"
 DEBUG=""
 USECASES=""

diff --git a/packages/manual.txt → packagelists/manual.txt b/packages/manual.txt → packagelists/manual.txt
diff --git a/packages/manual_4MB.sh → packagelists/manual_4MB.sh b/packages/manual_4MB.sh → packagelists/manual_4MB.sh
diff --git a/packages/manual_4MB.txt → packagelists/manual_4MB.txt b/packages/manual_4MB.txt → packagelists/manual_4MB.txt
diff --git a/packages/mesh_4MB.txt → packagelists/mesh_4MB.txt b/packages/mesh_4MB.txt → packagelists/mesh_4MB.txt
diff --git a/packages/notunnel.txt → packagelists/notunnel.txt b/packages/notunnel.txt → packagelists/notunnel.txt
diff --git a/packages/notunnel_4MB.sh → packagelists/notunnel_4MB.sh b/packages/notunnel_4MB.sh → packagelists/notunnel_4MB.sh
diff --git a/packages/notunnel_4MB.txt → packagelists/notunnel_4MB.txt b/packages/notunnel_4MB.txt → packagelists/notunnel_4MB.txt
diff --git a/packages/tunnel-berlin-openvpn.txt → packagelists/tunnel-berlin-openvpn.txt b/packages/tunnel-berlin-openvpn.txt → packagelists/tunnel-berlin-openvpn.txt
diff --git a/packages/tunnel-berlin-openvpn_4MB.sh → packagelists/tunnel-berlin-openvpn_4MB.sh b/packages/tunnel-berlin-openvpn_4MB.sh → packagelists/tunnel-berlin-openvpn_4MB.sh
diff --git a/packages/tunnel-berlin-openvpn_4MB.txt → packagelists/tunnel-berlin-openvpn_4MB.txt b/packages/tunnel-berlin-openvpn_4MB.txt → packagelists/tunnel-berlin-openvpn_4MB.txt
diff --git a/packages/tunnel-berlin-tunneldigger.txt → packagelists/tunnel-berlin-tunneldigger.txt b/packages/tunnel-berlin-tunneldigger.txt → packagelists/tunnel-berlin-tunneldigger.txt
diff --git a/packages/tunnel-berlin-tunneldigger_4MB.sh → ...gelists/tunnel-berlin-tunneldigger_4MB.sh b/packages/tunnel-berlin-tunneldigger_4MB.sh → ...gelists/tunnel-berlin-tunneldigger_4MB.sh
diff --git a/packages/tunnel-berlin-tunneldigger_4MB.txt → ...elists/tunnel-berlin-tunneldigger_4MB.txt b/packages/tunnel-berlin-tunneldigger_4MB.txt → ...elists/tunnel-berlin-tunneldigger_4MB.txt