All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] UBUNTU sudo apt git instead of git-core
@ 2021-03-24 12:35 Janne Kiiskila
  2021-03-24 18:24 ` [docs] " Khem Raj
  2021-03-29 15:54 ` Michael Opdenacker
  0 siblings, 2 replies; 8+ messages in thread
From: Janne Kiiskila @ 2021-03-24 12:35 UTC (permalink / raw)
  To: docs

[-- Attachment #1: Type: text/plain, Size: 2747 bytes --]

From d7a40397af511baf3a53d12541ee601849f0ab26 Mon Sep 17 00:00:00 2001
From: Janne Kiiskila janne.kiiskila@pelion.com<mailto: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[@]}"
do
   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<mailto: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
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

[-- Attachment #2: Type: text/html, Size: 7346 bytes --]

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [docs] [PATCH v2] UBUNTU sudo apt git instead of git-core
  2021-03-24 12:35 [PATCH v2] UBUNTU sudo apt git instead of git-core Janne Kiiskila
@ 2021-03-24 18:24 ` Khem Raj
  2021-03-29 15:14   ` Michael Opdenacker
  2021-03-29 15:54 ` Michael Opdenacker
  1 sibling, 1 reply; 8+ messages in thread
From: Khem Raj @ 2021-03-24 18:24 UTC (permalink / raw)
  To: Janne Kiiskila, docs



On 3/24/21 5:35 AM, Janne Kiiskila wrote:
>  From d7a40397af511baf3a53d12541ee601849f0ab26 Mon Sep 17 00:00:00 2001
> 
> From: Janne Kiiskila janne.kiiskila@pelion.com 
> <mailto: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[@]}"
> 
> do
> 
>     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
> 


perhaps we should install git-all instead that would be same across 
debian-like and redhat-like distros across multiple releases.

> Signed-off-by: Janne Kiiskila janne.kiiskila@pelion.com 
> <mailto: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 
> <https://downloads.yoctoproject.org>
> 
> YOCTO_AB_URL : https://autobuilder.yoctoproject.org 
> <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
> 
> IMPORTANT NOTICE: The contents of this email and any attachments are 
> confidential and may also be privileged. If you are not the intended 
> recipient, please notify the sender immediately and do not disclose the 
> contents to any other person, use it for any purpose, or store or copy 
> the information in any medium. Thank you.
> 
> 
> 
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [docs] [PATCH v2] UBUNTU sudo apt git instead of git-core
  2021-03-24 18:24 ` [docs] " Khem Raj
@ 2021-03-29 15:14   ` Michael Opdenacker
  2021-03-29 15:29     ` Khem Raj
  0 siblings, 1 reply; 8+ messages in thread
From: Michael Opdenacker @ 2021-03-29 15:14 UTC (permalink / raw)
  To: Khem Raj, Janne Kiiskila, docs

Khem, Janne,

On 3/24/21 7:24 PM, Khem Raj wrote:
>
> perhaps we should install git-all instead that would be same across
> debian-like and redhat-like distros across multiple releases.


I'm OK for both changes, but isn't the second one a bit overkill?

On my Ubuntu 20.04 system, installing "git-all" results in installing
many packages:

sudo apt install git-all
Reading package lists... Done
Building dependency tree       
Reading state information... Done
The following additional packages will be installed:
  cvsps dh-elpa-helper elpa-dash elpa-ghub elpa-git-commit elpa-let-alist elpa-magit elpa-magit-popup elpa-treepy elpa-with-editor git-cvs git-daemon-run git-doc git-el git-mediawiki git-svn gitweb libclass-inspector-perl
  libclass-singleton-perl libcommon-sense-perl libdatetime-format-builder-perl libdatetime-format-iso8601-perl libdatetime-format-strptime-perl libdatetime-locale-perl libdatetime-perl libdatetime-timezone-perl
  libdbd-sqlite3-perl libdbi-perl libfile-sharedir-perl libjson-perl libjson-xs-perl libmediawiki-api-perl libsvn-perl libtypes-serialiser-perl libyaml-perl runit
Suggested packages:
  mediawiki libclone-perl libmldbm-perl libnet-daemon-perl libsql-statement-perl libyaml-shell-perl
The following NEW packages will be installed:
  cvsps dh-elpa-helper elpa-dash elpa-ghub elpa-git-commit elpa-let-alist elpa-magit elpa-magit-popup elpa-treepy elpa-with-editor git-all git-cvs git-daemon-run git-doc git-el git-mediawiki git-svn gitweb
  libclass-inspector-perl libclass-singleton-perl libcommon-sense-perl libdatetime-format-builder-perl libdatetime-format-iso8601-perl libdatetime-format-strptime-perl libdatetime-locale-perl libdatetime-perl
  libdatetime-timezone-perl libdbd-sqlite3-perl libdbi-perl libfile-sharedir-perl libjson-perl libjson-xs-perl libmediawiki-api-perl libsvn-perl libtypes-serialiser-perl libyaml-perl runit
0 upgraded, 37 newly installed, 0 to remove and 15 not upgraded.
Need to get 6,879 kB of archives.
After this operation, 55.9 MB of additional disk space will be used.

IMHO, the drawback of using "git-all" is that we look track of which git
components we release need. This would make the documentation more vague
in terms of software requirements.

Does this make sense ?

Thanks again,

Michael.

-- 

Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [docs] [PATCH v2] UBUNTU sudo apt git instead of git-core
  2021-03-29 15:14   ` Michael Opdenacker
@ 2021-03-29 15:29     ` Khem Raj
  0 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2021-03-29 15:29 UTC (permalink / raw)
  To: Michael Opdenacker, Janne Kiiskila, docs

Hi Michael

On 3/29/21 8:14 AM, Michael Opdenacker wrote:
> Khem, Janne,
> 
> On 3/24/21 7:24 PM, Khem Raj wrote:
>>
>> perhaps we should install git-all instead that would be same across
>> debian-like and redhat-like distros across multiple releases.
> 
> 
> I'm OK for both changes, but isn't the second one a bit overkill?

yes git-all option is overkill, I replied to this before as well to drop 
this idea. but I guess only replied to Janne, patch is ok as it is


> 
> On my Ubuntu 20.04 system, installing "git-all" results in installing
> many packages:
> 
> sudo apt install git-all
> Reading package lists... Done
> Building dependency tree
> Reading state information... Done
> The following additional packages will be installed:
>    cvsps dh-elpa-helper elpa-dash elpa-ghub elpa-git-commit elpa-let-alist elpa-magit elpa-magit-popup elpa-treepy elpa-with-editor git-cvs git-daemon-run git-doc git-el git-mediawiki git-svn gitweb libclass-inspector-perl
>    libclass-singleton-perl libcommon-sense-perl libdatetime-format-builder-perl libdatetime-format-iso8601-perl libdatetime-format-strptime-perl libdatetime-locale-perl libdatetime-perl libdatetime-timezone-perl
>    libdbd-sqlite3-perl libdbi-perl libfile-sharedir-perl libjson-perl libjson-xs-perl libmediawiki-api-perl libsvn-perl libtypes-serialiser-perl libyaml-perl runit
> Suggested packages:
>    mediawiki libclone-perl libmldbm-perl libnet-daemon-perl libsql-statement-perl libyaml-shell-perl
> The following NEW packages will be installed:
>    cvsps dh-elpa-helper elpa-dash elpa-ghub elpa-git-commit elpa-let-alist elpa-magit elpa-magit-popup elpa-treepy elpa-with-editor git-all git-cvs git-daemon-run git-doc git-el git-mediawiki git-svn gitweb
>    libclass-inspector-perl libclass-singleton-perl libcommon-sense-perl libdatetime-format-builder-perl libdatetime-format-iso8601-perl libdatetime-format-strptime-perl libdatetime-locale-perl libdatetime-perl
>    libdatetime-timezone-perl libdbd-sqlite3-perl libdbi-perl libfile-sharedir-perl libjson-perl libjson-xs-perl libmediawiki-api-perl libsvn-perl libtypes-serialiser-perl libyaml-perl runit
> 0 upgraded, 37 newly installed, 0 to remove and 15 not upgraded.
> Need to get 6,879 kB of archives.
> After this operation, 55.9 MB of additional disk space will be used.
> 
> IMHO, the drawback of using "git-all" is that we look track of which git
> components we release need. This would make the documentation more vague
> in terms of software requirements.
> 
> Does this make sense ?
> 
> Thanks again,
> 
> Michael.
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [docs] [PATCH v2] UBUNTU sudo apt git instead of git-core
  2021-03-24 12:35 [PATCH v2] UBUNTU sudo apt git instead of git-core Janne Kiiskila
  2021-03-24 18:24 ` [docs] " Khem Raj
@ 2021-03-29 15:54 ` Michael Opdenacker
  2021-03-29 17:16   ` Janne Kiiskila
  1 sibling, 1 reply; 8+ messages in thread
From: Michael Opdenacker @ 2021-03-29 15:54 UTC (permalink / raw)
  To: Janne Kiiskila, docs

Hi Janne,

Thanks for this improvement!

On 3/24/21 1:35 PM, Janne Kiiskila wrote:
>
>  
>
> Signed-off-by: Janne Kiiskila janne.kiiskila@pelion.com
> <mailto: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
> <https://downloads.yoctoproject.org>
>
> YOCTO_AB_URL : https://autobuilder.yoctoproject.org
> <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"
>

Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com>

Unfortunately, your patch doesn't apply, or rather your Microsoft e-mail
client or server corrupted it (I see lots of HTML in the message). Could
you send it again through "git send-email", please? I could re-implement
the patch by myself, but I'd like to keep your original commit and the
"Signed-off-by" information that it contains, to give you proper credit.

If that's too complicated for you, let me know and I'll create the patch
by myself...

Cheers,

Michael.

-- 
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] UBUNTU sudo apt git instead of git-core
  2021-03-29 15:54 ` Michael Opdenacker
@ 2021-03-29 17:16   ` Janne Kiiskila
  2021-03-29 19:20     ` [docs] " Michael Opdenacker
       [not found]     ` <1670E66CACF97B5D.12327@lists.yoctoproject.org>
  0 siblings, 2 replies; 8+ messages in thread
From: Janne Kiiskila @ 2021-03-29 17:16 UTC (permalink / raw)
  To: docs

[-- Attachment #1: Type: text/plain, Size: 2313 bytes --]

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[@]}"
do
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

[-- Attachment #2: Type: text/html, Size: 3368 bytes --]

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [docs] [PATCH v2] UBUNTU sudo apt git instead of git-core
  2021-03-29 17:16   ` Janne Kiiskila
@ 2021-03-29 19:20     ` Michael Opdenacker
       [not found]     ` <1670E66CACF97B5D.12327@lists.yoctoproject.org>
  1 sibling, 0 replies; 8+ messages in thread
From: Michael Opdenacker @ 2021-03-29 19:20 UTC (permalink / raw)
  To: Janne Kiiskila, docs

Hi Janne,

On 3/29/21 7:16 PM, Janne Kiiskila wrote:
>  
> 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"


Thanks for trying, but "git am" still doesn't accept the patch in your
e-mail after I save it:

$ git am ~/\[docs\]\ \[PATCH\ v2\]\ UBUNTU\ sudo\ apt\ git\ instead\ of\ git-core.eml 
Applying: UBUNTU sudo apt git instead of git-core
error: corrupt patch at line 10
Patch failed at 0001 UBUNTU sudo apt git instead of git-core
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

If you could send the e-mail through "git send-email", there would be no
HTML in your e-mail, and no mangled lines such as:

-UBUNTU_HOST_PACKAGES_ESSENTIAL : "gawk wget git-core diffstat unzip texinf=
o gcc-multilib \

See the "=" character at the end of line 10... there should be only one
line.

As explained on
https://docs.yoctoproject.org/dev-manual/common-tasks.html#using-email-to-submit-a-patch
, a good way to test what you're sending is save your own e-mail, and
try to apply it by yourself in a new branch, using the "git am" command.

Again, if that's too much extra work for this simple patch this time, I
can create the patch for you and give you credits through "Reported-by:".

Cheers,

Michael.

-- 
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [docs] [PATCH v2] UBUNTU sudo apt git instead of git-core
       [not found]     ` <1670E66CACF97B5D.12327@lists.yoctoproject.org>
@ 2021-03-30  7:38       ` Michael Opdenacker
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Opdenacker @ 2021-03-30  7:38 UTC (permalink / raw)
  To: Janne Kiiskila, docs

Hello,

On 3/29/21 9:20 PM, Michael Opdenacker wrote:
> Hi Janne,
>
> On 3/29/21 7:16 PM, Janne Kiiskila wrote:
>>  
>> 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"
>
> Thanks for trying, but "git am" still doesn't accept the patch in your
> e-mail after I save it:
>
> $ git am ~/\[docs\]\ \[PATCH\ v2\]\ UBUNTU\ sudo\ apt\ git\ instead\ of\ git-core.eml 
> Applying: UBUNTU sudo apt git instead of git-core
> error: corrupt patch at line 10
> Patch failed at 0001 UBUNTU sudo apt git instead of git-core
> hint: Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> If you could send the e-mail through "git send-email", there would be no
> HTML in your e-mail, and no mangled lines such as:
>
> -UBUNTU_HOST_PACKAGES_ESSENTIAL : "gawk wget git-core diffstat unzip texinf=
> o gcc-multilib \
>
> See the "=" character at the end of line 10... there should be only one
> line.
>
> As explained on
> https://docs.yoctoproject.org/dev-manual/common-tasks.html#using-email-to-submit-a-patch
> , a good way to test what you're sending is save your own e-mail, and
> try to apply it by yourself in a new branch, using the "git am" command.
>
> Again, if that's too much extra work for this simple patch this time, I
> can create the patch for you and give you credits through "Reported-by:".

Eventually, Janne sent me the patch as an attachment, which I could
apply with no problem.

Applied to master-next, thanks !
http://git.yoctoproject.org/cgit/cgit.cgi/yocto-docs/commit/?h=master-next&id=0c84a97aaac30dad5e95561dbfd77f4787b36300

Cheers,

Michael.

-- 
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-03-30  7:38 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-24 12:35 [PATCH v2] UBUNTU sudo apt git instead of git-core Janne Kiiskila
2021-03-24 18:24 ` [docs] " Khem Raj
2021-03-29 15:14   ` Michael Opdenacker
2021-03-29 15:29     ` Khem Raj
2021-03-29 15:54 ` Michael Opdenacker
2021-03-29 17:16   ` Janne Kiiskila
2021-03-29 19:20     ` [docs] " Michael Opdenacker
     [not found]     ` <1670E66CACF97B5D.12327@lists.yoctoproject.org>
2021-03-30  7:38       ` Michael Opdenacker

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.