@@ -79,6 +79,12 @@ else

 PACKAGE_BUILD_OPTIONS =

 endif

+ifdef CROSS_TARGET

+CROSS_TARGET_FLAGS = --cross-target $(CROSS_TARGET)

+else

+CROSS_TARGET_FLAGS =

+endif

+

 TOOLS_BIN := $(SRCROOT)/tools/bin

 CONTAIN := $(TOOLS_BIN)/contain

 ifeq ($(ARCH),x86_64)

@@ -153,6 +159,7 @@ packages: check-docker-py check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(

 		$(PACKAGE_BUILD_OPTIONS) \

 		$(PHOTON_RPMCHECK_FLAGS) \

 		$(PHOTON_KAT_BUILD_FLAGS) \

+		$(CROSS_TARGET_FLAGS) \

 		$(PUBLISH_BUILD_DEPENDENCIES) \

 		$(PACKAGE_WEIGHTS) \

 		--threads ${THREADS}

@@ -179,6 +186,7 @@ packages-docker: check-docker-py check-docker-service check-tools $(PHOTON_STAGE

 		--pkginfo-file $(PHOTON_PKGINFO_FILE) \

 		$(PACKAGE_BUILD_OPTIONS) \

 		$(PHOTON_RPMCHECK_FLAGS) \

+		$(CROSS_TARGET_FLAGS) \

 		$(PUBLISH_BUILD_DEPENDENCIES) \

 		$(PACKAGE_WEIGHTS) \

 		--threads ${THREADS}

@@ -269,6 +277,7 @@ tool-chain-stage2: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_S

 		$(PACKAGE_BUILD_OPTIONS) \

 		$(PHOTON_RPMCHECK_FLAGS) \

 		$(PHOTON_KAT_BUILD_FLAGS) \

+		$(CROSS_TARGET_FLAGS) \

 		--log-path $(PHOTON_LOGS_DIR) \

 		--threads ${THREADS}

new file mode 100644

@@ -0,0 +1,56 @@

+Name:    binutils-aarch64-linux-gnu

+Summary: Cross Binutils for Aarch64

+Version: 2.31.1

+Release: 1%{?dist}

+License: GPLv2+

+URL:     http://www.gnu.org/software/binutils

+Group:   System Environment/Base

+Vendor:  VMware, Inc.

+Distribution: Photon

+Source0: https://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.xz

+%define sha1 binutils=3b031410897fe224412f3a6a1b052402d2fbcc6a

+BuildArch: x86_64

+

+%define target_arch aarch64-unknown-linux-gnu

+%define sysroot /target-aarch64

+

+%description

+The Binutils package contains a linker, an assembler,

+and other tools for handling object files.

+

+%prep

+%setup -q -n binutils-%{version}

+

+%build

+

+sh configure \

+    --prefix=%{_prefix} \

+    --target=%{target_arch} \

+    --with-sysroot=%{sysroot} \

+    --disable-multilib && \

+make configure-host && \

+make %{?_smp_mflags}

+

+%install

+make DESTDIR=%{buildroot} install

+rm -rf %{buildroot}%{_infodir}

+rm -rf %{buildroot}%{_datadir}/locale

+

+%post   -p /sbin/ldconfig

+%postun -p /sbin/ldconfig

+

+%files

+%defattr(-,root,root)

+%{_bindir}/*

+%{_datadir}/*

+%{_prefix}/%{target_arch}/*

+

+%changelog

+* Fri Nov 02 2018 Alexey Makhalov <amakhalov@vmware.com> 2.31.1-1

+- Cloned from cross-aarch64-tools.spec

+* Thu Nov 1 2018 Sriram Nambakam <snambakam@vmware.com> 1.0.0-3

+- Updated versions of cross toolchain components

+* Mon Oct 22 2018 Sriram Nambakam <snambakam@vmware.com> 1.0.0-2

+- Replace _sysroot definition with sysroot

+* Fri Oct 19 2018 Sriram Nambakam <snambakam@vmware.com> 1.0.0

+- Initial build. First version

new file mode 100644

@@ -0,0 +1,223 @@

+%global security_hardening nofortify

+

+# It needs linux sources only to generate linux-api-headers for

+# local glibc build. glibc bits get dropped and will not be packaged

+%define linux_kernel_version 4.19.52

+%define glibc_version 2.28

+

+Name:    gcc-aarch64-linux-gnu

+Summary: Cross GCC for Aarch64

+Version: 7.3.0

+Release: 1%{?dist}

+Group:   Development/Tools

+Vendor:  VMware, Inc.

+Distribution: Photon

+License: GPLv2+

+URL:     http://gcc.gnu.org

+Source0: https://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.xz

+%define sha1 gcc=9689b9cae7b2886fdaa08449a26701f095c04e48

+Source1: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{linux_kernel_version}.tar.xz

+%define sha1 linux=0fc8eeba8a8a710c95d71f140dfdc4bdff735248

+Source2: https://ftp.gnu.org/gnu/glibc/glibc-%{glibc_version}.tar.xz

+%define sha1 glibc=ccb5dc9e51a9884df8488f86982439d47b283b2a

+Source3: https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.1.tar.gz

+%define sha1 mpfr=655e3cf416a0cc9530d9cb3c38dc8839504f0e98

+Source4: https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz

+%define sha1 gmp=9dc6981197a7d92f339192eea974f5eca48fcffe

+Source5: https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz

+%define sha1 mpc=b019d9e1d27ec5fb99497159d43a3164995de2d0

+Patch0:   libsanitizer-avoidustat.h-glibc-2.28.patch

+Patch1:   PLUGIN_TYPE_CAST.patch

+BuildArch: x86_64

+Provides: libgcc_s.so.1

+Provides: libgcc_s.so.1(GCC_3.0)

+Provides: libgcc_s.so.1(GCC_3.3)

+Provides: libgcc_s.so.1(GCC_4.2.0)

+Provides: libgcc_s.so.1(GLIBC_2.0)

+BuildRequires: binutils-aarch64-linux-gnu

+Requires: binutils-aarch64-linux-gnu

+

+%global target_arch aarch64-unknown-linux-gnu

+%global target_linux_arch arm64

+%global sysroot /target-aarch64

+

+%description

+The GCC package contains the GNU compiler collection,

+which includes the C and C++ compilers.

+

+%prep

+%setup -c -q

+%setup -T -D -q -a 1

+%setup -T -D -q -a 2

+%setup -T -D -q -a 3

+%setup -T -D -q -a 4

+%setup -T -D -q -a 5

+

+cd gcc-%{version}

+%patch0 -p1

+%patch1 -p1

+ln -sf `ls -1d ../mpfr-*/` mpfr

+ln -sf `ls -1d ../gmp-*/` gmp

+ln -sf `ls -1d ../mpc-*/` mpc

+

+# disable no-pie for gcc binaries

+sed -i '/^NO_PIE_CFLAGS = /s/@NO_PIE_CFLAGS@//' gcc/Makefile.in

+

+%build

+

+# Create usrmove symlinks

+mkdir -p %{sysroot}/usr/lib && ln -s usr/lib %{sysroot}/lib

+mkdir -p %{sysroot}/usr/bin && ln -s usr/bin %{sysroot}/bin

+mkdir -p %{sysroot}/usr/sbin && ln -s usr/sbin %{sysroot}/sbin

+

+builddir=$RPM_BUILD_DIR/%{name}-%{version}

+

+###

+### Step 1

+###

+

+echo "Step 1. Building Linux headers"

+

+cd $builddir/linux-%{linux_kernel_version} && \

+make mrproper && \

+make ARCH=%{target_linux_arch} headers_check && \

+make ARCH=%{target_linux_arch} \

+     INSTALL_HDR_PATH=%{sysroot}%{_prefix} \

+     headers_install

+

+###

+### Step 2

+###

+

+echo "Step 2. Building GCC C compiler"

+

+mkdir -p $builddir/build-gcc-%{target_arch} && \

+cd $builddir/build-gcc-%{target_arch} && \

+$builddir/gcc-%{version}/configure \

+    --prefix=%{_prefix} \

+    --target=%{target_arch} \

+    --with-sysroot=%{sysroot} \

+    --enable-plugins \

+    --enable-languages=c \

+    --enable-threads=posix \

+    --enable-linker-build-id \

+    --disable-multilib && \

+make %{?_smp_mflags} all-gcc && \

+make install-gcc

+

+###

+### Step 3

+###

+

+echo "Step 3. Building GLIBC headers and C runtime"

+

+mkdir -p $builddir/build-glibc-%{target_arch} && \

+cd $builddir/build-glibc-%{target_arch} && \

+$builddir/glibc-%{glibc_version}/configure \

+    --prefix=%{_prefix} \

+    --libexecdir=/usr/lib/glibc \

+    --build=$MACHTYPE \

+    --host=%{target_arch} \

+    --target=%{target_arch} \

+    --with-headers=%{sysroot}/usr/include \

+    --disable-multilib \

+    libc_cv_forced_unwind=yes && \

+make install-bootstrap-headers=yes install-headers install_root=%{sysroot} && \

+make %{?_smp_mflags} csu/subdir_lib && \

+mkdir -p %{sysroot}/usr/lib && \

+install csu/crt1.o csu/crti.o csu/crtn.o \

+            %{sysroot}/usr/lib && \

+%{target_arch}-gcc \

+    -nostdlib \

+    -nostartfiles \

+    -shared \

+    -x c /dev/null \

+    -o %{sysroot}/usr/lib/libc.so && \

+mkdir -p %{sysroot}/usr/include/gnu && \

+touch %{sysroot}/usr/include/gnu/stubs.h

+

+###

+### Step 4

+###

+

+echo "Stage 4. Building GCC compiler support library"

+

+cd $builddir/build-gcc-%{target_arch} && \

+$builddir/gcc-%{version}/configure \

+    --prefix=%{_prefix} \

+    --target=%{target_arch} \

+    --with-sysroot=%{sysroot} \

+    --enable-shared \

+    --enable-threads=posix \

+    --enable-__cxa_atexit \

+    --enable-clocale=gnu \

+    --enable-languages=c,c++,fortran \

+    --disable-multilib \

+    --enable-linker-build-id \

+    --enable-plugin \

+    --with-system-zlib && \

+make %{?_smp_mflags} all-target-libgcc && \

+make install-target-libgcc

+make %{?_smp_mflags} DESTDIR=%{buildroot} install-target-libgcc

+

+###

+### Step 5

+###

+

+echo "Step 5. Building full GLIBC"

+

+cd $builddir/build-glibc-%{target_arch} && \

+make %{?_smp_mflags} && \

+make install install_root=%{sysroot}

+

+###

+### Step 6

+###

+

+echo "Step 6. Building full GCC"

+

+cd $builddir/build-gcc-%{target_arch} && \

+make %{?_smp_mflags} all && \

+make %{?_smp_mflags} DESTDIR=%{buildroot} install

+

+

+%install

+

+CROSS_TOOLCHAIN_PKG_CONFIG=%{buildroot}%{_bindir}/%{target_arch}-pkg-config

+

+cat > $CROSS_TOOLCHAIN_PKG_CONFIG << EOF

+#! /bin/sh

+

+SYSROOT=%{sysroot}

+

+export PKG_CONFIG_DIR=

+export PKG_CONFIG_LIBDIR=\${SYSROOT}/usr/lib/pkgconfig:\${SYSROOT}/usr/share/pkgconfig

+export PKG_CONFIG_SYSROOT_DIR=\${SYSROOT}

+

+exec pkg-config "\$@"

+EOF

+chmod +x $CROSS_TOOLCHAIN_PKG_CONFIG

+

+%post   -p /sbin/ldconfig

+%postun -p /sbin/ldconfig

+

+%files

+%defattr(-,root,root)

+%{_bindir}/*

+%{_libdir}/*

+%exclude %{_libdir}/debug

+%{_lib64dir}/*

+%{_libexecdir}/*

+%{_datadir}/*

+%exclude %{_datadir}/info/dir

+%{_prefix}/%{target_arch}/*

+

+%changelog

+* Fri Nov 02 2018 Alexey Makhalov <amakhalov@vmware.com> 7.3.0-1

+- Cloned from cross-aarch64-tools.spec

+* Thu Nov 1 2018 Sriram Nambakam <snambakam@vmware.com> 1.0.0-3

+- Updated versions of cross toolchain components

+* Mon Oct 22 2018 Sriram Nambakam <snambakam@vmware.com> 1.0.0-2

+- Replace _sysroot definition with sysroot

+* Fri Oct 19 2018 Sriram Nambakam <snambakam@vmware.com> 1.0.0

+- Initial build. First version

@@ -53,29 +53,11 @@ class PackageBuilder(object):

             else:

                 tUtils.installToolchainRPMS(self.sandbox, self.package, self.version, availablePackages=self.doneList)

-            listDependentPackages, listTestPackages, listInstalledPackages, listInstalledRPMs = (

-                self._findDependentPackagesAndInstalledRPM(self.sandbox))

+            self._installDependencies(constants.buildArch)

+            if constants.crossCompiling:

+                self._installDependencies(constants.targetArch)

             pkgUtils = PackageUtils(self.logName, self.logPath)

-

-            if listDependentPackages:

-                self.logger.debug("Installing the build time dependent packages......")

-                for pkg in listDependentPackages:

-                    packageName, packageVersion = StringUtils.splitPackageNameAndVersion(pkg)

-                    self._installPackage(pkgUtils, packageName, packageVersion, self.sandbox, self.logPath,listInstalledPackages, listInstalledRPMs)

-                for pkg in listTestPackages:

-                    flag = False

-                    packageName, packageVersion = StringUtils.splitPackageNameAndVersion(pkg)

-                    for depPkg in listDependentPackages:

-                        depPackageName, depPackageVersion = StringUtils.splitPackageNameAndVersion(depPkg)

-                        if depPackageName == packageName:

-                            flag = True

-                            break;

-                    if flag == False:

-                        self._installPackage(pkgUtils, packageName,packageVersion, self.sandbox, self.logPath,listInstalledPackages, listInstalledRPMs)

-                pkgUtils.installRPMSInOneShot(self.sandbox)

-                self.logger.debug("Finished installing the build time dependent packages....")

-

             pkgUtils.adjustGCCSpecs(self.sandbox, self.package, self.version)

             pkgUtils.buildRPMSForGivenPackage(self.sandbox, self.package, self.version,

                                               self.logPath)

@@ -91,11 +73,37 @@ class PackageBuilder(object):

         if self.sandbox:

             self.sandbox.destroy()

+    def _installDependencies(self, arch, deps=[]):

+        listDependentPackages, listTestPackages, listInstalledPackages, listInstalledRPMs = (

+            self._findDependentPackagesAndInstalledRPM(self.sandbox, arch))

+

+        # PackageUtils should be initialized here - as per arch basis

+        # Do not move it to __init__

+        pkgUtils = PackageUtils(self.logName, self.logPath)

+

+        if listDependentPackages:

+            self.logger.debug("Installing the build time dependent packages for " + arch)

+            for pkg in listDependentPackages:

+                packageName, packageVersion = StringUtils.splitPackageNameAndVersion(pkg)

+                self._installPackage(pkgUtils, packageName, packageVersion, self.sandbox, self.logPath,listInstalledPackages, listInstalledRPMs, arch)

+            for pkg in listTestPackages:

+                flag = False

+                packageName, packageVersion = StringUtils.splitPackageNameAndVersion(pkg)

+                for depPkg in listDependentPackages:

+                    depPackageName, depPackageVersion = StringUtils.splitPackageNameAndVersion(depPkg)

+                    if depPackageName == packageName:

+                        flag = True

+                        break;

+                if flag == False:

+                    self._installPackage(pkgUtils, packageName,packageVersion, self.sandbox, self.logPath,listInstalledPackages, listInstalledRPMs, arch)

+            pkgUtils.installRPMSInOneShot(self.sandbox,arch)

+            self.logger.debug("Finished installing the build time dependent packages for " + arch)

+

     def _buildPackagePrepareFunction(self, package, version, doneList):

         self.package = package

         self.version = version

         self.logName = "build-" + package + "-" + version

-        self.logPath = constants.logPath + "/" + package + "-" + version

+        self.logPath = constants.logPath + "/" + package + "-" + version + "." + constants.currentArch

         if not os.path.isdir(self.logPath):

             cmdUtils = CommandUtils()

             cmdUtils.runCommandInShell("mkdir -p " + self.logPath)

@@ -120,9 +128,9 @@ class PackageBuilder(object):

         pkg = rpmfile[0:releaseindex]

         return pkg

-    def _findInstalledPackages(self, sandbox):

+    def _findInstalledPackages(self, sandbox, arch):

         pkgUtils = PackageUtils(self.logName, self.logPath)

-        listInstalledRPMs = pkgUtils.findInstalledRPMPackages(sandbox)

+        listInstalledRPMs = pkgUtils.findInstalledRPMPackages(sandbox, arch)

         listInstalledPackages = []

         for installedRPM in listInstalledRPMs:

             pkg = self._findPackageNameAndVersionFromRPMFile(installedRPM)

@@ -135,18 +143,24 @@ class PackageBuilder(object):

         return basePkg in doneList

-    def _findRunTimeRequiredRPMPackages(self, rpmPackage, version):

-        return SPECS.getData().getRequiresForPackage(rpmPackage, version)

+    def _findRunTimeRequiredRPMPackages(self, rpmPackage, version, arch):

+        return SPECS.getData(arch).getRequiresForPackage(rpmPackage, version)

+

+    def _findBuildTimeRequiredPackages(self, arch):

+        deps = SPECS.getData(arch).getBuildRequiresForPackage(self.package, self.version)

-    def _findBuildTimeRequiredPackages(self):

-        return SPECS.getData().getBuildRequiresForPackage(self.package, self.version)

+        # Add BuildRequiresNative list

+        if constants.crossCompiling and arch == constants.buildArch:

+            deps.extend(SPECS.getData(arch).getBuildRequiresNativeForPackage(self.package, self.version))

+

+        return deps

     def _findBuildTimeCheckRequiredPackages(self):

         return SPECS.getData().getCheckBuildRequiresForPackage(self.package, self.version)

     def _installPackage(self, pkgUtils, package, packageVersion, sandbox, destLogPath,

-                        listInstalledPackages, listInstalledRPMs):

-        rpmfile = pkgUtils.findRPMFile(package,packageVersion);

+                        listInstalledPackages, listInstalledRPMs, arch):

+        rpmfile = pkgUtils.findRPMFile(package,packageVersion,arch);

         if rpmfile is None:

             self.logger.error("No rpm file found for package: " + package + "-" + packageVersion)

             raise Exception("Missing rpm file")

@@ -158,42 +172,46 @@ class PackageBuilder(object):

         listInstalledPackages.append(pkg)

         listInstalledRPMs.append(specificRPM)

         self._installDependentRunTimePackages(pkgUtils, package, packageVersion, sandbox, destLogPath,

-                                              listInstalledPackages, listInstalledRPMs)

+                                              listInstalledPackages, listInstalledRPMs, arch)

         noDeps = False

         if (package in self.mapPackageToCycles or

                 package in self.listNodepsPackages or

                 package in constants.noDepsPackageList):

             noDeps = True

-        pkgUtils.prepRPMforInstall(package,packageVersion, noDeps, destLogPath)

+        pkgUtils.prepRPMforInstall(package,packageVersion, noDeps, destLogPath, arch)

     def _installDependentRunTimePackages(self, pkgUtils, package, packageVersion, sandbox, destLogPath,

-                                         listInstalledPackages, listInstalledRPMs):

-        listRunTimeDependentPackages = self._findRunTimeRequiredRPMPackages(package, packageVersion)

+                                         listInstalledPackages, listInstalledRPMs, arch):

+        listRunTimeDependentPackages = self._findRunTimeRequiredRPMPackages(package, packageVersion, arch)

         if listRunTimeDependentPackages:

             for pkg in listRunTimeDependentPackages:

                 if pkg in self.mapPackageToCycles:

                     continue

                 packageName, packageVersion = StringUtils.splitPackageNameAndVersion(pkg)

-                rpmfile = pkgUtils.findRPMFile(packageName, packageVersion)

+                rpmfile = pkgUtils.findRPMFile(packageName, packageVersion, arch, True)

                 if rpmfile is None:

                     self.logger.error("No rpm file found for package: " + packageName + "-" + packageVersion)

                     raise Exception("Missing rpm file")

                 latestPkgRPM = os.path.basename(rpmfile).replace(".rpm", "")

                 if pkg in listInstalledPackages and latestPkgRPM in listInstalledRPMs:

                     continue

-                self._installPackage(pkgUtils, packageName,packageVersion, sandbox, destLogPath,listInstalledPackages, listInstalledRPMs)

+                self._installPackage(pkgUtils, packageName,packageVersion, sandbox, destLogPath,listInstalledPackages, listInstalledRPMs, arch)

-    def _findDependentPackagesAndInstalledRPM(self, sandbox):

-        listInstalledPackages, listInstalledRPMs = self._findInstalledPackages(sandbox)

+    def _findDependentPackagesAndInstalledRPM(self, sandbox, arch):

+        listInstalledPackages, listInstalledRPMs = self._findInstalledPackages(sandbox, arch)

         self.logger.debug(listInstalledPackages)

-        listDependentPackages = self._findBuildTimeRequiredPackages()

+        if constants.crossCompiling and arch == constants.buildArch:

+            listDependentPackages = self._findBuildTimeRequiredPackages(constants.targetArch)

+            # TODO remove unsupported by buildArch packages from this list

+        else:

+            listDependentPackages = self._findBuildTimeRequiredPackages(arch)

         listTestPackages=[]

         if constants.rpmCheck and self.package in constants.testForceRPMS:

             # One time optimization

             if constants.listMakeCheckRPMPkgWithVersionstoInstall is None:

                 constants.listMakeCheckRPMPkgWithVersionstoInstall=[]

                 for package in constants.listMakeCheckRPMPkgtoInstall:

-                    version = SPECS.getData().getHighestVersion(package)

+                    version = SPECS.getData(arch).getHighestVersion(package)

                     constants.listMakeCheckRPMPkgWithVersionstoInstall.append(package+"-"+version)

             listDependentPackages.extend(self._findBuildTimeCheckRequiredPackages())

@@ -46,18 +46,20 @@ class PackageManager(object):

     def buildToolChainPackages(self, buildThreads):

         pkgCount = self.buildToolChain()

-        if self.pkgBuildType == "container":

-            # Stage 1 build container

-            #TODO image name constants.buildContainerImageName

-            if pkgCount > 0 or not self.dockerClient.images.list(constants.buildContainerImage):

-                self._createBuildContainer(True)

-        self.logger.info("Step 2 : Building stage 2 of the toolchain...")

-        self.logger.info(constants.listToolChainPackages)

-        self.logger.info("")

-        self._buildGivenPackages(constants.listToolChainPackages, buildThreads)

-        self.logger.info("The entire toolchain is now available")

-        self.logger.info(45 * '-')

-        self.logger.info("")

+        # Stage 2 makes sence only for native tools

+        if not constants.crossCompiling:

+            if self.pkgBuildType == "container":

+                # Stage 1 build container

+                #TODO image name constants.buildContainerImageName

+                if pkgCount > 0 or not self.dockerClient.images.list(constants.buildContainerImage):

+                    self._createBuildContainer(True)

+            self.logger.info("Step 2 : Building stage 2 of the toolchain...")

+            self.logger.info(constants.listToolChainPackages)

+            self.logger.info("")

+            self._buildGivenPackages(constants.listToolChainPackages, buildThreads)

+            self.logger.info("The entire toolchain is now available")

+            self.logger.info(45 * '-')

+            self.logger.info("")

         if self.pkgBuildType == "container":

             # Stage 2 build container

             #TODO: rebuild container only if anything in listToolChainPackages was built

@@ -1,5 +1,4 @@

 import os

-import platform

 import shutil

 import re

 import random

@@ -39,8 +38,10 @@ class PackageUtils(object):

         self.noDepsPackagesToInstallInAOneShot = ""

         self.logfnvalue = None

-    def prepRPMforInstall(self, package, version, noDeps=False, destLogPath=None):

-        rpmfile = self.findRPMFile(package, version)

+    def prepRPMforInstall(self, package, version, noDeps=False, destLogPath=None, arch=None):

+        if not arch:

+            arch=constants.currentArch

+        rpmfile = self.findRPMFile(package, version, arch)

         if rpmfile is None:

             self.logger.error("No rpm file found for package: " + package)

             raise Exception("Missing rpm file")

@@ -59,7 +60,7 @@ class PackageUtils(object):

         if "noarch" in rpmfile:

             rpmDestFile += "noarch/"

         else:

-            rpmDestFile += platform.machine()+"/"

+            rpmDestFile += arch+"/"

         rpmDestFile += rpmName

         if noDeps:

@@ -69,8 +70,11 @@ class PackageUtils(object):

             self.rpmFilesToInstallInAOneShot += " " + rpmDestFile

             self.packagesToInstallInAOneShot += " " + package

-    def installRPMSInOneShot(self, sandbox):

+    def installRPMSInOneShot(self, sandbox, arch):

         rpmInstallcmd = self.rpmBinary + " " + self.installRPMPackageOptions

+        if constants.crossCompiling and arch == constants.targetArch:

+            rpmInstallcmd += " --ignorearch --noscripts --root /target-" + constants.targetArch

+

         # TODO: Container sandbox might need  + self.forceRpmPackageOptions

         if self.noDepsRPMFilesToInstallInAOneShot != "":

             self.logger.debug("Installing nodeps rpms: " +

@@ -142,12 +146,15 @@ class PackageUtils(object):

                 CommandUtils().runCommandInShell(cmd, logfn=self.logger.debug)

         self.logger.debug("RPM build is successful")

-    def findRPMFile(self, package,version="*"):

+    def findRPMFile(self, package,version="*",arch=None, throw=False):

+        if not arch:

+            arch=constants.currentArch

+

         cmdUtils = CommandUtils()

         if version == "*":

-                version = SPECS.getData().getHighestVersion(package)

-        release = SPECS.getData().getRelease(package, version)

-        buildarch=SPECS.getData().getBuildArch(package, version)

+                version = SPECS.getData(arch).getHighestVersion(package)

+        release = SPECS.getData(arch).getRelease(package, version)

+        buildarch=SPECS.getData(arch).getBuildArch(package, version)

         filename= package + "-" + version + "-" + release + "." + buildarch+".rpm"

         fullpath = constants.rpmPath + "/" + buildarch + "/" + filename

@@ -159,18 +166,23 @@ class PackageUtils(object):

         if os.path.isfile(fullpath):

             return fullpath

+        if throw:

+            raise Exception("RPM %s not found" % (filename))

         return None

-    def findInstalledRPMPackages(self, sandbox):

+    def findInstalledRPMPackages(self, sandbox, arch):

         rpms = None

         def setOutValue(data):

             nonlocal rpms

             rpms = data

         cmd = self.rpmBinary + " " + self.queryRpmPackageOptions

+        if constants.crossCompiling and arch == constants.targetArch:

+            cmd += " --root /target-" + constants.targetArch

         sandbox.run(cmd, logfn=setOutValue)

         return rpms.split()

     def adjustGCCSpecs(self, sandbox, package, version):

+        # TODO: need to harden cross compiller also

         opt = " " + SPECS.getData().getSecurityHardeningOption(package, version)

         sandbox.put(self.adjustGCCSpecScript, "/tmp")

         cmd = "/tmp/" + self.adjustGCCSpecScript + opt

@@ -257,6 +269,12 @@ class PackageUtils(object):

         for macro in macros:

             rpmBuildcmd += ' --define \"%s\"' % macro

+

+        if constants.crossCompiling:

+            rpmBuildcmd += ' --define \"_build %s-unknown-linux-gnu\"' % constants.buildArch

+            rpmBuildcmd += ' --define \"_host %s-unknown-linux-gnu\"' % constants.targetArch

+            rpmBuildcmd += ' --target='+constants.targetArch+'-unknown-linux-gnu'

+

         rpmBuildcmd += " " + specFile

         self.logger.debug("Building rpm....")

@@ -1,5 +1,4 @@

 import os

-import platform

 import queue

 import json

 import operator

@@ -13,8 +12,8 @@ from SpecParser import SpecParser

 class SpecData(object):

-    def __init__(self, logPath, specFilesPath):

-

+    def __init__(self, arch, logPath, specFilesPath):

+        self.arch = arch

         self.logger = Logger.getLogger("SpecData", logPath, constants.logLevel)

         # map default package name to list of SpecObjects. Usually it is just

@@ -36,12 +35,12 @@ class SpecData(object):

     # creates corresponding SpecObjects and put them in internal mappings.

     def _readSpecs(self, specFilesPath):

         for specFile in self._getListSpecFiles(specFilesPath):

-            spec = SpecParser(specFile)

+            spec = SpecParser(specFile, self.arch)

             # skip the specfile if buildarch differs

             buildarch = spec.packages.get('default').buildarch

             if (buildarch != "noarch" and

-                    platform.machine() != buildarch):

+                    buildarch != self.arch):

                 self.logger.info("skipping spec file: "+str(specFile))

                 continue

@@ -136,6 +135,13 @@ class SpecData(object):

             packages.append(pkg.package)

         return packages

+    def getBuildRequiresNativeForPackage(self, package, version):

+        packages=[]

+        for pkg in self._getSpecObjField(package, version, field=lambda x : x.buildRequiresNative):

+            properVersion = self._getProperVersion(pkg)

+            packages.append(pkg.package+"-"+properVersion)

+        return packages

+

     def getBuildRequiresForPkg(self, pkg):

         package, version = StringUtils.splitPackageNameAndVersion(pkg)

         return self.getBuildRequiresForPackage(package, version)

@@ -293,19 +299,23 @@ class SpecData(object):

                 self.logger.debug(self.getPkgNamesFromObj(specObj.installRequires))

                 self.logger.debug(specObj.installRequiresPackages)

                 self.logger.debug("security_hardening: " + specObj.securityHardening)

+                self.logger.debug("BuildArch: " + str(specObj.buildarch))

                 self.logger.debug("------------------------------------------------")

 class SPECS(object):

     __instance = None

-    specData = None

+    specData = {}

     @staticmethod

-    def getData():

+    def getData(arch=None):

+        if not arch:

+            arch=constants.currentArch

+

         """ Static access method. """

         if SPECS.__instance is None:

             SPECS()

-        return SPECS.__instance.specData

+        return SPECS.__instance.specData[arch]

     def __init__(self):

         """ Virtually private constructor. """

@@ -319,7 +329,7 @@ class SPECS(object):

         # Preparse some files

         # adding kernelversion rpm macro

-        spec = SpecParser(constants.specPath + "/linux/linux.spec")

+        spec = SpecParser(constants.specPath + "/linux/linux.spec", constants.buildArch)

         defPkg = spec.packages.get('default')

         kernelversion = defPkg.version

         constants.addMacro("KERNEL_VERSION", kernelversion)

@@ -338,5 +348,11 @@ class SPECS(object):

             constants.addMacro("kernelsubrelease", kernelsubrelease)

         # Full parsing

-        self.specData = SpecData(constants.logPath, constants.specPath)

-

+        self.specData[constants.buildArch] = SpecData(constants.buildArch,

+                                                      constants.logPath,

+                                                      constants.specPath)

+

+        if constants.buildArch != constants.targetArch:

+            self.specData[constants.targetArch] = SpecData(constants.targetArch,

+                                                           constants.logPath,

+                                                           constants.specPath)

@@ -1,6 +1,5 @@

 # pylint: disable=invalid-name,missing-docstring

 import re

-import platform

 from StringUtils import StringUtils

 from SpecStructures import dependentPackageData, Package, SpecObject

 from constants import constants

@@ -15,7 +14,8 @@ class SpecParser(object):

             self.position = -1

             self.endposition = -1

-    def __init__(self, specfile):

+    def __init__(self, specfile, arch):

+        self.arch = arch

         self.cleanMacro = None

         self.prepMacro = None

         self.buildMacro = None

@@ -26,6 +26,7 @@ class SpecParser(object):

         self.specAdditionalContent = ""

         self.globalSecurityHardening = ""

         self.defs = {}

+        self.defs["_arch"] = arch

         self.conditionalCheckMacroEnabled = False

         self.macro_pattern = re.compile(r'%{(\S+?)\}')

         self.specfile = specfile

@@ -33,7 +34,7 @@ class SpecParser(object):

         self._parseSpecFile()

     def _parseSpecFile(self):

-        self.packages["default"] = Package()

+        self.packages["default"] = Package(self.arch)

         currentPkg = "default"

         with open(self.specfile) as specFile:

             lines = specFile.readlines()

@@ -42,7 +43,7 @@ class SpecParser(object):

             while i < totalLines:

                 line = lines[i].strip()

                 if self._isConditionalArch(line):

-                    if platform.machine() != self._readConditionalArch(line):

+                    if self.arch != self._readConditionalArch(line):

                         # skip conditional body

                         deep = 1

                         while i < totalLines and deep != 0:

@@ -74,7 +75,7 @@ class SpecParser(object):

                     if not returnVal:

                         return False

                     if line.startswith('%package'):

-                        pkg = Package(defaultpkg)

+                        pkg = Package(self.arch, defaultpkg)

                         pkg.name = packageName

                         currentPkg = packageName

                         self.packages[pkg.name] = pkg

@@ -94,6 +95,8 @@ class SpecParser(object):

                     self._readChecksum(line, self.packages[currentPkg])

                 elif self._isExtraBuildRequires(line):

                     self._readExtraBuildRequires(line, self.packages[currentPkg])

+                elif self._isBuildRequiresNative(line):

+                    self._readBuildRequiresNative(line, self.packages[currentPkg])

                 elif self._isDefinition(line):

                     self._readDefinition(line)

                 elif self._isConditionalCheckMacro(line):

@@ -272,6 +275,11 @@ class SpecParser(object):

             return True

         return False

+    def _isBuildRequiresNative(self, line):

+        if re.search('^%define *buildrequiresnative', line, flags=re.IGNORECASE):

+            return True

+        return False

+

     def _isChecksum(self, line):

         if re.search('^%define *sha1', line, flags=re.IGNORECASE):

             return True

@@ -439,6 +447,18 @@ class SpecParser(object):

         pkg.extrabuildrequires.extend(dpkg)

         return True

+    def _readBuildRequiresNative(self, line, pkg):

+        data = line.strip()

+        words = data.split(" ", 2)

+        if len(words) != 3:

+            print("Error: Unable to parse line: " + line)

+            return False

+        dpkg = self._readDependentPackageData(words[2])

+        if dpkg is None:

+            return False

+        pkg.buildrequiresnative.extend(dpkg)

+        return True

+

     def _readChecksum(self, line, pkg):

         strUtils = StringUtils()

         line = self._replaceMacros(line)

@@ -532,6 +552,12 @@ class SpecParser(object):

             dependentPackages.extend(pkg.extrabuildrequires)

         return dependentPackages

+    def _getBuildRequiresNative(self):

+        dependentPackages = []

+        for pkg in self.packages.values():

+            dependentPackages.extend(pkg.buildrequiresnative)

+        return dependentPackages

+

     def _getPackageNames(self):

         packageNames = []

         for pkg in self.packages.values():

@@ -589,6 +615,7 @@ class SpecParser(object):

         specObj.installRequires = self._getRequiresTypeAllPackages("install")

         specObj.checkBuildRequires = self._getCheckBuildRequiresAllPackages()

         specObj.extraBuildRequires = self._getExtraBuildRequires()

+        specObj.buildRequiresNative = self._getBuildRequiresNative()

         specObj.listPackages = self._getPackageNames()

         specObj.listSources = self._getSourceNames()

         specObj.listPatches = self._getPatchNames()

@@ -1,4 +1,3 @@

-import platform

 class dependentPackageData(object):

@@ -8,14 +7,14 @@ class dependentPackageData(object):

         self.compare = ""

 class Package(object):

-    def __init__(self, basePkg=None):

+    def __init__(self, buildarch, basePkg=None):

         self.summary = ""

         self.name = ""

         self.group = ""

         self.license = ""

         self.version = ""

         self.release = ""

-        self.buildarch = platform.machine()

+        self.buildarch = buildarch

         self.distribution = "Photon"

         self.basePkgName = ""

         self.URL = ""

@@ -27,6 +26,7 @@ class Package(object):

         self.buildprovides = []

         self.checkbuildrequires = []

         self.extrabuildrequires = []

+        self.buildrequiresnative = []

         self.requires = []

         self.provides = []

@@ -70,11 +70,12 @@ class SpecObject(object):

         # list of subpackage names that have %files section

         self.listRPMPackages = []

-        # Next four lists store dependentPackageData objects

+        # Next five lists store dependentPackageData objects

         self.buildRequires = []

         self.installRequires = []

         self.checkBuildRequires = []

         self.extraBuildRequires = []

+        self.buildRequiresNative = []

         # map subpackage name to list of install requires

         # dependentPackageData objects

         self.installRequiresPackages = {}

@@ -1,5 +1,4 @@

 import os.path

-import platform

 import traceback