[submodule] update sonic-linux-kernel (#2985)

* [submodule] update sonic-linux-kernel * update linux kernel version * Fix many version strings * update mellanox components (built with new kernel) * [mlnx] add make files for SDK WJH libs * Update arista driver submodule (#8) Make the debian packaging point to a newer kernel version.
sonic-net · Jun 18, 2019 · e7b1988 · e7b1988
1 parent d67c6d4
commit e7b1988
Show file tree

Hide file tree

Showing 35 changed files with 102 additions and 67 deletions.
diff --git a/build_debian.sh b/build_debian.sh
@@ -30,7 +30,7 @@ set -x -e
 
 ## docker engine version (with platform)
 DOCKER_VERSION=5:18.09.2~3-0~debian-stretch
-LINUX_KERNEL_VERSION=4.9.0-8-2
+LINUX_KERNEL_VERSION=4.9.0-9-2
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
@@ -121,7 +121,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/initramfs-tools_*.deb || \
 sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/linux-image-${LINUX_KERNEL_VERSION}-amd64_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl
-sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode 
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode
 
 ## Update initramfs for booting with squashfs+overlay
 cat files/initramfs-tools/modules | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null
@@ -409,7 +409,7 @@ fi
 ## Organization specific extensions such as Configuration & Scripts for features like AAA, ZTP...
 if [ "${enable_organization_extensions}" = "y" ]; then
    if [ -f files/build_templates/organization_extensions.sh ]; then
-      sudo chmod 755 files/build_templates/organization_extensions.sh 
+      sudo chmod 755 files/build_templates/organization_extensions.sh
       ./files/build_templates/organization_extensions.sh -f $FILESYSTEM_ROOT -h $HOSTNAME
    fi
 fi

diff --git a/files/build_templates/swss.service.j2 b/files/build_templates/swss.service.j2
@@ -4,7 +4,7 @@ Requires=database.service updategraph.service
 {% if sonic_asic_platform == 'broadcom' %}
 Requires=opennsl-modules.service
 {% elif sonic_asic_platform == 'nephos' %}
-Requires=nps-modules-4.9.0-8-2-amd64.service
+Requires=nps-modules-4.9.0-9-2-amd64.service
 {% endif %}
 After=database.service updategraph.service
 After=interfaces-config.service

diff --git a/files/build_templates/syncd.service.j2 b/files/build_templates/syncd.service.j2
@@ -4,14 +4,14 @@ Requires=database.service updategraph.service
 {% if sonic_asic_platform == 'broadcom' %}
 Requires=opennsl-modules.service
 {% elif sonic_asic_platform == 'nephos' %}
-Requires=nps-modules-4.9.0-8-2-amd64.service
+Requires=nps-modules-4.9.0-9-2-amd64.service
 {% endif %}
 After=database.service updategraph.service
 After=interfaces-config.service
 {% if sonic_asic_platform == 'broadcom' %}
 After=opennsl-modules.service
 {% elif sonic_asic_platform == 'nephos' %}
-After=nps-modules-4.9.0-8-2-amd64.service
+After=nps-modules-4.9.0-9-2-amd64.service
 {% endif %}
 After=swss.service
 Before=ntp-config.service

diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
@@ -162,7 +162,7 @@ if [ "$install_env" = "onie" ]; then
 fi
 
 # Creates a new partition for the DEMO OS.
-# 
+#
 # arg $1 -- base block device
 #
 # Returns the created partition number in $demo_part
@@ -177,7 +177,7 @@ create_demo_gpt_partition()
     tmpfifo=$(mktemp -u)
     trap_push "rm $tmpfifo || true"
     mkfifo -m 600 "$tmpfifo"
-    
+
     # See if demo partition already exists
     demo_part=$(sgdisk -p $blk_dev | grep -e "$demo_volume_label" -e "$legacy_volume_label" | awk '{print $1}')
     if [ -n "$demo_part" ] ; then
@@ -438,7 +438,7 @@ if [ "$install_env" = "onie" ]; then
         echo "Error: Unable to mount $demo_dev on $demo_mnt"
         exit 1
     }
-    
+
 elif [ "$install_env" = "sonic" ]; then
     demo_mnt="/host"
     eval running_sonic_revision=$(cat /etc/sonic/sonic_version.yml | grep build_version | cut -f2 -d" ")
@@ -595,12 +595,12 @@ menuentry '$demo_grub_entry' {
         if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
         insmod part_msdos
         insmod ext2
-        linux   /$image_dir/boot/vmlinuz-4.9.0-8-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
+        linux   /$image_dir/boot/vmlinuz-4.9.0-9-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
                 net.ifnames=0 biosdevname=0 \
                 loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs                       \
                 apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
         echo    'Loading $demo_volume_label $demo_type initial ramdisk ...'
-        initrd  /$image_dir/boot/initrd.img-4.9.0-8-2-amd64
+        initrd  /$image_dir/boot/initrd.img-4.9.0-9-2-amd64
 }
 EOF
 

diff --git a/platform/barefoot/bfn-modules/debian/control b/platform/barefoot/bfn-modules/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: bfn-modules
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for bfn asic for mmap
 
diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-modules-bfn-montara
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/barefoot/sonic-platform-modules-bfn/debian/control b/platform/barefoot/sonic-platform-modules-bfn/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-modules-bfn
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/broadcom/sai-modules.mk b/platform/broadcom/sai-modules.mk
@@ -1,6 +1,6 @@
 # Broadcom SAI modules
 
-KVERSION = 4.9.0-8-2-amd64
+KVERSION = 4.9.0-9-2-amd64
 BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1
 
 BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb

diff --git a/platform/broadcom/saibcm-modules/debian/control b/platform/broadcom/saibcm-modules/debian/control
@@ -10,5 +10,5 @@ Standards-Version: 3.9.3
 Package: opennsl-modules
 Architecture: amd64
 Section: main
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for broadcom SAI
diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs b/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
@@ -1 +1 @@
-lib/modules/4.9.0-8-2-amd64/extra
+lib/modules/4.9.0-9-2-amd64/extra
diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules.install b/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
@@ -1,5 +1,5 @@
-systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-8-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-8-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-8-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-8-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-9-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-9-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-9-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-9-2-amd64/extra
 systemd/opennsl-modules.service lib/systemd/system
diff --git a/platform/broadcom/saibcm-modules/debian/rules b/platform/broadcom/saibcm-modules/debian/rules
@@ -60,7 +60,7 @@ kdist_config: prep-deb-files
 kdist_clean: clean
 	dh_testdir
 	dh_clean
-	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
+	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
 #	rm -f driver/*.o driver/*.ko
 #
 ### end  KERNEL SETUP
@@ -78,7 +78,7 @@ build-arch-stamp:
 	dh_testdir
 
 	# Add here command to compile/build the package.
-	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
+	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
 
 	touch $@
 
@@ -103,7 +103,7 @@ clean:
 	rm -f build-arch-stamp build-indep-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
+	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
 
 	dh_clean
 

diff --git a/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control b/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-alphanetworks-snh60a0-320fv2
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: sonic-platform-alphanetworks-snh60b0-640f
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/control b/platform/broadcom/sonic-platform-modules-cel/debian/control
@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-dx010
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 
 Package: platform-modules-haliburton
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/control b/platform/broadcom/sonic-platform-modules-dell/debian/control
@@ -7,16 +7,16 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-z9264f
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9100
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s6100
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/broadcom/sonic-platform-modules-delta/debian/control b/platform/broadcom/sonic-platform-modules-delta/debian/control
@@ -7,21 +7,21 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-ag9032v1
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-ag9064
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-ag5648
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-et-6248brb
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init b/platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init
@@ -25,7 +25,7 @@ start)
     modprobe dni_gpio
     modprobe delta_et-6248brb_platform
 
-    if [ `uname -a | awk '{print $3}'` = "4.9.0-8-2-amd64" ]; then
+    if [ `uname -a | awk '{print $3}'` = "4.9.0-9-2-amd64" ]; then
         echo "453" > "/sys/class/gpio/export"
         echo "454" > "/sys/class/gpio/export"
         echo "455" > "/sys/class/gpio/export"

diff --git a/platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh b/platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh
@@ -7,7 +7,7 @@ FAN2_RPM="/sys/bus/i2c/devices/0-002e/fan2_input"
 FAN_TRAY1_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan1_led_ag"
 FAN_TRAY2_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan2_led_ag"
 
-if [ `uname -a | awk '{print $3}'` = "4.9.0-8-2-amd64" ]; then
+if [ `uname -a | awk '{print $3}'` = "4.9.0-9-2-amd64" ]; then
     SYS_LED_G="/sys/class/gpio/gpio453/value"
     SYS_LED_R="/sys/class/gpio/gpio454/value"
     PWR_LED_G="/sys/class/gpio/gpio455/value"

diff --git a/platform/broadcom/sonic-platform-modules-inventec/debian/control b/platform/broadcom/sonic-platform-modules-inventec/debian/control
@@ -7,25 +7,25 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-d7032q28b
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d7054q28b
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d6254qs
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d6556
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d7264q28b
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led
diff --git a/platform/broadcom/sonic-platform-modules-s6000/debian/control b/platform/broadcom/sonic-platform-modules-s6000/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-s6000
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/centec/sonic-platform-modules-e582/debian/control b/platform/centec/sonic-platform-modules-e582/debian/control
@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-e582-48x2q4z
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-e582-48x6q
 Architecture: amd64
-Depends: linux-image-4.9.0-8-2-amd64
+Depends: linux-image-4.9.0-9-2-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
@@ -2,12 +2,12 @@
 
 MLNX_FW_BASE_URL = $(MLNX_SDK_BASE_URL)
 
-MLNX_SPC_FW_VERSION = 13.2000.1140
+MLNX_SPC_FW_VERSION = 13.2000.1420
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 SONIC_ONLINE_FILES += $(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2000.1140
+MLNX_SPC2_FW_VERSION = 29.2000.1420
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 SONIC_ONLINE_FILES += $(MLNX_SPC2_FW_FILE)

diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
@@ -1,6 +1,6 @@
 # Mellanox SAI
 
-MLNX_SAI_VERSION = SAIRel1.14.0-master
+MLNX_SAI_VERSION = SAIRel1.14.1-master
 
 export MLNX_SAI_VERSION
 

diff --git a/platform/mellanox/mlnx-sai/SAI-Implementation b/platform/mellanox/mlnx-sai/SAI-Implementation
diff --git a/platform/mellanox/sdk-src/wjh-libs/Makefile b/platform/mellanox/sdk-src/wjh-libs/Makefile
@@ -0,0 +1,28 @@
+.ONESHELL:
+SHELL = /bin/bash
+
+MAIN_TARGET = wjh-libs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
+DERIVED_TARGETS = wjh-libs-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb \
+				  wjh-libs-dev-static_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
+PACKAGE_NAME = wjh_libs
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	# get sources
+	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
+
+	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
+
+	# build
+	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
+
+	if [ -f autogen.sh ]; then
+		./autogen.sh
+	fi
+
+	debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+
+	popd
+
+	mv $(DERIVED_TARGETS) $* $(DEST)/
+
+$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)