Re: [PATCH] dpkg: Beautify runbuild

["Maxim Yu. Osipov" <mosipov@ilbers.de>]

Applied to the 'next'.

Thanks,
Maxim.
On 3/25/19 2:40 PM, Jan Kiszka wrote:
> On 25.03.19 14:19, Maxim Yu. Osipov wrote:
>> On 3/24/19 4:07 PM, Jan Kiszka wrote:
>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>
>>> Properly indent so that it becomes clearer that chroot runs under a
>>> lock. Also avoid overlong lines.
>>
>> I've tried to apply the patch against the current 'next' and git am failed:
>>
>> git am ../patches/\[PATCH\]\ dpkg\:\ Beautify\ runbuild.eml
>> Applying: dpkg: Beautify runbuild
>> error: corrupt patch at line 18
>> Patch failed at 0001 dpkg: Beautify runbuild
>>
> 
> Sorry, forgot to disable line wrapping:
> 
> ---8<---
> 
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> dpkg: Beautify runbuild
> 
> Properly indent so that it becomes clearer that chroot runs under a
> lock. Also avoid overlong lines.


> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   meta/classes/dpkg.bbclass | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
> index f4e3d7a..997f2f3 100644
> --- a/meta/classes/dpkg.bbclass
> +++ b/meta/classes/dpkg.bbclass
> @@ -20,5 +20,6 @@ do_install_builddeps[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
>   dpkg_runbuild() {
>       E="${@ bb.utils.export_proxies(d)}"
>       flock -s "${REPO_ISAR_DIR}/isar.lock" \
> -    sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} /isar/build.sh ${PP}/${PPS} ${DISTRO_ARCH}
> +        sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
> +             /isar/build.sh ${PP}/${PPS} ${DISTRO_ARCH}
>   }
> --
> 2.16.4
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov