From d7a40397af511baf3a53d12541ee601849f0ab26 Mon Sep 17 00:00:00 2001

From: Janne Kiiskila janne.kiiskila@pelion.com

Date: Tue, 23 Mar 2021 11:11:39 -0700

Subject: [PATCH v2] UBUNTU sudo apt git instead of git-core

Ubuntu has changed packaging and git-core is not available anymore,

it is now just plain git.

$ sudo apt-get install git-core

[sudo] password for jankii01:

Reading package lists... Done

Building dependency tree

Reading state information... Done

Note, selecting 'git' instead of 'git-core'

git is already the newest version (1:2.17.1-1ubuntu0.8).

The following package was automatically installed and is no longer required:

linux-hwe-5.4-headers-5.4.0-65

Use 'sudo apt autoremove' to remove it.

0 upgraded, 0 newly installed, 0 to remove and 13 not upgraded.

Documentation should match the current package name to avoid confusion/warnings.

Change can be verified by running the following script

set -ex

distros=("debian:8" "debian:9" "debian:10" "ubuntu:16.04" "ubuntu:18.04" "ubuntu:20.04")

for i in "${distros[@]}"

folder="${i/:/.}" # change : to .

mkdir -p $folder

cd $folder

echo FROM $i > Dockerfile

echo RUN apt-get update \&\& apt-get install -y git >> Dockerfile

echo

cat Dockerfile

docker build -t test-$folder .

cd ..

rm $folder/Dockerfile

rmdir $folder

done

Signed-off-by: Janne Kiiskila janne.kiiskila@pelion.com

---

documentation/poky.yaml | 2 +-

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

diff --git a/documentation/poky.yaml b/documentation/poky.yaml

index 3c30c4430e..2554f1e496 100644

--- a/documentation/poky.yaml

+++ b/documentation/poky.yaml

@@ -11,7 +11,7 @@ YOCTO_POKY : "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;"

YOCTO_DL_URL : https://downloads.yoctoproject.org

YOCTO_AB_URL : https://autobuilder.yoctoproject.org

YOCTO_RELEASE_DL_URL : "&YOCTO_DL_URL;/releases/yocto/yocto-&DISTRO;"

-UBUNTU_HOST_PACKAGES_ESSENTIAL : "gawk wget git-core diffstat unzip texinfo gcc-multilib \

+UBUNTU_HOST_PACKAGES_ESSENTIAL : "gawk wget git diffstat unzip texinfo gcc-multilib \

build-essential chrpath socat cpio python3 python3-pip python3-pexpect \

xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \

pylint3 xterm python3-subunit mesa-common-dev"

2.17.1