please merge pbuilder from debian

[Gianfranco Costamagna]

debdiff attached.

note: this 0.220 is not yet in unstable (it will be in the weekend)

you can see the debdiff here
http://anonscm.debian.org/cgit/collab-maint/pbuilder.git/commit/?h=ubuntu&id=9aed3c8e62bf5755fde47be168535b0e550ff6aa

but I might cherry-pick something on master, depending on the actual 0.220 uploaded version (and tag).

This is meant for discussion :)

[Sebastien Bacher (seb128)]

Thanks, the new version is still not uploaded to Debian though...

[Mattia Rizzolo (mapreri)]

I plan to upload it today, sorry but I got hold on RL-related stuff...

[Mattia Rizzolo (mapreri)]

there you go, just got accepted. enjoy! ;)

[Gianfranco Costamagna (costamagnagianfranco)]

and here we have the patch.

You can also see it here (pbuilder.git collab-maint repo, ubuntu branch)
http://anonscm.debian.org/cgit/collab-maint/pbuilder.git/commit/?h=ubuntu&id=dc77787c67430a72c3bf1e698e2a2fb98b4c251b

or directly in my ppa:
https://launchpad.net/~costamagnagianfranco/+archive/ubuntu/locutusofborg-ppa/
note: I had to bump the version in my ppa, because I had already uploaded some snapshots.

thanks,

G.

[Martin Pitt (pitti)]

Uploaded, thanks!

[Martin Pitt (pitti)]

This doesn't land because it regresses tests on armhf and ppc64el: http://people.canonical.com/~ubuntu-archive/proposed-migration/update_excuses.html#pbuilder

+ debootstrap --include=apt --variant=buildd --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg xenial /var/cache/pbuilder/build/3494 http://archive.ubuntu.com/ubuntu
[...]
E: Couldn't download dists/xenial/main/binary-armhf/Packages

This can't work as this needs to be ports.ubuntu.com. Apparently you dropped too much delta here?

[Mattia Rizzolo (mapreri)]

On Sun, Nov 15, 2015 at 09:39:35AM -0000, Martin Pitt wrote:
> + debootstrap --include=apt --variant=buildd --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg xenial /var/cache/pbuilder/build/3494 http://archive.ubuntu.com/ubuntu
> [...]
> E: Couldn't download dists/xenial/main/binary-armhf/Packages
>
> This can't work as this needs to be ports.ubuntu.com. Apparently you
> dropped too much delta here?

The dep8 tests i added in debian only discerns between debian and
ubuntu, and uses httpredir.d.o for debian and archive.u.c for ubuntu.

The test that use to be in ubuntu had this to choose the mirror:
grep -v "[ ]*#" /etc/apt/sources.list|grep http|head -1|awk '{print $2}'

which I don't really like, tbh. my personal /etc/apt/sources.list is
empty, just to say...

do you have suggestions on what to do without hardcoding arch names?

--
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: http://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-

[Gianfranco Costamagna (costamagnagianfranco)]

@mapreri, we have some code to deal with this already in pbuilder:

pbuilder-apt-config:70
      dapper|hardy|intrepid|jaunty|karmic|lucid)
        case "$arch" in
          amd64|i386)
            echo "ubuntu"
          ;;
          armel|armhf|hppa|ia64|lpia|powerpc|sparc)
            echo "ubuntu-ports"
          ;;
          *)
            die "Unknown Ubuntu archive for arch=$arch"
          ;;
        esac

so, why don't use pbuilder-apt-config to get the correct sources.lists file?

[Mattia Rizzolo (mapreri)]

On Sun, Nov 15, 2015 at 11:37:01AM -0000, LocutusOfBorg wrote:
> @mapreri, we have some code to deal with this already in pbuilder:
>
> pbuilder-apt-config:70

that file has been added 5 years ago, but never used inside the pbuilder
code base.

> so, why don't use pbuilder-apt-config to get the correct sources.lists
> file?

1/ I personally never used it (=> not a real reason)
2/ if somebody come up with an alternative solution I'd be happier
3/ Would mean maintain yet another hardcoding of stuff, and this makes
   me sad

--
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: http://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-

[Sebastien Bacher (seb128)]

(unsubscribing sponsors, it doesn't seem there is something to still sponsor there)

[Gianfranco Costamagna (costamagnagianfranco)]

Hi @pitti, as the Debian upload of 0.221 should have fixed the issue, I rebased it and pushed on my ppa

Accepted:
OK: pbuilder_0.221ubuntu1.tar.xz
OK: pbuilder_0.221ubuntu1.dsc
    -> Component: main Section: devel

pbuilder (0.221ubuntu1) xenial; urgency=medium

  * Merge from debian unstable, remaining changes:
    - pbuilderrc, debian/pbuilder.config, debian/po/*: Set default archive
      mirror to "archive.ubuntu.com/ubuntu".
    - Remove --keyring override from default pbuilderrc
    - Set default distribution to "xenial"

--
https://launchpad.net/~costamagnagianfranco/+archive/ubuntu/locutusofborg-ppa
You are receiving this email because you made this upload.

[Martin Pitt (pitti)]

Thanks! I dropped the 0001-Merge-with-Debian-packaging-and-add-Ubuntu-delta.patch noise and uploaded.

[Gianfranco Costamagna (costamagnagianfranco)]

Thanks to you, I also uploaded an ubuntu2 to my ppa with

" * Remove XS-* prefix from debian control file,
    useless after dpkg 1.17.10
"

changelog

pretty useless I guess :)
(just trying to reduce the delta)

[Mattia Rizzolo (mapreri)]

Oh, lord...
hopefully this will be the last iteration of this.

I "updated" that ugly hardcoded list of releases/archs in pbuilder-apt-config, and not the unit tests should pass on ppc64el.
https://anonscm.debian.org/cgit/pbuilder/pbuilder.git/commit/?id=673f75d220de259691f99f7915d7d833ef8d4280

@pitti: I don't feel like uploading to debian just with this change, can you please push 0.221ubuntu2 ?
Attached there is a debdiff against ubuntu1 (btw, looks like the noisy 0001-Merge-with-Debian-packaging-and-add-Ubuntu-delta.patch ended in the final uploaded tarball...)

[Martin Pitt (pitti)]

Thank you! Uploaded.