@@ -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

@@ -21,19 +21,19 @@ diff -rup cloud-init-18.3/cloudinit/sources/helpers/azure.py cloud-init-18.3-new

  from cloudinit.net import dhcp

  from cloudinit import stages

-@@ -18,9 +18,10 @@

+@@ -16,9 +17,10 @@ from xml.etree import ElementTree

+ 

  from cloudinit import url_helper

  from cloudinit import util

- from cloudinit.reporting import events

 +from io import StringIO

  LOG = logging.getLogger(__name__)

 -

 +NETWORKD_LEASES_DIR = '/run/systemd/netif/leases'

- azure_ds_reporter = events.ReportEventStack(

-     name="azure-ds",

-@@ -332,6 +333,32 @@

+ @contextmanager

+ def cd(newdir):

+@@ -281,6 +283,32 @@ class WALinuxAgentShim(object):

          return dhcp_options

      @staticmethod

@@ -63,9 +63,9 @@ diff -rup cloud-init-18.3/cloudinit/sources/helpers/azure.py cloud-init-18.3-new

 +        return ret

 +

 +    @staticmethod

-     @azure_ds_telemetry_reporter

      def _get_value_from_dhcpoptions(dhcp_options):

          if dhcp_options is None:

+             return None

 @@ -306,8 +334,9 @@ class WALinuxAgentShim(object):

              # Option-245 stored in /run/cloud-init/dhclient.hooks/<ifc>.json

              # a dhclient exit hook that calls cloud-init-dhclient-hook

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

 %define python3_sitelib /usr/lib/python3.7/site-packages

 Name:           cloud-init

-Version:        19.1

-Release:        2%{?dist}

+Version:        18.3

+Release:        5%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -10,7 +10,7 @@ URL:            http://launchpad.net/cloud-init

 Vendor:         VMware, Inc

 Distribution:   Photon

 Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz

-%define sha1 cloud-init=6de398dd755959dde47c8d6f6e255a0857017c44

+%define sha1 cloud-init=a317e2add93578d244328dcf97d46fad1c3140f9

 Source1:        cloud-photon.cfg

 Source2:        99-disable-networking-config.cfg

 Source3:        dscheck_VMwareGuestInfo

@@ -25,7 +25,6 @@ Patch8:         systemd-resolved-config.patch

 Patch9:         cloud-init-azureds.patch

 Patch10:        ds-identity.patch

 Patch11:        ds-guestinfo-photon.patch

-

 BuildRequires:  python3

 BuildRequires:  python3-libs

 BuildRequires:  systemd

@@ -141,6 +140,7 @@ rm -rf $RPM_BUILD_ROOT

 %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/99-disable-networking-config.cfg

 %{_sysconfdir}/NetworkManager/dispatcher.d/hook-network-manager

 %{_sysconfdir}/dhcp/dhclient-exit-hooks.d/hook-dhclient

+%{_sysconfdir}/bash_completion.d/cloud-init

 /lib/systemd/system-generators/cloud-init-generator

 /lib/udev/rules.d/66-azure-ephemeral.rules

 /lib/systemd/system/*

@@ -148,12 +148,12 @@ rm -rf $RPM_BUILD_ROOT

 %{_libdir}/cloud-init/*

 %{python3_sitelib}/*

 %{_bindir}/cloud-init*

-%{_bindir}/cloud-id

 %{_bindir}/dscheck_VMwareGuestInfo

-%{_datadir}/bash-completion/completions/cloud-init

 %dir /var/lib/cloud

 %changelog

+*   Mon Aug 12 2019 Tapas Kundu <keerthanak@vmware.com> 18.3-5

+-   Downgrade to 18.3 to fix azure dhcp lease issue.

 *   Tue Jul 23 2019 Keerthana K <keerthanak@vmware.com> 19.1-2

 -   support for additional features in VMGuestInfo Datasource.

 *   Tue Jun 25 2019 Keerthana K <keerthanak@vmware.com> 19.1-1

new file mode 100644

@@ -0,0 +1,58 @@

+Summary:       Device Tree Compiler

+Name:          dtc

+Version:       1.5.0

+Release:       1%{?dist}

+License:       GPLv2+

+URL:           https://devicetree.org/

+Group:         Development/Tools

+Vendor:        VMware, Inc.

+Distribution:  Photon

+Source0:       https://www.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.gz

+%define sha1 dtc=3b557ea9e2db096d7939489d76c9add3d73adbb2

+BuildRequires: gcc make

+BuildRequires: flex bison swig

+

+%description

+Devicetree is a data structure for describing hardware. Rather than hard coding

+every detail of a device into an operating system, many aspects of the hardware

+can be described in a data structure that is passed to the operating system at

+boot time. The devicetree is used by OpenFirmware, OpenPOWER Abstraction Layer

+(OPAL), Power Architecture Platform Requirements (PAPR) and in the standalone

+Flattened Device Tree (FDT) form.

+

+%package devel

+Summary: Development headers for device tree library

+Requires: %{name} = %{version}-%{release}

+

+%description devel

+This package provides development files for libfdt

+

+%prep

+%setup -q

+sed -i 's/python2/python3/' pylibfdt/setup.py

+

+%build

+make %{?_smp_mflags} V=1 CC="gcc $RPM_OPT_FLAGS $RPM_LD_FLAGS"

+

+%install

+make install DESTDIR=%{buildroot} PREFIX=%{buildroot}/usr \

+                            LIBDIR=%{_libdir} BINDIR=%{_bindir} INCLUDEDIR=%{_includedir} V=1

+

+%clean

+rm -rf %{buildroot}/*

+

+%files

+%license GPL

+%doc Documentation/manual.txt

+%{_bindir}/*

+%{_libdir}/libfdt-%{version}.so

+%{_libdir}/libfdt.so.*

+

+%files devel

+%{_libdir}/libfdt.so

+%{_libdir}/libfdt.a

+%{_includedir}/*

+

+%changelog

+* Wed Jul 24 2019 Ajay Kaher <akaher@vmware.com> 1.5.0-1

+- 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

new file mode 100644

@@ -0,0 +1,118 @@

+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

+From: Peter Jones <pjones@redhat.com>

+Date: Thu, 12 Jul 2018 11:00:45 -0400

+Subject: [PATCH] Rework how the fdt command builds.

+

+Trying to avoid all variants of:

+cat syminfo.lst | sort | gawk -f ../../grub-core/genmoddep.awk > moddep.lst || (rm -f moddep.lst; exit 1)

+grub_fdt_install in linux is not defined

+grub_fdt_load in linux is not defined

+grub_fdt_unload in linux is not defined

+grub_fdt_install in xen_boot is not defined

+grub_fdt_load in xen_boot is not defined

+grub_fdt_unload in xen_boot is not defined

+

+Signed-off-by: Peter Jones <pjones@redhat.com>

+---

+ grub-core/Makefile.core.def | 5 ++---

+ grub-core/lib/fdt.c         | 2 --

+ grub-core/loader/efi/fdt.c  | 2 ++

+ include/grub/fdt.h          | 4 ++++

+ grub-core/Makefile.am       | 1 +

+ 5 files changed, 9 insertions(+), 5 deletions(-)

+

+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

+index 715d3a3ec02..203584fb00b 100644

+--- a/grub-core/Makefile.core.def

+@@ -166,7 +166,6 @@ kernel = {

+   arm_coreboot = kern/arm/coreboot/init.c;

+   arm_coreboot = kern/arm/coreboot/timer.c;

+   arm_coreboot = kern/arm/coreboot/coreboot.S;

+-  arm_coreboot = lib/fdt.c;

+   arm_coreboot = bus/fdt.c;

+   arm_coreboot = term/ps2.c;

+   arm_coreboot = term/arm/pl050.c;

+@@ -317,6 +316,8 @@ kernel = {

+   arm64 = kern/arm64/dl.c;

+   arm64 = kern/arm64/dl_helper.c;

+ 

++  fdt = lib/fdt.c;

++

+   emu = disk/host.c;

+   emu = kern/emu/cache_s.S;

+   emu = kern/emu/hostdisk.c;

+@@ -1714,7 +1715,6 @@ module = {

+   arm_uboot = loader/arm/linux.c;

+   arm64 = loader/arm64/linux.c;

+   emu = loader/emu/linux.c;

+-  fdt = lib/fdt.c;

+ 

+   common = loader/linux.c;

+   common = lib/cmdline.c;

+@@ -1725,7 +1725,6 @@ module = {

+ module = {

+   name = fdt;

+   efi = loader/efi/fdt.c;

+-  common = lib/fdt.c;

+   enable = fdt;

+ };

+ 

+diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c

+index 0d371c5633e..37e04bd69e7 100644

+--- a/grub-core/lib/fdt.c

+@@ -21,8 +21,6 @@

+ #include <grub/mm.h>

+ #include <grub/dl.h>

+ 

+-GRUB_MOD_LICENSE ("GPLv3+");

+-

+ #define FDT_SUPPORTED_VERSION	17

+ 

+ #define FDT_BEGIN_NODE	0x00000001

+diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c

+index a4c6e803645..a9dbcfdfeaf 100644

+--- a/grub-core/loader/efi/fdt.c

+@@ -26,6 +26,8 @@

+ #include <grub/efi/fdtload.h>

+ #include <grub/efi/memory.h>

+ 

++GRUB_MOD_LICENSE ("GPLv3+");

++

+ static void *loaded_fdt;

+ static void *fdt;

+ 

+diff --git a/include/grub/fdt.h b/include/grub/fdt.h

+index 158b1bc4b3a..6ee57e11ab3 100644

+--- a/include/grub/fdt.h

+@@ -19,6 +19,8 @@

+ #ifndef GRUB_FDT_HEADER

+ #define GRUB_FDT_HEADER	1

+ 

++#if defined(__arm__) || defined(__aarch64__)

++

+ #include <grub/types.h>

+ #include <grub/symbol.h>

+ 

+@@ -141,4 +143,6 @@ int EXPORT_FUNC(grub_fdt_set_prop) (void *fdt, unsigned int nodeoffset, const ch

+   grub_fdt_set_prop ((fdt), (nodeoffset), "reg", reg_64, 16);  \

+ })

+ 

++#endif /* defined(__arm__) || defined(__aarch64__) */

++

+ #endif	/* ! GRUB_FDT_HEADER */

+diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

+index 3781bb9cbb9..4062652506d 100644

+--- a/grub-core/Makefile.am

+@@ -76,6 +76,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h

+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h

+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h

+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h

++KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdt.h

+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/file.h

+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h

+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h

@@ -3,7 +3,7 @@

 Summary:    GRand Unified Bootloader

 Name:       grub2

 Version:    2.02

-Release:    12%{?dist}

+Release:    13%{?dist}

 License:    GPLv3+

 URL:        http://www.gnu.org/software/grub

 Group:      Applications/System

@@ -30,6 +30,7 @@ Patch15:    0139-Make-TPM-errors-less-fatal.patch

 Patch16:    0156-TPM-Fix-hash_log_extend_event-function-prototype.patch

 Patch17:    0157-TPM-Fix-compiler-warnings.patch

 Patch18:    0216-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch

+Patch19:    0224-Rework-how-the-fdt-command-builds.patch

 %ifarch aarch64

 Patch100:   0001-efinet-do-not-start-EFI-networking-at-module-init-ti.patch

 %endif

@@ -85,6 +86,7 @@ Additional library files for grub

 %patch16 -p1

 %patch17 -p1

 %patch18 -p1

+%patch19 -p1

 %ifarch aarch64

 %patch100 -p1

 %endif

@@ -187,6 +189,8 @@ rm -rf %{buildroot}%{_infodir}

 %{_datarootdir}/locale/*

 %changelog

+*   Wed Aug 14 2019 Alexey Makhalov <amakhalov@vmware.com> 2.02-13

+-   Add one more patch from fc30 to fix arm64 build.

 *   Thu Feb 21 2019 Alexey Makhalov <amakhalov@vmware.com> 2.02-12

 -   Update grub version from ~rc3 to release.

 -   Enhance SB + TPM support (19 patches from grub2-2.02-70.fc30)

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

 Summary:	Linux API header files

 Name:		linux-api-headers

-Version:	4.19.52

+Version:	4.19.65

 Release:	1%{?dist}

 License:	GPLv2

 URL:		http://www.kernel.org/

@@ -8,7 +8,7 @@ Group:		System Environment/Kernel

 Vendor:		VMware, Inc.

 Distribution: Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=0fc8eeba8a8a710c95d71f140dfdc4bdff735248

+%define sha1 linux=598111781858ea0aaa328cfa0fec39264d2815d7

 BuildArch:	noarch

 %description

 The Linux API Headers expose the kernel's API for use by Glibc.

@@ -25,6 +25,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de

 %defattr(-,root,root)

 %{_includedir}/*

 %changelog

+*   Tue Aug 06 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.65-1

+-   Update to version 4.19.65

 *   Mon Jun 17 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-1

 -   Update to version 4.19.52

 *   Tue May 07 2019 Ajay Kaher <akaher@vmware.com> 4.19.40-1

new file mode 100644

@@ -0,0 +1,36 @@

+From a666b331d08a524f6caaf41f57342311e91c5610 Mon Sep 17 00:00:00 2001

+From: Daniel Mueller <danielmuller@vmware.com>

+Date: Thu, 25 Jul 2019 10:15:06 -0700

+Subject: [PATCH] Remove OOM_SCORE_ADJ_MAX limit check

+

+This patch removes the OOM_SCORE_ADJ_MAX limit check. By removing this

+check we are able to adjust the OOM score beyond OOM_SCORE_ADJ_MAX

+(1000), which provides us with more confidence that the OOM killer will

+actually choose the target process to be killed before interfering with

+others. That is useful in certain Photon VM based setups where we want

+to have a "canary" process that, upon being killed by the OOM, would

+inform an agent in the VM that we are under memory pressure, and trigger

+a clean shut down of the VM.

+With the check in place, the kernel would still favor processes that had

+a high score (1000 and above) based on actual memory consumption,

+rendering our approach useless.

+---

+ fs/proc/base.c | 2 +-

+ 1 file changed, 1 insertion(+), 1 deletion(-)

+

+diff --git a/fs/proc/base.c b/fs/proc/base.c

+index f999e8..089ec0 100644

+--- a/fs/proc/base.c

+@@ -1188,7 +1188,7 @@ static ssize_t oom_score_adj_write(struct file *file, const char __user *buf,

+ 	if (err)

+ 		goto out;

+ 	if (oom_score_adj < OOM_SCORE_ADJ_MIN ||

+-			oom_score_adj > OOM_SCORE_ADJ_MAX) {

++			oom_score_adj > SHRT_MAX) {

+ 		err = -EINVAL;

+ 		goto out;

+ 	}

+-- 

+2.21.0

+

deleted file mode 100644

@@ -1,41 +0,0 @@

-From 9579fa77a71581a70d14a544cc58d0b00f700f05 Mon Sep 17 00:00:00 2001

-From: Gen Zhang <blackgod016574@gmail.com>

-Date: Fri, 24 May 2019 10:32:22 +0800

-Subject: [PATCH] drm/edid: Fix a missing-check bug in drm_load_edid_firmware()

-

-[ This patch is not yet upstream; however, it has been accepted into

-  the drm maintainer's queue. ]

-

-In drm_load_edid_firmware(), fwstr is allocated by kstrdup(). And fwstr

-is dereferenced in the following codes. However, memory allocation

-functions such as kstrdup() may fail and returns NULL. Dereferencing

-this null pointer may cause the kernel go wrong. Thus we should check

-this kstrdup() operation.

-Further, if kstrdup() returns NULL, we should return ERR_PTR(-ENOMEM) to

-the caller site.

-

-Signed-off-by: Gen Zhang <blackgod016574@gmail.com>

-Reviewed-by: Jani Nikula <jani.nikula@intel.com>

-Signed-off-by: Jani Nikula <jani.nikula@intel.com>

-Link: https://patchwork.freedesktop.org/patch/msgid/20190524023222.GA5302@zhanggen-UX430UQ

-Signed-off-by: Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>

- drivers/gpu/drm/drm_edid_load.c | 2 ++

- 1 file changed, 2 insertions(+)

-

-diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c

-index a491509..a0e107a 100644

-+++ b/drivers/gpu/drm/drm_edid_load.c

-@@ -290,6 +290,8 @@ struct edid *drm_load_edid_firmware(struct drm_connector *connector)

- 	 * the last one found one as a fallback.

- 	 */

- 	fwstr = kstrdup(edid_firmware, GFP_KERNEL);

-+	if (!fwstr)

-+		return ERR_PTR(-ENOMEM);

- 	edidstr = fwstr;

- 

- 	while ((edidname = strsep(&edidstr, ","))) {

-2.7.4

-

@@ -84,6 +84,7 @@ Subject: [PATCH 3/3] Added rap_plugin

  drivers/scsi/csiostor/csio_lnode.c            |  32 +-

  drivers/scsi/csiostor/csio_rnode.c            |  28 +-

  drivers/scsi/csiostor/csio_scsi.c             |  37 +-

+ fs/9p/vfs_addr.c                              |   3 +-

  fs/afs/file.c                                 |   8 +-

  fs/afs/internal.h                             |   2 +-

  fs/exofs/inode.c                              |   7 +-

@@ -119,7 +120,7 @@ Subject: [PATCH 3/3] Added rap_plugin

  scripts/gcc-plugins/rap_plugin/rap_plugin.c   | 534 +++++++++++++++++

  scripts/gcc-plugins/rap_plugin/sip.c          |  96 +++

  security/Kconfig                              |  18 +

- 115 files changed, 2511 insertions(+), 753 deletions(-)

+ 116 files changed, 2512 insertions(+), 755 deletions(-)

  create mode 100644 scripts/gcc-plugins/rap_plugin/Makefile

  create mode 100644 scripts/gcc-plugins/rap_plugin/rap.h

  create mode 100644 scripts/gcc-plugins/rap_plugin/rap_fptr_pass.c

@@ -3686,6 +3687,20 @@ index dab0d3f9bee1..770ffbf86037 100644

  	switch (evt) {

  	case CSIO_SCSIE_ABORT:

  	case CSIO_SCSIE_CLOSE:

+diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c

+index 197069303510..793772d114db 100644

+--- a/fs/9p/vfs_addr.c

+@@ -123,8 +123,7 @@ static int v9fs_vfs_readpages(struct file *filp, struct address_space *mapping,

+ 	if (ret == 0)

+ 		return ret;

+ 

+-	ret = read_cache_pages(mapping, pages, v9fs_fid_readpage,

+-			filp->private_data);

++	ret = read_cache_pages(mapping, pages, v9fs_vfs_readpage, filp);

+ 	p9_debug(P9_DEBUG_VFS, "  = %d\n", ret);

+ 	return ret;

+ }

 diff --git a/fs/afs/file.c b/fs/afs/file.c

 index 7d4f26198573..405f3c1034aa 100644

 --- a/fs/afs/file.c

@@ -2427,7 +2427,7 @@ CONFIG_SWPHY=y

 #

 CONFIG_AMD_PHY=m

 # CONFIG_AQUANTIA_PHY is not set

-# CONFIG_ASIX_PHY is not set

+# CONFIG_AX88796B_PHY is not set

 CONFIG_AT803X_PHY=m

 CONFIG_BCM7XXX_PHY=m

 CONFIG_BCM87XX_PHY=m

@@ -2830,7 +2830,6 @@ CONFIG_HW_RANDOM_RDRAND=m

 CONFIG_HW_RANDOM_VIA=m

 CONFIG_HW_RANDOM_VIRTIO=m

 CONFIG_NVRAM=m

-# CONFIG_R3964 is not set

 # CONFIG_APPLICOM is not set

 # CONFIG_MWAVE is not set

 CONFIG_RAW_DRIVER=m

@@ -3460,6 +3459,7 @@ CONFIG_DRM_RADEON=m

 # AMD Library routines

 #

 CONFIG_DRM_NOUVEAU=m

+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y

 CONFIG_NOUVEAU_DEBUG=5

 CONFIG_NOUVEAU_DEBUG_DEFAULT=3

 # CONFIG_NOUVEAU_DEBUG_MMU is not set

@@ -2222,7 +2222,7 @@ CONFIG_PHYLIB=m

 #

 # CONFIG_AMD_PHY is not set

 # CONFIG_AQUANTIA_PHY is not set

-# CONFIG_ASIX_PHY is not set

+# CONFIG_AX88796B_PHY is not set

 # CONFIG_AT803X_PHY is not set

 # CONFIG_BCM7XXX_PHY is not set

 # CONFIG_BCM87XX_PHY is not set

@@ -2468,7 +2468,6 @@ CONFIG_HW_RANDOM_RDRAND=m

 CONFIG_HW_RANDOM_VIA=m

 CONFIG_HW_RANDOM_VIRTIO=m

 CONFIG_NVRAM=m

-# CONFIG_R3964 is not set

 # CONFIG_APPLICOM is not set

 # CONFIG_MWAVE is not set

 CONFIG_RAW_DRIVER=m

@@ -2910,6 +2909,7 @@ CONFIG_DRM_RADEON=m

 # AMD Library routines

 #

 CONFIG_DRM_NOUVEAU=m

+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y

 CONFIG_NOUVEAU_DEBUG=5

 CONFIG_NOUVEAU_DEBUG_DEFAULT=3

 # CONFIG_NOUVEAU_DEBUG_MMU is not set

@@ -2068,7 +2068,6 @@ CONFIG_HW_RANDOM=m

 CONFIG_HW_RANDOM_RDRAND=m

 # CONFIG_HW_RANDOM_VIA is not set

 # CONFIG_NVRAM is not set

-# CONFIG_R3964 is not set

 # CONFIG_APPLICOM is not set

 # CONFIG_MWAVE is not set

 # CONFIG_RAW_DRIVER is not set

@@ -2342,7 +2342,7 @@ CONFIG_SWPHY=y

 #

 CONFIG_AMD_PHY=m

 # CONFIG_AQUANTIA_PHY is not set

-# CONFIG_ASIX_PHY is not set

+# CONFIG_AX88796B_PHY is not set

 CONFIG_AT803X_PHY=m

 CONFIG_BCM7XXX_PHY=m

 CONFIG_BCM87XX_PHY=m

@@ -2593,7 +2593,6 @@ CONFIG_HW_RANDOM_RDRAND=m

 CONFIG_HW_RANDOM_VIA=m

 CONFIG_HW_RANDOM_VIRTIO=m

 CONFIG_NVRAM=m

-# CONFIG_R3964 is not set

 # CONFIG_APPLICOM is not set

 # CONFIG_MWAVE is not set

 CONFIG_RAW_DRIVER=m

@@ -3114,6 +3113,7 @@ CONFIG_DRM_RADEON=m

 # AMD Library routines

 #

 CONFIG_DRM_NOUVEAU=m

+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y

 CONFIG_NOUVEAU_DEBUG=5

 CONFIG_NOUVEAU_DEBUG_DEFAULT=3

 # CONFIG_NOUVEAU_DEBUG_MMU is not set

@@ -2353,7 +2353,7 @@ CONFIG_SWPHY=y

 #

 CONFIG_AMD_PHY=m

 # CONFIG_AQUANTIA_PHY is not set

-# CONFIG_ASIX_PHY is not set

+# CONFIG_AX88796B_PHY is not set

 CONFIG_AT803X_PHY=m

 CONFIG_BCM7XXX_PHY=m

 CONFIG_BCM87XX_PHY=m

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

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-aws

-Version:        4.19.52

-Release:        3%{?kat_build:.%kat_build}%{?dist}