Skip to content

Commit

Permalink
Delete Ubuntu 14.04 (trusty) related code (#7694)
Browse files Browse the repository at this point in the history
  • Loading branch information
am11 authored Aug 6, 2021
1 parent 6827710 commit 45be86f
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 262 deletions.
11 changes: 0 additions & 11 deletions eng/common/cross/arm/sources.list.trusty

This file was deleted.

71 changes: 0 additions & 71 deletions eng/common/cross/arm/trusty-lttng-2.4.patch

This file was deleted.

97 changes: 0 additions & 97 deletions eng/common/cross/arm/trusty.patch

This file was deleted.

11 changes: 0 additions & 11 deletions eng/common/cross/arm64/sources.list.trusty

This file was deleted.

16 changes: 2 additions & 14 deletions eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ usage()
{
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
echo "BuildArch can be: arm(default), armel, arm64, x86"
echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
echo " for FreeBSD can be: freebsd11, freebsd12, freebsd13"
echo " for illumos can be: illumos."
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
Expand Down Expand Up @@ -146,11 +146,6 @@ while :; do
no-lldb)
unset __LLDB_Package
;;
trusty) # Ubuntu 14.04
if [ "$__CodeName" != "jessie" ]; then
__CodeName=trusty
fi
;;
xenial) # Ubuntu 16.04
if [ "$__CodeName" != "jessie" ]; then
__CodeName=xenial
Expand Down Expand Up @@ -223,7 +218,7 @@ while :; do
__FreeBSDABI="13"
__BuildArch=x64
__SkipUnmount=1
;;
;;
illumos)
__CodeName=illumos
__BuildArch=x64
Expand Down Expand Up @@ -374,13 +369,6 @@ elif [[ -n $__CodeName ]]; then
umount $__RootfsDir/* || true
fi

if [[ "$__BuildArch" == "arm" && "$__CodeName" == "trusty" ]]; then
pushd $__RootfsDir
patch -p1 < $__CrossDir/$__BuildArch/trusty.patch
patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch
popd
fi

if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
pushd $__RootfsDir
patch -p1 < $__CrossDir/$__BuildArch/armel.jessie.patch
Expand Down
11 changes: 0 additions & 11 deletions eng/common/cross/x86/sources.list.trusty

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 45be86f

Please sign in to comment.