Remove diff glyphs from merge (#1357)

microsoft · Sep 1, 2021 · 466305c · 466305c
1 parent c109f1c
commit 466305c
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 56 deletions.
diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@@ -1,9 +1,5 @@
 filesystem-1.1-7.cm1.aarch64.rpm
-<<<<<<< HEAD
-kernel-headers-5.10.57.1-1.cm1.noarch.rpm
-=======
 kernel-headers-5.10.60.1-1.cm1.noarch.rpm
->>>>>>> 1.0-dev
 glibc-2.28-19.cm1.aarch64.rpm
 glibc-devel-2.28-19.cm1.aarch64.rpm
 glibc-i18n-2.28-19.cm1.aarch64.rpm
@@ -62,11 +58,7 @@ findutils-lang-4.6.0-7.cm1.aarch64.rpm
 gettext-0.19.8.1-4.cm1.aarch64.rpm
 gzip-1.9-5.cm1.aarch64.rpm
 make-4.2.1-5.cm1.aarch64.rpm
-<<<<<<< HEAD
-mariner-release-1.0-21.cm1.noarch.rpm
-=======
 mariner-release-1.0-22.cm1.noarch.rpm
->>>>>>> 1.0-dev
 patch-2.7.6-7.cm1.aarch64.rpm
 util-linux-2.32.1-5.cm1.aarch64.rpm
 util-linux-devel-2.32.1-5.cm1.aarch64.rpm

diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
@@ -1,9 +1,5 @@
 filesystem-1.1-7.cm1.x86_64.rpm
-<<<<<<< HEAD
-kernel-headers-5.10.57.1-1.cm1.noarch.rpm
-=======
 kernel-headers-5.10.60.1-1.cm1.noarch.rpm
->>>>>>> 1.0-dev
 glibc-2.28-19.cm1.x86_64.rpm
 glibc-devel-2.28-19.cm1.x86_64.rpm
 glibc-i18n-2.28-19.cm1.x86_64.rpm
@@ -62,11 +58,7 @@ findutils-lang-4.6.0-7.cm1.x86_64.rpm
 gettext-0.19.8.1-4.cm1.x86_64.rpm
 gzip-1.9-5.cm1.x86_64.rpm
 make-4.2.1-5.cm1.x86_64.rpm
-<<<<<<< HEAD
-mariner-release-1.0-21.cm1.noarch.rpm
-=======
 mariner-release-1.0-22.cm1.noarch.rpm
->>>>>>> 1.0-dev
 patch-2.7.6-7.cm1.x86_64.rpm
 util-linux-2.32.1-5.cm1.x86_64.rpm
 util-linux-devel-2.32.1-5.cm1.x86_64.rpm

diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@@ -158,11 +158,7 @@ json-c-debuginfo-0.14-3.cm1.aarch64.rpm
 json-c-devel-0.14-3.cm1.aarch64.rpm
 kbd-2.0.4-5.cm1.aarch64.rpm
 kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm
-<<<<<<< HEAD
-kernel-headers-5.10.57.1-1.cm1.noarch.rpm
-=======
 kernel-headers-5.10.60.1-1.cm1.noarch.rpm
->>>>>>> 1.0-dev
 kmod-25-4.cm1.aarch64.rpm
 kmod-debuginfo-25-4.cm1.aarch64.rpm
 kmod-devel-25-4.cm1.aarch64.rpm
@@ -270,11 +266,7 @@ m4-debuginfo-1.4.18-4.cm1.aarch64.rpm
 make-4.2.1-5.cm1.aarch64.rpm
 make-debuginfo-4.2.1-5.cm1.aarch64.rpm
 mariner-check-macros-1.0-4.cm1.noarch.rpm
-<<<<<<< HEAD
-mariner-release-1.0-21.cm1.noarch.rpm
-=======
 mariner-release-1.0-22.cm1.noarch.rpm
->>>>>>> 1.0-dev
 mariner-repos-1.0-14.cm1.noarch.rpm
 mariner-repos-extras-1.0-14.cm1.noarch.rpm
 mariner-repos-extras-preview-1.0-14.cm1.noarch.rpm

diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@@ -158,11 +158,7 @@ json-c-debuginfo-0.14-3.cm1.x86_64.rpm
 json-c-devel-0.14-3.cm1.x86_64.rpm
 kbd-2.0.4-5.cm1.x86_64.rpm
 kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm
-<<<<<<< HEAD
-kernel-headers-5.10.57.1-1.cm1.noarch.rpm
-=======
 kernel-headers-5.10.60.1-1.cm1.noarch.rpm
->>>>>>> 1.0-dev
 kmod-25-4.cm1.x86_64.rpm
 kmod-debuginfo-25-4.cm1.x86_64.rpm
 kmod-devel-25-4.cm1.x86_64.rpm
@@ -270,11 +266,7 @@ m4-debuginfo-1.4.18-4.cm1.x86_64.rpm
 make-4.2.1-5.cm1.x86_64.rpm
 make-debuginfo-4.2.1-5.cm1.x86_64.rpm
 mariner-check-macros-1.0-4.cm1.noarch.rpm
-<<<<<<< HEAD
-mariner-release-1.0-21.cm1.noarch.rpm
-=======
 mariner-release-1.0-22.cm1.noarch.rpm
->>>>>>> 1.0-dev
 mariner-repos-1.0-14.cm1.noarch.rpm
 mariner-repos-extras-1.0-14.cm1.noarch.rpm
 mariner-repos-extras-preview-1.0-14.cm1.noarch.rpm

diff --git a/toolkit/scripts/toolchain/container/Dockerfile b/toolkit/scripts/toolchain/container/Dockerfile
@@ -68,11 +68,7 @@ COPY [ "./toolchain-sha256sums", \
 WORKDIR $LFS/sources
 RUN wget -nv --no-clobber --timeout=30 --no-check-certificate --continue --input-file=$LFS/tools/toolchain-local-wget-list --directory-prefix=$LFS/sources; exit 0
 RUN wget -nv --no-clobber --timeout=30 --continue --input-file=$LFS/tools/toolchain-remote-wget-list --directory-prefix=$LFS/sources; exit 0
-<<<<<<< HEAD
-RUN wget -nv --no-clobber --timeout=30 --continue https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.57.1.tar.gz -O kernel-5.10.57.1.tar.gz --directory-prefix=$LFS/sources; exit 0
-=======
 RUN wget -nv --no-clobber --timeout=30 --continue https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.60.1.tar.gz -O kernel-5.10.60.1.tar.gz --directory-prefix=$LFS/sources; exit 0
->>>>>>> 1.0-dev
 USER root
 RUN /tools/toolchain-jdk8-wget.sh; exit 0
 RUN sha256sum -c $LFS/tools/toolchain-sha256sums && \

diff --git a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh
@@ -57,24 +57,14 @@ set -e
 #
 cd /sources
 
-<<<<<<< HEAD
-echo Linux-5.10.57.1 API Headers
-tar xf kernel-5.10.57.1.tar.gz
-pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.57.1
-=======
 echo Linux-5.10.60.1 API Headers
 tar xf kernel-5.10.60.1.tar.gz
 pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.60.1
->>>>>>> 1.0-dev
 make mrproper
 make headers
 cp -rv usr/include/* /usr/include
 popd
-<<<<<<< HEAD
-rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.57.1
-=======
 rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.60.1
->>>>>>> 1.0-dev
 touch /logs/status_kernel_headers_complete
 
 echo 6.8. Man-pages-5.02

diff --git a/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh b/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh
@@ -113,24 +113,14 @@ rm -rf gcc-9.1.0
 
 touch $LFS/logs/temptoolchain/status_gcc_pass1_complete
 
-<<<<<<< HEAD
-echo Linux-5.10.57.1 API Headers
-tar xf kernel-5.10.57.1.tar.gz
-pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.57.1
-=======
 echo Linux-5.10.60.1 API Headers
 tar xf kernel-5.10.60.1.tar.gz
 pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.60.1
->>>>>>> 1.0-dev
 make mrproper
 make headers
 cp -rv usr/include/* /tools/include
 popd
-<<<<<<< HEAD
-rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.57.1
-=======
 rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.60.1
->>>>>>> 1.0-dev
 
 touch $LFS/logs/temptoolchain/status_kernel_headers_complete