6 files changed, 16 insertions, 8 deletions
diff --git a/data/defaults.toml b/data/defaults.toml
index 1eb12920..fe23a7d6 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -9,12 +9,12 @@ debian_security_mirror = "http://deb.debian.org/debian-security"
 
 debian_archive_areas = "main contrib non-free"
 
-vyos_mirror = "http://dev.packages.vyos.net/repositories/current"
+vyos_mirror = "https://rolling-packages.vyos.net/current"
 
 vyos_branch = "current"
 release_train = "current"
 
-kernel_version = "6.1.49"
+kernel_version = "6.1.50"
 bootloaders = "syslinux,grub-efi"
 
 website_url = "https://vyos.io"
diff --git a/packages/aws-gwlbtun/.gitignore b/packages/aws-gateway-load-balancer-tunnel-handler/.gitignore
index a3e428dc..a3e428dc 100644
--- a/packages/aws-gwlbtun/.gitignore
+++ b/packages/aws-gateway-load-balancer-tunnel-handler/.gitignore
diff --git a/packages/aws-gwlbtun/Jenkinsfile b/packages/aws-gateway-load-balancer-tunnel-handler/Jenkinsfile
index 006c13bf..0f9cb7e3 100644
--- a/packages/aws-gwlbtun/Jenkinsfile
+++ b/packages/aws-gateway-load-balancer-tunnel-handler/Jenkinsfile
@@ -20,11 +20,11 @@
 @Library('vyos-build@current')_
 
 def pkgList = [
-    ['name': 'aws-gwlbtun',
-     'scmCommit': 'eb51d33',
+    ['name': 'aws-gateway-load-balancer-tunnel-handler',
+     'scmCommit': 'f78058a',
      'scmUrl': 'https://github.com/aws-samples/aws-gateway-load-balancer-tunnel-handler',
      'buildCmd': 'cd ..; ./build.sh'],
 ]
 
 // Start package build using library function from https://github.com/vyos/vyos-build
-buildPackage('aws-gwlbtun', pkgList, null, true, "**/packages/aws-gwlbtun/**")
+buildPackage('aws-gateway-load-balancer-tunnel-handler', pkgList, null, true, "**/packages/aws-gateway-load-balancer-tunnel-handler/**")
diff --git a/packages/aws-gwlbtun/build.sh b/packages/aws-gateway-load-balancer-tunnel-handler/build.sh
index d4feb6ac..d4feb6ac 100755
--- a/packages/aws-gwlbtun/build.sh
+++ b/packages/aws-gateway-load-balancer-tunnel-handler/build.sh
diff --git a/packages/linux-kernel/build-intel-qat.sh b/packages/linux-kernel/build-intel-qat.sh
index e1c61c92..74bbc73b 100755
--- a/packages/linux-kernel/build-intel-qat.sh
+++ b/packages/linux-kernel/build-intel-qat.sh
@@ -14,7 +14,7 @@ fi
 
 . ${KERNEL_VAR_FILE}
 
-url="https://dev.packages.vyos.net/source-mirror/QAT1.7.L.4.20.0-00001.tar.gz"
+url="https://rolling-packages.vyos.net/source-mirror/QAT1.7.L.4.20.0-00001.tar.gz"
 
 cd ${CWD}
 
diff --git a/packages/linux-kernel/build-linux-firmware.sh b/packages/linux-kernel/build-linux-firmware.sh
index d4d263e2..39cb243b 100755
--- a/packages/linux-kernel/build-linux-firmware.sh
+++ b/packages/linux-kernel/build-linux-firmware.sh
@@ -57,7 +57,7 @@ mkdir -p "${LINUX_FIRMWARE_BUILD_DIR}"
 SED_REPLACE="s@${CWD}/${LINUX_FIRMWARE}/@@"
 for FILE_PATTERN in ${FW_FILES}; do
     find "${LINUX_FIRMWARE_BUILD_DIR}" -path "*/${FILE_PATTERN}" -print0 | while IFS= read -r -d $'\0' FILE; do
-        TARGET="$(realpath --relative-to="${LINUX_FIRMWARE_BUILD_DIR}" "${FILE}")"
+        TARGET="$(echo "${FILE}" | sed "s/${LINUX_FIRMWARE_BUILD_DIR}\///g")"
         TARGET_DIR="${VYOS_FIRMWARE_DIR}/lib/firmware/$(dirname "${TARGET}")"
         # If file is a symlink install the symlink target as well
         if [ -h "${FILE}" ]; then
@@ -67,7 +67,15 @@ for FILE_PATTERN in ${FW_FILES}; do
 
                     echo "I: install firmware: ${TARGET}"
                     cp "${CWD}/${LINUX_FIRMWARE_BUILD_DIR}/${TARGET}" "${TARGET_DIR}"
-                else
+		    # If file links to other folder which this script not cover. Create folder and copy together.
+                    if [ -L "${LINUX_FIRMWARE_BUILD_DIR}/${TARGET}" ]; then
+                        REALPATH_TARGET=$(realpath --relative-to="${CWD}/${LINUX_FIRMWARE_BUILD_DIR}" "${CWD}/${LINUX_FIRMWARE_BUILD_DIR}/${TARGET}")
+                        REALPATH_TARGET_DIR="${VYOS_FIRMWARE_DIR}/lib/firmware/$(dirname "${REALPATH_TARGET}")"
+                        mkdir -p "${REALPATH_TARGET_DIR}"
+                        echo "I: install firmware: ${REALPATH_TARGET}"
+                        cp "${CWD}/${LINUX_FIRMWARE_BUILD_DIR}/${REALPATH_TARGET}" "${REALPATH_TARGET_DIR}"
+                    fi
+                 else
                     echo "I: firmware file not found: ${TARGET}"
                 fi
             fi