Ericsson nru 0311 4in1

Makefile

@@ -13,7 +13,7 @@ endif
 include $(ONL)/make/config.mk
 
 # All available architectures.
-ALL_ARCHES := amd64 powerpc armel arm64
+ALL_ARCHES := amd64 powerpc armel arm64 armhf
 
 # Build rule for each architecture.
 define build_arch_template
@@ -26,7 +26,7 @@ $(foreach a,$(ALL_ARCHES),$(eval $(call build_arch_template,$(a))))
 # Available build architectures based on the current suite
 BUILD_ARCHES_wheezy := amd64 powerpc
 BUILD_ARCHES_jessie := amd64 powerpc armel
-BUILD_ARCHES_stretch := arm64 amd64
+BUILD_ARCHES_stretch := arm64 amd64 armel armhf
 
 # Build available architectures by default.
 .DEFAULT_GOAL := all

REPO/buster/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/repo-suite.mk

REPO/buster/packages/binary-all/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/repo.mk

REPO/buster/packages/binary-amd64/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/repo.mk

REPO/buster/packages/binary-arm64/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/repo.mk

REPO/buster/packages/binary-armel/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/repo.mk

REPO/buster/packages/binary-armhf/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/repo.mk

REPO/stretch/packages/binary-armhf/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/repo.mk

builds/amd64/rootfs/builds/Makefile

@@ -1,16 +1,9 @@
 include $(ONL)/make/config.amd64.mk
 
-#
-# Default to include all available amd64 platforms.
-# You override this with you own list or yaml file.
-#
+ifndef PLATFORM_LIST
 export PLATFORM_LIST=$(shell onlpm --list-platforms --arch amd64 --csv )
+endif
 
 RFS_CONFIG := $(ONL)/builds/any/rootfs/$(ONL_DEBIAN_SUITE)/standard/standard.yml
-RFS_DIR := rootfs-amd64.d
-RFS_CPIO := rootfs-amd64.cpio.gz
-RFS_SQUASH := rootfs-amd64.sqsh
 
 include $(ONL)/make/rfs.mk
-
-

builds/any/installer/APKG.yml

@@ -17,22 +17,12 @@ packages:
     summary: Open Network Linux $ARCH Installer
 
     files:
-      builds/*INSTALLER        : $$PKG_INSTALL/
-      builds/*.md5sum          : $$PKG_INSTALL/
+      builds/$ONL_DEBIAN_SUITE/*INSTALLER        : $$PKG_INSTALL/
+      builds/$ONL_DEBIAN_SUITE/*.md5sum          : $$PKG_INSTALL/
 
     changelog:  Change changes changes.,
 
 
 release:
-  - builds/*INSTALLER : $ARCH/
-  - builds/*.md5sum   : $ARCH/
-
-
-
-
-
-
-
-
-
-
+  - builds/$ONL_DEBIAN_SUITE/*INSTALLER : $ARCH/
+  - builds/$ONL_DEBIAN_SUITE/*.md5sum   : $ARCH/

builds/any/installer/grub/builds/Makefile

@@ -6,14 +6,19 @@ ifndef BOOTMODE
 $(error $$BOOTMODE not set)
 endif
 
+# Arg. This should be extracted from SWI manifest.
+include /etc/os-release
+DEBIAN_VERSION_ID := $(shell echo $(VERSION_ID))
+
 # Hardcoded to match ONL File naming conventions.
 include $(ONL)/make/versions/version-onl.mk
-INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
+INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS$(DEBIAN_VERSION_ID)_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
 
 MKINSTALLER_OPTS	= \
+  --onl-version "$(VERSION_STRING)" \
   --arch $(ARCH) \
-  --boot-config boot-config \
-  --add-dir config \
+  --boot-config ../boot-config \
+  --add-dir ../config \
   --initrd onl-loader-initrd:$(ARCH) onl-loader-initrd-$(ARCH).cpio.gz \
   --swi onl-swi:$(ARCH) \
   --preinstall-script $(ONL)/builds/any/installer/sample-preinstall.sh \
@@ -22,8 +27,12 @@ MKINSTALLER_OPTS	= \
   --plugin $(ONL)/builds/any/installer/sample-postinstall.py \
   # THIS LINE INTENTIONALLY LEFT BLANK
 
-__installer:
-	$(ONL)/tools/mkinstaller.py $(MKINSTALLER_OPTS) --out $(INSTALLER_NAME)
-	md5sum "$(INSTALLER_NAME)" | awk '{ print $$1 }' > "$(INSTALLER_NAME).md5sum"
+WORK_DIR := $(ONL_DEBIAN_SUITE)
 
+__installer: clean
+	mkdir $(WORK_DIR)
+	cd $(WORK_DIR) && $(ONL)/tools/mkinstaller.py $(MKINSTALLER_OPTS) --out $(INSTALLER_NAME)
+	cd $(WORK_DIR) && md5sum "$(INSTALLER_NAME)" | awk '{ print $$1 }' > "$(INSTALLER_NAME).md5sum"
 
+clean:
+	rm -rf $(WORK_DIR)

builds/any/installer/installer.sh.in

@@ -19,6 +19,7 @@ if test "$ARCH" != "$IARCH"; then
   # identify mappings between kernel arch and debian arch
   case "$IARCH:$ARCH" in
     armel:armv7l) ;;
+    armhf:armv7l) ;;
     arm64:aarch64) ;;
     powerpc:ppc) ;;
     *)

builds/any/installer/sample-postinstall.sh

@@ -39,4 +39,178 @@ rootdir=$1; shift
 echo "Hello from postinstall"
 echo "Chroot is $rootdir"
 
+
+PATH_TMP='/tmp/os'
+EFI_PATH_TMP='/tmp/efi'
+DIAG_GRUB_DATA="function diag_bootcmd {
+                \$diag_grub_custom 
+            }"
+
+
+diskpartition=$(df | grep "onie-boot" | awk '{print $1}')
+diskname=${diskpartition:0:8}
+echo "diskname:"$diskname
+
+###  Delete ONL boot partition 
+ONL_DIAG=$(efibootmgr | grep "Open Network Linux" | awk '{print $1}')
+ONL_BOOT_NUM="${ONL_DIAG//Boot/}"
+ONL_BOOT_NUM="${ONL_BOOT_NUM//\*/}"
+# efibootmgr -b $ONL_BOOT_NUM -A # -B is inactive command
+efibootmgr -b $ONL_BOOT_NUM -B  # -B is delete command
+
+### Change parition name with -DIAG, The uninstall operation must not modify or remove this partiion.
+sgdisk --change-name=$(sgdisk -p $diskname | grep "ONL-BOOT" | awk '{print $1}'):"ONL-BOOT-DIAG" $diskname
+sgdisk --change-name=$(sgdisk -p $diskname | grep "ONL-CONFIG" | awk '{print $1}'):"ONL-CONFIG-DIAG" $diskname
+sgdisk --change-name=$(sgdisk -p $diskname | grep "ONL-IMAGES" | awk ' {print $1}'):"ONL-IMAGES-DIAG" $diskname
+sgdisk --change-name=$(sgdisk -p $diskname | grep "ONL-DATA" | awk '{print $1}'):"ONL-DATA-DIAG" $diskname
+
+tune2fs -L "ONL-BOOT-DIAG" $diskname$(sgdisk -p $diskname | grep "ONL-BOOT" | awk '{print $1}')
+tune2fs -L "ONL-CONFIG-DIAG" $diskname$(sgdisk -p $diskname | grep "ONL-CONFIG" | awk '{print $1}')
+tune2fs -L "ONL-IMAGES-DIAG" $diskname$(sgdisk -p $diskname | grep "ONL-IMAGES" | awk '{print $1}')
+tune2fs -L "ONL-DATA-DIAG" $diskname$(sgdisk -p $diskname | grep "ONL-DATA" | awk '{print $1}')
+
+### Set GPT system partition attribute bit (bit 0)
+sgdisk -A $(sgdisk -p $diskname | grep "ONL-BOOT" | awk '{print $1}'):set:0 $diskname
+sgdisk -A $(sgdisk -p $diskname | grep "ONL-CONFIG" | awk '{print $1}'):set:0 $diskname
+sgdisk -A $(sgdisk -p $diskname | grep "ONL-IMAGES" | awk '{print $1}'):set:0 $diskname
+sgdisk -A $(sgdisk -p $diskname | grep "ONL-DATA" | awk '{print $1}'):set:0 $diskname
+
+### Read grub config and set back to ONIE Diag grub.
+mkdir -p $PATH_TMP
+mount -v $diskname$(sgdisk -p $diskname | grep "ONL-BOOT" | awk '{print $1}') $PATH_TMP
+ST_GRUB=$(cat $PATH_TMP/grub/grub.cfg | grep -n "menuentry \"Open Network Linux\" {" | head -n 1 | cut -d: -f1)
+EN_GRUB=$(tail $PATH_TMP/grub/grub.cfg -n +$ST_GRUB | grep -n "}" |head -n 1 |cut -d: -f1)
+EN_GRUB=$(($EN_GRUB+$ST_GRUB-1))
+
+sed -n -e $(($ST_GRUB+1)),$(($EN_GRUB-1))p $PATH_TMP/grub/grub.cfg > /tmp/grub_tmp
+sed -i "s/ONL-BOOT/ONL-BOOT-DIAG/g" /tmp/grub_tmp
+
+# DIAG_GRUB="${DIAG_GRUB_DATA/"\$diag_grub_custom"/\"$DIAG_GRUB\"}"
+
+
+# Reset onie grub remove ONL custom variable
+
+#find "begin: serial console config" in grub.cfg
+POS_LINE=$(cat $rootdir/mnt/onie-boot/grub/grub.cfg | grep -n "begin: serial console config" | head -n 1 | cut -d: -f1)
+if [ $POS_LINE -gt 1 ]; then
+  #echo "remove top variable from line 1 to $POS_LINE"
+  sed $((1)),$(($POS_LINE-1))d $rootdir/mnt/onie-boot/grub/grub.cfg > /tmp/new_clean_grub_tmp
+  cat /tmp/new_clean_grub_tmp > $rootdir/mnt/onie-boot/grub/grubNEW.cfg
+else
+  #echo "just copy to grubNEW.cfg"
+  cp $rootdir/mnt/onie-boot/grub/grub.cfg $rootdir/mnt/onie-boot/grub/grubNEW.cfg
+fi
+
+# find&clean old diag boot command (This section was created after onie update onie'll copied diag-bootcmd.cfg to this section)
+STARTEX_POS_LINE=$(cat $rootdir/mnt/onie-boot/grub/grubNEW.cfg | grep -n "# begin: diag boot command" | head -n 1 | cut -d: -f1)
+LASTEX_POS_LINE=$(cat $rootdir/mnt/onie-boot/grub/grubNEW.cfg | grep -n "# end: diag boot command" | head -n 1 | cut -d: -f1)
+if [ $STARTEX_POS_LINE -gt 1 ]; then
+    RESULT=`expr $LASTEX_POS_LINE - $STARTEX_POS_LINE` || {
+        echo "This case is created for fix bug from previous version please ignore above error message"
+        RESULT=0
+    }
+    if [ $RESULT -gt 1 ]; then
+        sed $(($STARTEX_POS_LINE+1)),$(($LASTEX_POS_LINE-1))d $rootdir/mnt/onie-boot/grub/grubNEW.cfg > /tmp/new_clean_grub_tmp
+        cat /tmp/new_clean_grub_tmp > $rootdir/mnt/onie-boot/grub/grubNEW.cfg
+    fi
+fi
+
+
+
+
+
+
+cp $rootdir/mnt/onie-boot/grub/grub.cfg $rootdir/mnt/onie-boot/grub/grub_backup.cfg
+echo "Installing Diag OS grub to grub.cfg ....."
+echo "$(echo "}" | cat - $rootdir/mnt/onie-boot/grub/grubNEW.cfg)" > $rootdir/mnt/onie-boot/grub/grubNEW.cfg
+cat /tmp/grub_tmp | cat - $rootdir/mnt/onie-boot/grub/grubNEW.cfg > $rootdir/mnt/onie-boot/grub/grub.cfg
+echo "$(echo "function diag_bootcmd {" | cat - $rootdir/mnt/onie-boot/grub/grub.cfg)" > $rootdir/mnt/onie-boot/grub/grub.cfg
+echo "$(echo diag_menu=\"In-Field Diag OS\" | cat - $rootdir/mnt/onie-boot/grub/grub.cfg)" > $rootdir/mnt/onie-boot/grub/grub.cfg
+rm -f $rootdir/mnt/onie-boot/grub/grubNEW.cfg
+
+
+# DIAG_GRUB="${DIAG_GRUB_DATA/"\$diag_grub_custom"/\"$DIAG_GRUB\"}"
+cp $rootdir/mnt/onie-boot/onie/grub/grub_backup.cfg $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg 2> /dev/null || :
+cp $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg $rootdir/mnt/onie-boot/onie/grub/grub_extra_backup.cfg
+
+#Remove old In-Field Diag OS grub from old grub-extra.cfg
+STARTEX_POS_LINE=$(cat $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg | grep -n "diag_menu=\"In-Field Diag OS\"" | head -n 1 | cut -d: -f1)
+LASTEX_POS_LINE=$(cat $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg | grep -n "ONIE_EXTRA_CMDLINE_LINUX" | head -n 1 | cut -d: -f1)
+if [ $(($LASTEX_POS_LINE-2)) -gt 1 ]; then
+  sed $(($STARTEX_POS_LINE-1)),$(($LASTEX_POS_LINE-2))d $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg > $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg
+fi
+
+#Create custom In-Field Diag OS option in grub-extra.cfg
+
+cp $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg $rootdir/mnt/onie-boot/onie/grub/grubNEW.cfg
+echo "Installing Diag OS grub grub-extra.cfg ....."
+echo "$(echo "}" | cat - $rootdir/mnt/onie-boot/onie/grub/grubNEW.cfg)" > $rootdir/mnt/onie-boot/onie/grub/grubNEW.cfg
+cat /tmp/grub_tmp | cat - $rootdir/mnt/onie-boot/onie/grub/grubNEW.cfg > $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg
+echo "$(echo "function diag_bootcmd {" | cat - $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg)" > $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg
+echo "$(echo diag_menu=\"In-Field Diag OS\" | cat - $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg)" > $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg
+echo "$(echo "## Begin In-Field Diag OS in grub-extra.cfg" | cat - $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg)" > $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg
+rm -f $rootdir/mnt/onie-boot/onie/grub/grubNEW.cfg
+
+#Get boot order before create new one.
+# CURRENT_BOOT_ORDER=$(efibootmgr | grep BootOrder: | awk '{ print $2 }')
+mkdir -p $EFI_PATH_TMP
+mount -v $diskname$(sgdisk -p $diskname | grep "EFI System" | awk '{print $1}') $EFI_PATH_TMP
+echo "Update EFI directory for ONL from /boot/efi/EFI/ONL to /boot/efi/EFI/ONL-DIAG"
+if [ -d /tmp/efi/EFI/ONL-DIAG ]; then
+    rm -r /tmp/efi/EFI/ONL-DIAG
+fi
+if [ -d /tmp/efi/EFI/ONL ]; then
+    mv /tmp/efi/EFI/ONL /tmp/efi/EFI/ONL-DIAG
+fi
+
+
+# boot_num=$(efibootmgr -v | grep "In-Field Diag OS" | grep ')/File(' | tail -n 1 | awk '{ print $1 }')
+# boot_num_len=${#boot_num}
+# if [ $boot_num_len -eq 0 ]; then
+#     efibootmgr -c -L "In-Field Diag OS" -l '\EFI\ONL-DIAG\grubx64.efi'
+# fi
+
+# #*Reorder* move In-Field Diag OS to back of list.
+# boot_num=$(efibootmgr -v | grep "In-Field Diag OS" | grep ')/File(' | tail -n 1 | awk '{ print $1 }')
+# boot_num=${boot_num#Boot}
+# boot_num=${boot_num%\*}
+# new_boot_order="$(echo -n $CURRENT_BOOT_ORDER | sed -e s/,$boot_num// -e s/$boot_num,// -e s/$boot_num//)"
+# efibootmgr -o ${new_boot_order},${boot_num}
+
+
+#Remove existing In-Field Diag OS from boot option following new requirement
+boot_num=$(efibootmgr -v | grep "In-Field Diag OS" | grep ')/File(' | tail -n 1 | awk '{ print $1 }')
+boot_num_len=${#boot_num}
+if [ $boot_num_len -gt 0 ]; then
+  boot_num=${boot_num#Boot}
+  boot_num=${boot_num%\*}
+  efibootmgr -b $boot_num -B
+fi
+
+
+echo "Copy grub-extra.cfg to diag-boocmd.cfg to prevent command disappear after Onie update ..."
+cp $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg $rootdir/mnt/onie-boot/onie/grub/diag-bootcmd.cfg
+
+echo "Create dummy partition for In-Field Diag OS for prevent being destroy by onie-updater"
+# DUMMY_PARTITION_NUMBER_POST=$(sgdisk -p $diskname | grep "ONL-ROOTFS-DIAG" | awk '{print $1}')
+# if [[ $DUMMY_PARTITION_NUMBER_POST -gt 0 ]]
+# then
+#     exit 0
+# fi
+START_POS=$(sgdisk -f $diskname)
+END_POS=$(($START_POS+4096))
+LAST_PARTITION_NUMBER=$(sgdisk -p $diskname | grep $(($START_POS-1)) | awk '{print $1}')
+NEW_PARTITION_NUMBER=$((LAST_PARTITION_NUMBER+1))
+sgdisk -n $NEW_PARTITION_NUMBER:$START_POS:$END_POS -t $NEW_PARTITION_NUMBER:0700 $diskname
+sgdisk --change-name=$NEW_PARTITION_NUMBER:"ONL-ROOTFS-DIAG" $diskname
+sgdisk -A $(sgdisk -p $diskname | grep "ONL-ROOTFS-DIAG" | awk '{print $1}'):set:0 $diskname
+sync
+
+partprobe $diskname
+mkfs.ext4 -v -O ^huge_file -L ONL-ROOTFS-DIAG $diskname$NEW_PARTITION_NUMBER || {
+    echo "error using ext2 instead"
+    mkfs.ext2 -v -L ONL-ROOTFS-DIAG $diskname$NEW_PARTITION_NUMBER 
+}
+partprobe $diskname
 exit 0
+

builds/any/installer/sample-preinstall.sh

@@ -35,4 +35,43 @@ rootdir=$1; shift
 echo "Hello from preinstall"
 echo "Chroot is $rootdir"
 
+
+diskpartition=$(df | grep "onie-boot" | awk '{print $1}')
+diskname=${diskpartition:0:8}
+echo "diskname:"$diskname
+
+
+### Change parition name with -DIAG, The uninstall operation must not modify or remove this partiion.
+### clear GPT system partition attribute bit (bit 0)
+if [ ! -z $(sgdisk -p $diskname | grep "ONL-BOOT-DIAG" | awk '{print $1}') ]; then
+    sgdisk --change-name=$(sgdisk -p $diskname | grep "ONL-BOOT-DIAG" | awk '{print $1}'):"ONL-BOOT" $diskname
+    sgdisk -A $(sgdisk -p $diskname | grep "ONL-BOOT" | awk '{print $1}'):clear:0 $diskname
+fi
+if [ ! -z $(sgdisk -p $diskname | grep "ONL-CONFIG-DIAG" | awk '{print $1}') ]; then
+    sgdisk --change-name=$(sgdisk -p $diskname | grep "ONL-CONFIG-DIAG" | awk '{print $1}'):"ONL-CONFIG" $diskname
+    sgdisk -A $(sgdisk -p $diskname | grep "ONL-CONFIG" | awk '{print $1}'):clear:0 $diskname
+fi
+if [ ! -z $(sgdisk -p $diskname | grep "ONL-IMAGES-DIAG" | awk '{print $1}') ]; then
+    sgdisk --change-name=$(sgdisk -p $diskname | grep "ONL-IMAGES-DIAG" | awk ' {print $1}'):"ONL-IMAGES" $diskname
+    sgdisk -A $(sgdisk -p $diskname | grep "ONL-IMAGES" | awk '{print $1}'):clear:0 $diskname
+fi
+if [ ! -z $(sgdisk -p $diskname | grep "ONL-DATA-DIAG" | awk '{print $1}') ]; then
+    sgdisk --change-name=$(sgdisk -p $diskname | grep "ONL-DATA-DIAG" | awk '{print $1}'):"ONL-DATA" $diskname
+    sgdisk -A $(sgdisk -p $diskname | grep "ONL-DATA" | awk '{print $1}'):clear:0 $diskname
+fi
+
+## Remove Dummy partition ONL-ROOTFS-DIAG if exist
+if [ ! -z $(sgdisk -p $diskname | grep "ONL-ROOTFS-DIAG" | awk '{print $1}') ]; then
+    DUMMY_PARTITION_NUMBER=$(sgdisk -p $diskname | grep "ONL-ROOTFS-DIAG" | awk '{print $1}')
+	parted $diskname rm $DUMMY_PARTITION_NUMBER
+fi
+
+## Move back the ONL efi partition for protect the conflict between install process.
+if [ -d /boot/efi/EFI/ONL-DIAG ]; then
+    mv /boot/efi/EFI/ONL-DIAG /boot/efi/EFI/ONL
+fi
+
+
+
 exit 0
+

builds/any/installer/test.sh

@@ -0,0 +1,4 @@
+
+newplatform="NRU-S 0301"
+subplat=${newplatform%-X86*}
+echo $subplat

builds/any/installer/uboot/builds/Makefile

@@ -6,14 +6,19 @@ ifndef BOOTMODE
 $(error $$BOOTMODE not set)
 endif
 
+# Arg. This should be extracted from SWI manifest.
+include /etc/os-release
+DEBIAN_VERSION_ID := $(shell echo $(VERSION_ID))
+
 # Hardcoded to match ONL File naming conventions.
 include $(ONL)/make/versions/version-onl.mk
-INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
+INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS$(DEBIAN_VERSION_ID)_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
 
 MKINSTALLER_OPTS	= \
+  --onl-version "$(VERSION_STRING)" \
   --arch $(ARCH) \
-  --boot-config boot-config \
-  --add-dir config \
+  --boot-config ../boot-config \
+  --add-dir ../config \
   --fit onl-loader-fit:$(ARCH) onl-loader-fit.itb \
   --swi onl-swi:$(ARCH) \
   --preinstall-script $(ONL)/builds/any/installer/sample-preinstall.sh \
@@ -22,8 +27,12 @@ MKINSTALLER_OPTS	= \
   --plugin $(ONL)/builds/any/installer/sample-postinstall.py \
   # THIS LINE INTENTIONALLY LEFT BLANK
 
-__installer:
-	$(ONL)/tools/mkinstaller.py $(MKINSTALLER_OPTS) --out $(INSTALLER_NAME)
-	md5sum "$(INSTALLER_NAME)" | awk '{ print $$1 }' > "$(INSTALLER_NAME).md5sum"
+WORK_DIR := $(ONL_DEBIAN_SUITE)
 
+__installer: clean
+	mkdir $(WORK_DIR)
+	cd $(WORK_DIR) && $(ONL)/tools/mkinstaller.py $(MKINSTALLER_OPTS) --out $(INSTALLER_NAME)
+	cd $(WORK_DIR) && md5sum "$(INSTALLER_NAME)" | awk '{ print $$1 }' > "$(INSTALLER_NAME).md5sum"
 
+clean:
+	rm -rf $(WORK_DIR)