new file mode 100644

@@ -0,0 +1,8 @@

+{

+    "minimal" : {

+        "title" : "Photon Minimal",

+        "file" : "packages_minimal_rpi3.json",

+        "visible" : true,

+        "include" : []

+    }

+}

new file mode 100644

@@ -0,0 +1,12 @@

+{

+    "packages":["glibc", "zlib", "filesystem",

+                "pkg-config", "bash", "bzip2", "shadow", "procps-ng", "coreutils", "bc", "libtool", "net-tools",

+                "findutils", "xz", "iproute2", "util-linux", "kmod", "linux", "ca-certificates", "curl", "iptables", "Linux-PAM",

+                "systemd", "dbus", "file", "e2fsprogs", "rpm","gawk","gptfdisk",

+                "openssh", "gdbm", "parted",

+                "photon-release", "photon-repos",

+                "sed", "grep", "cpio", "gzip", "vim", "libdb", "tdnf",

+                "which", "tzdata", "motd", "gdbm"]

+}

+

+

@@ -25,10 +25,12 @@ VMDK_CONFIG_SAFE_FILE=${BUILD_SCRIPTS_PATH}/$IMG_NAME/vmdk_safe_$IMG_NAME.json

 cd $BUILD_SCRIPTS_PATH

 image_list=`for i in $(ls -d */); do echo ${i%%/}; done`

-if ! [[ $image_list =~ (^|[[:space:]])$IMG_NAME($|[[:space:]]) ]]

-  then

+if ! [[ $image_list =~ (^|[[:space:]])$IMG_NAME($|[[:space:]]) ]] ; then

     echo "Input image name not supported. Aborting."; exit 1;

 fi

+if [[ $IMG_NAME == ova* ]] ; then

+    command -v ovftool >/dev/null 2>&1 || { echo "Ovftool not installed. Aborting." >&2; exit 1; }

+fi

 rm -rf $WORKING_DIR

 mkdir -p $WORKING_DIR/installer

@@ -39,15 +41,7 @@ cp $VMDK_CONFIG_FILE $VMDK_CONFIG_SAFE_FILE

 cp ${BUILD_SCRIPTS_PATH}/mk-setup-vmdk.sh .

 cp ${BUILD_SCRIPTS_PATH}/mk-clean-vmdk.sh .

-if [[ $IMG_NAME == ova* ]]

-  then

-    command -v ovftool >/dev/null 2>&1 || { echo "Ovftool not installed. Aborting." >&2; exit 1; }

-fi

-

-if [ -e ${BUILD_SCRIPTS_PATH}/${IMG_NAME}/mk-setup-grub.sh ]

-  then

-    cp ${BUILD_SCRIPTS_PATH}/${IMG_NAME}/mk-setup-grub.sh .

-fi

+cp -r ${BUILD_SCRIPTS_PATH}/${IMG_NAME}/* .

 PASSWORD=`date | md5sum | cut -f 1 -d ' '`

 sed -i "s/PASSWORD/$PASSWORD/" $VMDK_CONFIG_SAFE_FILE

@@ -59,12 +53,13 @@ if [ -n "$ADDITIONAL_RPMS_PATH" ]

 fi

 ./photonInstaller.py -p $GENERATED_DATA_PATH/build_install_options_$IMG_NAME.json -r $PHOTON_STAGE_PATH/RPMS -v $WORKING_DIR/photon-${IMG_NAME} -o $GENERATED_DATA_PATH -d $PHOTON_STAGE_PATH/pkg_info.json -f $VMDK_CONFIG_SAFE_FILE

+status=$?

 cat $VMDK_CONFIG_SAFE_FILE

 rm $VMDK_CONFIG_SAFE_FILE

 cd $BUILD_SCRIPTS_PATH

-./customize_cloud_image.py \

+[ $status -eq 0 ] && ./customize_cloud_image.py \

  -r ${PHOTON_IMG_OUTPUT_PATH}/photon-${IMG_NAME}.raw \

  -c $VMDK_CONFIG_FILE \

  -w $WORKING_DIR \

@@ -165,7 +165,10 @@ if __name__ == '__main__':

             print "  Copying additional files into the raw image ..."

             for filetuples in config['additionalfiles']:

                 for src,dest in filetuples.iteritems():

-                    shutil.copyfile(options.build_scripts_path + '/' + options.image_name + '/' + src, options.mount_path + '/' + dest)

+		    if (os.path.isdir(options.build_scripts_path + '/' + options.image_name + '/' + src)):

+                        shutil.copytree(options.build_scripts_path + '/' + options.image_name + '/' + src, options.mount_path + dest, True)

+                    else:

+                        shutil.copyfile(options.build_scripts_path + '/' + options.image_name + '/' + src, options.mount_path + dest)

         if 'postinstallscripts' in config:

@@ -179,17 +182,22 @@ if __name__ == '__main__':

                 utils.runshellcommand("chroot {} /bin/bash -c '/tempscripts/{}'".format(options.mount_path, script))

             shutil.rmtree(options.mount_path + "/tempscripts", ignore_errors=True)

+    except Exception as e:

+	print e

+

+    finally:

         utils.runshellcommand("umount -l {}".format(options.mount_path + "/sys"))

         utils.runshellcommand("umount -l {}".format(options.mount_path + "/dev/pts"))

         utils.runshellcommand("umount -l {}".format(options.mount_path + "/dev"))

         utils.runshellcommand("umount -l {}".format(options.mount_path + "/proc"))

+

+        utils.runshellcommand("sync")

         utils.runshellcommand("umount -l {}".format(options.mount_path))

         mount_out = utils.runshellcommand("mount")

         print "List of mounted devices:"

         print mount_out

-    finally:

         utils.runshellcommand("kpartx -d {}".format(disk_device))

         utils.runshellcommand("losetup -d {}".format(disk_device))

@@ -217,6 +225,13 @@ if __name__ == '__main__':

             tgzout = tarfile.open(tarname, "w:gz")

             tgzout.add(raw_image, arcname=os.path.basename(raw_image))

             tgzout.close()

+        elif config['artifacttype'] == 'xz':

+            print "Generating the xz artifact ..."

+            utils.runshellcommand("xz -z -k {}".format(raw_image))

+#            tarname = img_path + '/photon-' + options.image_name + '-' + photon_release_ver + '-' + photon_build_num + '.xz'

+#            tgzout = tarfile.open(tarname, "w:xz")

+#            tgzout.add(raw_image, arcname=os.path.basename(raw_image))

+#            tgzout.close()

         elif config['artifacttype'] == 'vhd':

             relrawpath = os.path.relpath(raw_image, options.src_root)

             vhdname = os.path.dirname(relrawpath) + '/photon-' + options.image_name + '-' + photon_release_ver + '-' + photon_build_num + '.vhd'

@@ -88,9 +88,9 @@ DISK_DEVICE=`losetup --show -f $VMDK_IMAGE_NAME`

 echo "Creating partition on raw disk"

 if [ $SWAP_PARTITION_SIZE -gt 0 ] 

 then

-      sgdisk -n 1::+3M -n 2::+${ROOT_PARTITION_SIZE}G -n 3: -p $DISK_DEVICE >> $LOGFILE

+      sgdisk -n 1::+8M -n 2::+${ROOT_PARTITION_SIZE}G -n 3: -p $DISK_DEVICE >> $LOGFILE

 else

-      sgdisk -n 1::+3M -n 2: -p $DISK_DEVICE >> $LOGFILE

+      sgdisk -n 1::+8M -n 2: -p $DISK_DEVICE >> $LOGFILE

 fi

 if [ $BOOT_FIRM_WARE = "efi" ]

new file mode 100755

Binary files /dev/null and b/support/cloud-image-builder/rpi3/esp/EFI/BOOT/bootaa64.efi differ

new file mode 100755

Binary files /dev/null and b/support/cloud-image-builder/rpi3/esp/bootcode.bin differ

new file mode 100755

@@ -0,0 +1,22 @@

+# Get more options/information on http://elinux.org/RPiconfig

+# or on https://www.raspberrypi.org/documentation/configuration/config-txt.md

+# Our kernels are located on a Linux partition. Chainload U-Boot to load them.

+kernel=u-boot.bin

+# Use 64 MB for GPU for RPi with 256 MB (Min 16 - Max 192 MB)

+gpu_mem_256=64

+# Use 64 MB for GPU for RPi with 512 MB (Min 16 - Max 448 MB)

+gpu_mem_512=64

+# Use 128 MB for GPU for RPi with 1024 MB (Min 16 - Max 944 MB)

+gpu_mem_1024=128

+# Turbo mode: 0 = enable dynamic freq/voltage - 1 = always max

+force_turbo=0

+# Start in turbo mode for 30 seconds or until cpufreq sets a frequency

+initial_turbo=30

+# DO NOT overvoltage manually to not void warranty!

+over_voltage=0

+# Boot in AArch64 (64-bit) mode

+arm_control=0x200

+# Fix mini UART input frequency, and setup/enable up the UART.

+enable_uart=1

+# Disable warning overlays as they don't work well together with linux's graphical output

+avoid_warnings=1

new file mode 100755

Binary files /dev/null and b/support/cloud-image-builder/rpi3/esp/fixup.dat differ

new file mode 100755

Binary files /dev/null and b/support/cloud-image-builder/rpi3/esp/start.elf differ

new file mode 100755

@@ -0,0 +1 @@

+bootaa64

new file mode 100755

Binary files /dev/null and b/support/cloud-image-builder/rpi3/esp/u-boot.bin differ

new file mode 100755

@@ -0,0 +1,60 @@

+#!/bin/bash

+#################################################

+#       Title:  mk-prepare-system               #

+#        Date:  2014-11-26                      #

+#     Version:  1.0                             #

+#      Author:  mbassiouny@vmware.com           #

+#     Options:                                  #

+#################################################

+#   Overview

+#       Preparing the system to install photon

+#   End

+#

+set -o errexit      # exit if error...insurance ;

+set -o nounset      # exit if variable not initalized

+set +h          # disable hashall

+source config.inc

+source function.inc

+PRGNAME=${0##*/}    # script name minus the path

+

+LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"    #   set log file name

+#LOGFILE=/dev/null      #   uncomment to disable log file

+

+[ ${EUID} -eq 0 ]   || fail "${PRGNAME}: Need to be root user: FAILURE"

+[ -z ${BUILDROOT} ] && fail "${PRGNAME}: Build root not set: FAILURE"

+

+cd ${BUILDROOT} || fail "${PRGNAME}: Change directory: ${BUILDROOT}: FAILURE"

+

+#

+#   Setup the filesystem for chapter 06

+#

+if [[   $# -gt 0 ]] && [[ $1 == 'install' ]]; then

+    mkdir -p ${BUILDROOT}/var/lib/rpm

+    mkdir -p ${BUILDROOT}/cache/tdnf

+    rpm   --root ${BUILDROOT} --initdb

+    tdnf install filesystem --installroot ${BUILDROOT} --nogpgcheck --assumeyes

+else

+    RPMPKG="$(find RPMS -name 'filesystem-[0-9]*.rpm' -print)"

+    [ -z ${RPMPKG} ] && fail "  Filesystem rpm package missing: Can not continue"

+    run_command "   Installing filesystem" "rpm -Uvh --nodeps --root ${BUILDROOT} --dbpath /var/lib/rpm ${RPMPKG}" "${LOGFILE}"

+fi

+ 

+#   Ommited in the filesystem.spec file - not needed for booting

+[ -e ${BUILDROOT}/dev/console ] || mknod -m 600 ${BUILDROOT}/dev/console c 5 1

+[ -e ${BUILDROOT}/dev/null ]    || mknod -m 666 ${BUILDROOT}/dev/null c 1 3

+[ -e ${BUILDROOT}/dev/random ]  || mknod -m 444 ${BUILDROOT}/dev/random c 1 8

+[ -e ${BUILDROOT}/dev/urandom ] || mknod -m 444 ${BUILDROOT}/dev/urandom c 1 9

+

+if [[   $# -eq 0 ]] || [[ $1 != 'install' ]]; then

+    chown -R 0:0 ${BUILDROOT}/* || :

+fi

+

+#

+#   Mount kernel filesystem

+#

+#if ! mountpoint ${BUILDROOT}/dev    >/dev/null 2>&1; then mount --rbind /dev ${BUILDROOT}/dev; mount --make-rslave ${BUILDROOT}/dev; fi

+#if ! mountpoint ${BUILDROOT}/proc   >/dev/null 2>&1; then mount -t proc proc ${BUILDROOT}/proc; fi

+#if ! mountpoint ${BUILDROOT}/sys    >/dev/null 2>&1; then mount -t sysfs sysfs ${BUILDROOT}/sys; fi

+#if ! mountpoint ${BUILDROOT}/run    >/dev/null 2>&1; then mount -t tmpfs tmpfs ${BUILDROOT}/run; fi

+#if [ -h ${BUILDROOT}/dev/shm ];          then mkdir -pv ${BUILDROOT}/$(readlink ${BUILDROOT}/dev/shm); fi

+exit 0

new file mode 100755

@@ -0,0 +1,107 @@

+#!/bin/bash

+#################################################

+#       Title:  mk-setup-grub                   #

+#        Date:  2014-11-26                      #

+#     Version:  1.0                             #

+#      Author:  sharathg@vmware.com             #

+#     Options:                                  #

+#################################################

+#    Overview

+#        This is a precursor for the vmware build system.

+#        This assumes that an empty hard disk is attached to the build VM.

+#        The path to this empty disk is specified in the HDD variable in config.inc

+#    End

+#

+

+grub_efi_install()

+{

+    mkdir -p $BUILDROOT/boot/efi

+    #

+    # if it is a loop device then we should mount the dev mapped boot partition

+    #

+    BOOT_PARTITION=/dev/mapper/`basename ${HDD}`p1

+    mkfs.fat $BOOT_PARTITION

+    mount -t vfat $BOOT_PARTITION $BUILDROOT/boot/efi

+    cp -r esp/* $BUILDROOT/boot/efi/

+    umount $BUILDROOT/boot/efi

+}

+

+set -o errexit        # exit if error...insurance ;)

+set -o nounset        # exit if variable not initalized

+set +h            # disable hashall

+PRGNAME=${0##*/}    # script name minus the path

+source config.inc        #    configuration parameters

+source function.inc        #    commonn functions

+LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"    #    set log file name

+ARCH=$(uname -m)    # host architecture

+[ ${EUID} -eq 0 ]    || fail "${PRGNAME}: Need to be root user: FAILURE"

+> ${LOGFILE}        #    clear/initialize logfile

+

+# Check if passing a HHD and partition

+if [ $# -eq 6 ] ; then

+    BOOTMODE=$1

+    HDD=$2

+    ROOT_PARTITION_PATH=$3

+    BOOT_PARTITION_PATH=$4

+    BOOT_DIRECTORY=$5

+    BOOT_PARTITION_NUMBER=$6

+fi

+

+#

+#    Install grub2.

+#

+#BOOT_UUID=$(blkid -s UUID -o value $BOOT_PARTITION_PATH)

+

+mkdir -p $BUILDROOT/boot/grub2

+ln -sfv grub2 $BUILDROOT/boot/grub

+

+grub_efi_install

+

+rm -rf ${BUILDROOT}/boot/grub2/fonts

+cp boot/ascii.pf2 ${BUILDROOT}/boot/grub2/

+mkdir -p ${BUILDROOT}/boot/grub2/themes/photon

+cp boot/splash.png ${BUILDROOT}/boot/grub2/themes/photon/photon.png

+cp boot/terminal_*.tga ${BUILDROOT}/boot/grub2/themes/photon/

+cp boot/theme.txt ${BUILDROOT}/boot/grub2/themes/photon/

+

+EXTRA_PARAMS="rootwait rw console=ttyS0,115200n8 console=tty0"

+

+cat > $BUILDROOT/boot/grub2/grub.cfg << EOF

+# Begin /boot/grub2/grub.cfg

+

+set default=0

+set timeout=2

+loadfont ${BOOT_DIRECTORY}grub2/ascii.pf2

+

+insmod all_video

+insmod gfxterm

+insmod png

+insmod ext2

+

+set gfxmode="800x600"

+gfxpayload=keep

+

+terminal_output gfxterm

+

+set theme=${BOOT_DIRECTORY}grub2/themes/photon/theme.txt

+load_env -f ${BOOT_DIRECTORY}photon.cfg

+if [ -f  ${BOOT_DIRECTORY}systemd.cfg ]; then

+    load_env -f ${BOOT_DIRECTORY}systemd.cfg

+else

+    set systemd_cmdline=net.ifnames=0

+fi

+set rootpartition=/dev/mmcblk0p2

+

+menuentry "Photon" {

+    linux ${BOOT_DIRECTORY}\$photon_linux root=\$rootpartition \$photon_cmdline \$systemd_cmdline $EXTRA_PARAMS

+    if [ -f ${BOOT_DIRECTORY}\$photon_initrd ]; then

+        initrd ${BOOT_DIRECTORY}\$photon_initrd

+    fi

+}

+# End /boot/grub2/grub.cfg

+EOF

+

+#Cleanup the workspace directory

+rm -rf "$BUILDROOT"/tools

+rm -rf "$BUILDROOT"/RPMS

+

new file mode 100755

@@ -0,0 +1,117 @@

+#!/bin/bash

+#################################################

+#	Title:	mk-setup-vmdk			#

+#        Date:	2014-11-14   	 		#

+#     Version:	1.0				#

+#      Author:	dthaluru@vmware.com		#

+#     Options:					#

+#################################################

+#	Overview

+#		Creating hard disk with photon on it

+#	End

+#

+set -o errexit		# exit if error...insurance ;)

+set -o nounset		# exit if variable not initalized

+set +h			# disable hashall

+PRGNAME=${0##*/}	# script name minus the path

+source config.inc		#	configuration parameters

+source function.inc		#	commonn functions

+LOGFILE="/var/log/${PRGNAME}-${LOGFILE}"	#	set log file name

+LFS_DISK="/mnt/photon-disk"

+[ ${EUID} -eq 0 ]	|| die "${PRGNAME}: Need to be root user: FAILURE"

+> ${LOGFILE}		#	clear/initialize logfile

+

+echo -e "Setting up the disk...\n"

+set -x

+LFS_OPTION=""

+VMDK_IMAGE_NAME=mydisk.vmdk

+ROOT_PARTITION_SIZE=1

+SWAP_PARTITION_SIZE=0

+BOOT_FIRM_WARE="bios"

+

+while [[ $# > 0 ]]

+do

+	key="$1"

+	shift

+ 

+	case $key in

+		-rp|--ROOT_PARTITION_SIZE)

+		ROOT_PARTITION_SIZE="$1"

+		shift

+	;;

+		-sp|--SWAP_PARTITION_SIZE)

+		SWAP_PARTITION_SIZE="$1"

+		shift

+	;;

+		-fm|--firmware)

+		BOOT_FIRM_WARE="$1"

+		shift

+

+	;;

+		-a|--all)

+		LFS_OPTION="all"

+	;;

+		-m|--minimal)

+		LFS_OPTION=""

+	;;

+		-n|--IMG_NAME)

+		VMDK_IMAGE_NAME="$1".raw

+		shift

+	;;

+		-h|--help)

+		echo 'Usage:'

+		echo '-rp|--ROOT_PARTITION_SIZE :sets root partition size'

+		echo '-sp|--SWAP_PARTITION_SIZE :sets swap partition size'

+		echo '-a|--all                  :installs all available packages'

+		echo '-n|--IMG_NAME             :sets name of the vmdk image'

+		echo '-m|--minimal              :installs basic packages'

+		echo '-fm|--firmware            :firmware'

+		exit 0

+	;;

+	*)

+		# unknown option

+	;;

+	esac

+done

+

+mkdir -p $LFS_DISK

+

+TOTAL_SIZE=` echo $ROOT_PARTITION_SIZE + $SWAP_PARTITION_SIZE | bc`

+

+echo "Creating raw disk file " $VMDK_IMAGE_NAME " of size " $TOTAL_SIZE

+# hack to create 512MB image instead of 1GB - use 512 instead of 1024

+dd if=/dev/zero of=$VMDK_IMAGE_NAME bs=1024 count=$(($TOTAL_SIZE * 1024 * 512))

+chmod 755 $VMDK_IMAGE_NAME

+

+echo "Associating loopdevice to raw disk"

+DISK_DEVICE=`losetup --show -f $VMDK_IMAGE_NAME`

+

+parted -s $DISK_DEVICE mklabel msdos mkpart primary fat32 1M 30M mkpart primary ext4 30M 100%

+#echo "Creating partition on raw disk"

+#if [ $SWAP_PARTITION_SIZE -gt 0 ] 

+#then

+#      sgdisk -n 1::+8M -n 2::+${ROOT_PARTITION_SIZE}G -n 3: -p $DISK_DEVICE >> $LOGFILE

+#else

+#      sgdisk -n 1::+8M -n 2: -p $DISK_DEVICE >> $LOGFILE

+#fi

+

+#if [ $BOOT_FIRM_WARE = "efi" ]

+#then

+#    echo "EFI boot partition"

+#    sgdisk -t1:ef00 $DISK_DEVICE >> $LOGFILE

+#else

+#    echo "BIOS boot partition"

+#    sgdisk -t1:ef02 $DISK_DEVICE >> $LOGFILE

+#fi

+echo "Mapping device partition to loop device"

+kpartx -avs $DISK_DEVICE >> $LOGFILE

+

+DEVICE_NAME=`echo $DISK_DEVICE|cut -c6- `

+

+echo "Adding file system to device partition"

+mkfs -t ext4 /dev/mapper/${DEVICE_NAME}p2

+

+echo "DISK_DEVICE=$DISK_DEVICE"

+echo "ROOT_PARTITION=/dev/mapper/${DEVICE_NAME}p2"

+

+

new file mode 100644

@@ -0,0 +1,7 @@

+[photon-dev]

+name=VMware Photon Linux 2.0(aarch64)

+baseurl=https://dl.bintray.com/vmware/photon_dev_$basearch

+gpgkey=file:///etc/pki/rpm-gpg/VMWARE-RPM-GPG-KEY

+gpgcheck=0

+enabled=1

+skip_if_unavailable=True

new file mode 100644

@@ -0,0 +1,15 @@

+[Unit]

+Description=Resizes rootfs and creates swap partition

+DefaultDependencies=no

+Conflicts=shutdown.target

+After=systemd-remount-fs.service

+Before=systemd-sysusers.service sysinit.target shutdown.target

+ConditionPathExists=!/dev/mmcblk0p3

+

+[Service]

+Type=oneshot

+RemainAfterExit=yes

+ExecStart=/usr/local/bin/resizefs.sh

+

+[Install]

+WantedBy=multi-user.target

new file mode 100755

@@ -0,0 +1,6 @@

+#! /bin/bash

+

+parted /dev/mmcblk0 resizepart 2 90%

+parted /dev/mmcblk0 mkpart primary linux-swap 90% 100%

+partprobe

+resize2fs /dev/mmcblk0p2

new file mode 100755

@@ -0,0 +1,14 @@

+#!/bin/bash

+

+echo -e "changeme\nchangeme" | passwd root

+chage -d 0 -M 999 root

+

+(cd /etc/yum.repos.d; rm `ls | grep -v photon-dev`)

+

+echo "/dev/mmcblk0p3 none swap defaults 0 0" >> /etc/fstab

+

+chmod +x /usr/local/bin/resizefs.sh

+ln -s /lib/systemd/system/resizefs.service /etc/systemd/system/multi-user.target.wants/resizefs.service

+ln -s /lib/systemd/system/sshd-keygen.service /etc/systemd/system/multi-user.target.wants/sshd-keygen.service

+ln -s /lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service

+

new file mode 100644

@@ -0,0 +1,23 @@

+{

+	"hostname": "photon-machine",

+	"password":

+		{

+			"crypted": false,

+			"text": "PASSWORD"

+		},

+	"type": "minimal",

+    "size": {"root": "1", "swap": "0"},

+    "boot":"efi",

+    "public_key":"<ssh-key-here>",

+    "postinstallscripts": ["rpi3-custom-patch.sh"],

+    "additionalfiles": [

+                            {"root/boot/grub2/arm64-efi": "/boot/grub2/arm64-efi"},

+                            {"root/boot/dtb-4.4.36-8": "/boot/dtb"},

+                            {"photon-dev.repo": "/etc/yum.repos.d/photon-dev.repo"},

+                            {"resizefs.sh": "/usr/local/bin/resizefs.sh"},

+                            {"resizefs.service": "/lib/systemd/system/resizefs.service"}

+                       ],

+    "artifacttype": "xz",

+    "keeprawdisk": "true"

+}

+

@@ -47,6 +47,7 @@ class Utils(object):

         return data

     def runshellcommand(self, cmd, ignore_errors=False):

+        print cmd

         command=cmd.split()

         p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

         output, err = p.communicate()

@@ -130,7 +130,7 @@ class ToolChainUtils(object):

                     rpmFile=pkgUtils.findRPMFileForGivenPackage(package)

             if rpmFile is None:

                 # sqlite-autoconf package was renamed, but it still published as sqlite-autoconf

-                if package == "sqlite":

+                if (package == "sqlite") and (platform.machine() == "x86_64"):

                     package = "sqlite-autoconf"

                 rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo)

                 if rpmFile is None:

@@ -192,7 +192,7 @@ class ToolChainUtils(object):

             rpmFile = pkgUtils.findRPMFileForGivenPackage(package)

             if rpmFile is None:

                 # sqlite-autoconf package was renamed, but it still published as sqlite-autoconf

-#                if package == "sqlite":

+#                if (package == "sqlite") and (platform.machine() == "x86_64"):

 #                    package = "sqlite-autoconf"

                 rpmFile = self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo)

                 if rpmFile is None:

@@ -368,6 +368,8 @@ class constants(object):

             "aufs-util.spec",

             # open-vm-tools does not support aarch64

             "open-vm-tools.spec",

+            # syslinux does not support aarch64

+            "syslinux.spec",

             # TODO: mariadb build hangs on amd64

             "mariadb.spec",

             # TODO: mysql fails on amd64 with fpic

@@ -406,7 +408,36 @@ class constants(object):

             # sysdig for aarch64 requires luajit, skip it and falco

             # https://github.com/draios/sysdig/issues/833

             "sysdig.spec",

-            "falco.spec"

+            "falco.spec",

+

+            # VIVACE packages

+            # need to update to mono-4.5

+            "mono.spec",

+            "banshee.spec",

+            "dbus-sharp.spec",

+            "dbus-sharp-glib.spec",

+            "gnome-keyring-sharp.spec",

+            "gnome-sharp.spec",

+            "gtk-sharp2.spec",

+            "mono-addins.spec",

+            "monodevelop.spec",

+            "nuget.spec",

+            "nunit.spec",

+            "pinta.spec",

+            "taglib-sharp.spec",

+            "tomboy.spec",

+            "totem.spec",

+            "webkit-sharp.spec",

+            # compilation issues with libwebkit

+            "libwebkit.spec",

+            "xf86-video-vmware.spec",

+            "xf86-video-intel.spec",

+            "xf86-input-vmmouse.spec",

+            # does not recognize aarch64

+            "thunderbird.spec",

+            #

+            "open-vm-tools-vivace.spec"

+

         ]

     }

@@ -14,10 +14,11 @@ if [ $# -lt 1 ]; then

 fi

 PUBLISHRPMSPATHDIR=$1

+INPUTFILE=xrpmfilelist-$(uname -m)

 if [ $# -eq 2 ]; then

    PUBLISHCACHE=$2

-   while read FILE; do cp -r $PUBLISHCACHE/$FILE $PUBLISHRPMSPATHDIR/$FILE; done < xrpmfilelist

+   while read FILE; do cp -r $PUBLISHCACHE/$FILE $PUBLISHRPMSPATHDIR/$FILE; done < $INPUTFILE

 else

-   cat xrpmfilelist | awk '{print "https://bintray.com/artifact/download/vmware/photon_publish_x_rpms/"$1}' | xargs -n 1 -P 10 wget --user-agent Mozilla/4.0 -c -nv -nc -r -nH --cut-dirs=4 -P ${PUBLISHRPMSPATHDIR}

+   cat $INPUTFILE | awk '{print "https://bintray.com/artifact/download/vmware/photon_publish_x_rpms/"$1}' | xargs -n 1 -P 10 wget --user-agent Mozilla/4.0 -c -nv -nc -r -nH --cut-dirs=4 -P ${PUBLISHRPMSPATHDIR}

 fi

@@ -14,10 +14,11 @@ if [ $# -lt 1 ]; then

 fi

 PUBLISHRPMSPATHDIR=$1

+INPUTFILE=rpmfilelist-$(uname -m)

 if [ $# -eq 2 ]; then

    PUBLISHCACHE=$2

-   while read FILE; do cp -r $PUBLISHCACHE/$FILE $PUBLISHRPMSPATHDIR/$FILE; done < rpmfilelist

+   while read FILE; do cp -r $PUBLISHCACHE/$FILE $PUBLISHRPMSPATHDIR/$FILE; done < $INPUTFILE

 else

-   cat rpmfilelist | awk '{print "https://bintray.com/artifact/download/vmware/photon_publish_rpms/"$1}' | xargs -n 1 -P 10 wget --user-agent Mozilla/4.0 -c -nv -nc -r -nH --cut-dirs=4 -P ${PUBLISHRPMSPATHDIR}

+   cat $INPUTFILE | awk '{print "https://bintray.com/artifact/download/vmware/photon_publish_rpms/"$1}' | xargs -n 1 -P 10 wget --user-agent Mozilla/4.0 -c -nv -nc -r -nH --cut-dirs=4 -P ${PUBLISHRPMSPATHDIR}

 fi

deleted file mode 100644

@@ -1,87 +0,0 @@

-noarch/linux-api-headers-4.2.0-1.ph1.noarch.rpm

-noarch/man-pages-3.59-1.ph1.noarch.rpm

-noarch/apache-maven-3.3.9-4.ph1.noarch.rpm

-x86_64/python2-devel-2.7.11-1.ph1.x86_64.rpm

-x86_64/nspr-4.11-1.ph1.x86_64.rpm

-x86_64/rpm-4.13.0.1-5.ph2.x86_64.rpm

-x86_64/rpm-libs-4.13.0.1-5.ph2.x86_64.rpm

-x86_64/binutils-devel-2.25.1-1.ph1.x86_64.rpm

-x86_64/nss-3.21-1.ph1.x86_64.rpm

-x86_64/mpfr-devel-3.1.3-1.ph1.x86_64.rpm

-x86_64/cpio-2.12-1.ph1.x86_64.rpm

-x86_64/sed-4.2.2-1.ph1.x86_64.rpm

-x86_64/libffi-3.2.1-1.ph1.x86_64.rpm

-x86_64/gmp-6.0.0a-1.ph1.x86_64.rpm

-x86_64/diffutils-3.3-2.ph1.x86_64.rpm

-x86_64/gcc-5.3.0-1.ph1.x86_64.rpm

-x86_64/gmp-devel-6.0.0a-1.ph1.x86_64.rpm

-x86_64/automake-1.15-1.ph1.x86_64.rpm

-x86_64/groff-1.22.2-1.ph1.x86_64.rpm

-x86_64/readline-7.0-1.ph1.x86_64.rpm

-x86_64/gettext-0.19.5.1-1.ph1.x86_64.rpm

-x86_64/perl-5.22.1-2.ph1.x86_64.rpm

-x86_64/man-db-2.7.5-1.ph1.x86_64.rpm

-x86_64/elfutils-libelf-0.165-1.ph1.x86_64.rpm

-x86_64/gdbm-1.11-1.ph1.x86_64.rpm

-x86_64/autoconf-2.69-3.ph1.x86_64.rpm

-x86_64/rpm-devel-4.13.0.1-5.ph2.x86_64.rpm

-x86_64/file-5.24-1.ph1.x86_64.rpm

-x86_64/mpfr-3.1.3-1.ph1.x86_64.rpm

-x86_64/zlib-devel-1.2.8-2.ph1.x86_64.rpm

-x86_64/libgcc-devel-5.3.0-1.ph1.x86_64.rpm

-x86_64/bison-3.0.4-1.ph1.x86_64.rpm

-x86_64/lua-5.3.2-1.ph1.x86_64.rpm

-x86_64/util-linux-2.27.1-1.ph1.x86_64.rpm

-x86_64/rpm-build-4.13.0.1-5.ph2.x86_64.rpm

-x86_64/procps-ng-3.3.11-1.ph1.x86_64.rpm

-x86_64/coreutils-8.24-1.ph1.x86_64.rpm

-x86_64/util-linux-devel-2.27.1-1.ph1.x86_64.rpm

-x86_64/m4-1.4.17-1.ph1.x86_64.rpm

-x86_64/grep-2.21-1.ph1.x86_64.rpm

-x86_64/tar-1.28-1.ph1.x86_64.rpm

-x86_64/bash-4.4-1.ph1.x86_64.rpm

-x86_64/ncurses-devel-6.0-1.ph1.x86_64.rpm

-x86_64/gawk-4.1.3-4.ph1.x86_64.rpm

-x86_64/libtool-2.4.6-1.ph1.x86_64.rpm

-x86_64/zlib-1.2.8-2.ph1.x86_64.rpm

-x86_64/python2-libs-2.7.11-1.ph1.x86_64.rpm

-x86_64/libgomp-5.3.0-1.ph1.x86_64.rpm

-x86_64/readline-devel-7.0-1.ph1.x86_64.rpm

-x86_64/sqlite-autoconf-3.11.0-1.ph1.x86_64.rpm

-x86_64/flex-2.5.39-1.ph1.x86_64.rpm

-x86_64/libstdc++-devel-5.3.0-1.ph1.x86_64.rpm

-x86_64/openssl-1.0.2g-1.ph1.x86_64.rpm

-x86_64/elfutils-0.165-1.ph1.x86_64.rpm

-x86_64/expat-2.1.0-1.ph1.x86_64.rpm

-x86_64/popt-1.16-1.ph1.x86_64.rpm

-x86_64/mpc-1.0.3-1.ph1.x86_64.rpm

-x86_64/bzip2-1.0.6-4.ph1.x86_64.rpm

-x86_64/glibc-2.22-3.ph1.x86_64.rpm

-x86_64/python2-2.7.11-1.ph1.x86_64.rpm

-x86_64/elfutils-devel-0.165-1.ph1.x86_64.rpm

-x86_64/patch-2.7.5-1.ph1.x86_64.rpm

-x86_64/xz-5.2.2-1.ph1.x86_64.rpm

-x86_64/binutils-2.25.1-1.ph1.x86_64.rpm

-x86_64/libgomp-devel-5.3.0-1.ph1.x86_64.rpm

-x86_64/bzip2-devel-1.0.6-4.ph1.x86_64.rpm

-x86_64/libgcc-5.3.0-1.ph1.x86_64.rpm

-x86_64/gzip-1.6-1.ph1.x86_64.rpm

-x86_64/elfutils-libelf-devel-0.165-1.ph1.x86_64.rpm

-x86_64/openssl-devel-1.0.2g-1.ph1.x86_64.rpm

-x86_64/pkg-config-0.28-1.ph1.x86_64.rpm

-x86_64/popt-devel-1.16-1.ph1.x86_64.rpm

-x86_64/flex-devel-2.5.39-1.ph1.x86_64.rpm

-x86_64/findutils-4.4.2-1.ph1.x86_64.rpm

-x86_64/libstdc++-5.3.0-1.ph1.x86_64.rpm

-x86_64/libpipeline-1.4.1-1.ph1.x86_64.rpm

-x86_64/make-4.1-1.ph1.x86_64.rpm

-x86_64/glibc-devel-2.22-3.ph1.x86_64.rpm

-x86_64/lua-devel-5.3.2-1.ph1.x86_64.rpm

-x86_64/ncurses-6.0-1.ph1.x86_64.rpm

-x86_64/texinfo-6.1-1.ph1.x86_64.rpm

-x86_64/nss-devel-3.21-1.ph1.x86_64.rpm

-x86_64/libcap-2.25-1.ph1.x86_64.rpm

-x86_64/go-1.4.2-5.ph1.x86_64.rpm

-x86_64/filesystem-1.0-7.ph1.x86_64.rpm

-x86_64/libdb-5.3.28-1.ph2dev.x86_64.rpm

-x86_64/libdb-devel-5.3.28-1.ph2dev.x86_64.rpm

new file mode 100644

@@ -0,0 +1,98 @@

+aarch64/bash-4.4-5.ph2.aarch64.rpm

+aarch64/binutils-2.29-3.ph2.aarch64.rpm

+aarch64/binutils-devel-2.29-3.ph2.aarch64.rpm

+aarch64/bison-3.0.4-3.ph2.aarch64.rpm

+aarch64/bzip2-1.0.6-8.ph2.aarch64.rpm

+aarch64/bzip2-devel-1.0.6-8.ph2.aarch64.rpm

+aarch64/bzip2-libs-1.0.6-8.ph2.aarch64.rpm

+aarch64/coreutils-8.27-2.ph2.aarch64.rpm

+aarch64/cpio-2.12-3.ph2.aarch64.rpm

+aarch64/diffutils-3.5-1.ph2.aarch64.rpm

+aarch64/elfutils-0.169-2.ph2.aarch64.rpm

+aarch64/elfutils-devel-0.169-2.ph2.aarch64.rpm

+aarch64/elfutils-libelf-0.169-2.ph2.aarch64.rpm

+aarch64/elfutils-libelf-devel-0.169-2.ph2.aarch64.rpm

+aarch64/expat-2.2.0-2.ph2.aarch64.rpm

+aarch64/expat-libs-2.2.0-2.ph2.aarch64.rpm

+aarch64/file-5.30-2.ph2.aarch64.rpm

+aarch64/file-devel-5.30-2.ph2.aarch64.rpm

+aarch64/filesystem-1.1-1.ph2.aarch64.rpm

+aarch64/findutils-4.6.0-3.ph2.aarch64.rpm

+aarch64/flex-2.6.4-2.ph2.aarch64.rpm

+aarch64/flex-devel-2.6.4-2.ph2.aarch64.rpm

+aarch64/gawk-4.1.4-1.ph2.aarch64.rpm

+aarch64/gcc-6.3.0-5.ph2.aarch64.rpm

+aarch64/gdbm-1.13-3.ph2.aarch64.rpm

+aarch64/gettext-0.19.8-1.ph2.aarch64.rpm

+aarch64/glibc-2.26-4.ph2.aarch64.rpm

+aarch64/glibc-devel-2.26-4.ph2.aarch64.rpm

+aarch64/glibc-iconv-2.26-4.ph2.aarch64.rpm

+aarch64/glibc-tools-2.26-4.ph2.aarch64.rpm

+aarch64/gmp-6.1.2-2.ph2.aarch64.rpm

+aarch64/gmp-devel-6.1.2-2.ph2.aarch64.rpm

+aarch64/go-1.8.1-2.ph2.aarch64.rpm

+aarch64/grep-3.0-3.ph2.aarch64.rpm

+aarch64/groff-1.22.3-2.ph2.aarch64.rpm

+aarch64/gzip-1.8-1.ph2.aarch64.rpm

+aarch64/libcap-2.25-7.ph2.aarch64.rpm

+aarch64/libdb-5.3.28-1.ph2.aarch64.rpm

+aarch64/libdb-devel-5.3.28-1.ph2.aarch64.rpm

+aarch64/libffi-3.2.1-5.ph2.aarch64.rpm

+aarch64/libgcc-6.3.0-5.ph2.aarch64.rpm

+aarch64/libgcc-devel-6.3.0-5.ph2.aarch64.rpm

+aarch64/libgomp-6.3.0-5.ph2.aarch64.rpm

+aarch64/libgomp-devel-6.3.0-5.ph2.aarch64.rpm

+aarch64/libpipeline-1.4.1-2.ph2.aarch64.rpm

+aarch64/libstdc++-6.3.0-5.ph2.aarch64.rpm

+aarch64/libstdc++-devel-6.3.0-5.ph2.aarch64.rpm

+aarch64/libtool-2.4.6-3.ph2.aarch64.rpm

+aarch64/lua-5.3.4-1.ph2.aarch64.rpm

+aarch64/lua-devel-5.3.4-1.ph2.aarch64.rpm

+aarch64/m4-1.4.18-1.ph2.aarch64.rpm

+aarch64/make-4.2.1-1.ph2.aarch64.rpm

+aarch64/man-db-2.7.6-4.ph2.aarch64.rpm

+aarch64/mpc-1.0.3-3.ph2.aarch64.rpm

+aarch64/mpfr-3.1.5-1.ph2.aarch64.rpm

+aarch64/mpfr-devel-3.1.5-1.ph2.aarch64.rpm

+aarch64/ncurses-6.0-11.ph2.aarch64.rpm

+aarch64/ncurses-devel-6.0-11.ph2.aarch64.rpm

+aarch64/ncurses-libs-6.0-11.ph2.aarch64.rpm

+aarch64/nspr-4.15-1.ph2.aarch64.rpm

+aarch64/nspr-devel-4.15-1.ph2.aarch64.rpm

+aarch64/nss-3.31-3.ph2.aarch64.rpm

+aarch64/nss-devel-3.31-3.ph2.aarch64.rpm

+aarch64/nss-libs-3.31-3.ph2.aarch64.rpm

+aarch64/openssl-1.0.2l-1.ph2.aarch64.rpm

+aarch64/openssl-devel-1.0.2l-1.ph2.aarch64.rpm

+aarch64/patch-2.7.5-4.ph2.aarch64.rpm

+aarch64/perl-5.24.1-3.ph2.aarch64.rpm

+aarch64/pkg-config-0.29.2-1.ph2.aarch64.rpm

+aarch64/popt-1.16-4.ph2.aarch64.rpm

+aarch64/popt-devel-1.16-4.ph2.aarch64.rpm

+aarch64/procps-ng-3.3.12-2.ph2.aarch64.rpm

+aarch64/python2-2.7.13-10.ph2.aarch64.rpm

+aarch64/python2-devel-2.7.13-10.ph2.aarch64.rpm

+aarch64/python2-libs-2.7.13-10.ph2.aarch64.rpm

+aarch64/readline-7.0-2.ph2.aarch64.rpm

+aarch64/readline-devel-7.0-2.ph2.aarch64.rpm

+aarch64/rpm-4.13.0.1-5.ph2.aarch64.rpm

+aarch64/rpm-build-4.13.0.1-5.ph2.aarch64.rpm

+aarch64/rpm-devel-4.13.0.1-5.ph2.aarch64.rpm

+aarch64/rpm-libs-4.13.0.1-5.ph2.aarch64.rpm

+aarch64/sed-4.4-2.ph2.aarch64.rpm

+aarch64/sqlite-3.19.3-1.ph2.aarch64.rpm

+aarch64/sqlite-libs-3.19.3-1.ph2.aarch64.rpm

+aarch64/tar-1.29-1.ph2.aarch64.rpm

+aarch64/texinfo-6.3-3.ph2.aarch64.rpm

+aarch64/util-linux-2.29.2-4.ph2.aarch64.rpm

+aarch64/util-linux-devel-2.29.2-4.ph2.aarch64.rpm

+aarch64/util-linux-libs-2.29.2-4.ph2.aarch64.rpm

+aarch64/xz-5.2.3-2.ph2.aarch64.rpm

+aarch64/xz-libs-5.2.3-2.ph2.aarch64.rpm

+aarch64/zlib-1.2.11-1.ph2.aarch64.rpm

+aarch64/zlib-devel-1.2.11-1.ph2.aarch64.rpm

+noarch/apache-maven-3.3.9-4.ph1.noarch.rpm

+noarch/autoconf-2.69-6.ph2.noarch.rpm

+noarch/automake-1.15-4.ph2.noarch.rpm

+noarch/linux-api-headers-4.9.47-1.ph2.noarch.rpm

+noarch/man-pages-4.10-1.ph2.noarch.rpm

new file mode 100644

@@ -0,0 +1,87 @@

+noarch/linux-api-headers-4.2.0-1.ph1.noarch.rpm

+noarch/man-pages-3.59-1.ph1.noarch.rpm

+noarch/apache-maven-3.3.9-4.ph1.noarch.rpm

+x86_64/python2-devel-2.7.11-1.ph1.x86_64.rpm

+x86_64/nspr-4.11-1.ph1.x86_64.rpm

+x86_64/rpm-4.13.0.1-5.ph2.x86_64.rpm

+x86_64/rpm-libs-4.13.0.1-5.ph2.x86_64.rpm

+x86_64/binutils-devel-2.25.1-1.ph1.x86_64.rpm

+x86_64/nss-3.21-1.ph1.x86_64.rpm

+x86_64/mpfr-devel-3.1.3-1.ph1.x86_64.rpm

+x86_64/cpio-2.12-1.ph1.x86_64.rpm

+x86_64/sed-4.2.2-1.ph1.x86_64.rpm

+x86_64/libffi-3.2.1-1.ph1.x86_64.rpm