| Message ID | 20190522064732.18420-1-juergh@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,Precise/linux-lts-trusty] UBUNTU: [Packaging] Switch getabis to the new format | expand |
Please ignore. Wrong mailing list :-/ ...Juerg > Buglink: https://bugs.launchpad.net/bugs/1829882 (Switch getabis to the new format (LP: #1829882)) > > All private/custom kernels are using the new getabis file format, except > Precise. Fix that. > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- > debian.trusty/etc/getabis | 32 ++++++++++++-------------------- > 1 file changed, 12 insertions(+), 20 deletions(-) > > diff --git a/debian.trusty/etc/getabis b/debian.trusty/etc/getabis > index a93ce6d63f03..6193e06b6f9b 100644 > --- a/debian.trusty/etc/getabis > +++ b/debian.trusty/etc/getabis > @@ -1,31 +1,23 @@ > -# ESM: we have to get packages from a private password protected > -# archive. Permissions cannot be commited and are per user. > -[ -f "$HOME/.getabis.precise" ] && . "$HOME/.getabis.precise" > -if [ "$repo_url" = '' ]; then > - cat - 1>&2 <<EOL > -ERROR: no PPA subscription key found, unable to fetch ABI information. > +getabis_ppa=${HOME}/.getabis.precise > > -You may need to request keys for the kernel ESM proposed PPA for > -your your account (note there is a 10m delay in these becoming live): > +if ! [ -e "${getabis_ppa}" ] ; then > + cat <<EOF >&2 > +Error: No private PPA URL(s) found, unable to fetch ABI information. > > - https://launchpad.net/~canonical-kernel-esm/+archive/ubuntu/proposed/+subscriptions > +This kernel is built and delivered using private PPA(s). You need to add the > +PPA repo URL(s) (including the username and password) to the file > +${getabis_ppa}. > > -Once generated your personal keys can be found at the URL below: > +One URL per line, like: > > - https://launchpad.net/~/+archivesubscriptions > +https://<user>:<pass>@private-ppa.launchpad.net/<ppa-team>/<ppa-name>/ubuntu > > -Obtain your PPA subscription key for the esm proposed ppa and add > -it to ~/.getabis.precise similar to below: > - > - repo_url="https://someone:foobar@private-ppa.launchpad.net/canonical-kernel-esm/proposed/ubuntu" > - > -EOL > +EOF > exit 1 > fi > > -repo_list=( > - "$repo_url/pool/main/l/linux-lts-trusty" > -) > +readarray -t repo_list < <(sed "s,\s*$,/pool/main/l/linux-lts-trusty," \ > + "${getabis_ppa}") > > package_prefixes linux-image >
diff --git a/debian.trusty/etc/getabis b/debian.trusty/etc/getabis index a93ce6d63f03..6193e06b6f9b 100644 --- a/debian.trusty/etc/getabis +++ b/debian.trusty/etc/getabis @@ -1,31 +1,23 @@ -# ESM: we have to get packages from a private password protected -# archive. Permissions cannot be commited and are per user. -[ -f "$HOME/.getabis.precise" ] && . "$HOME/.getabis.precise" -if [ "$repo_url" = '' ]; then - cat - 1>&2 <<EOL -ERROR: no PPA subscription key found, unable to fetch ABI information. +getabis_ppa=${HOME}/.getabis.precise -You may need to request keys for the kernel ESM proposed PPA for -your your account (note there is a 10m delay in these becoming live): +if ! [ -e "${getabis_ppa}" ] ; then + cat <<EOF >&2 +Error: No private PPA URL(s) found, unable to fetch ABI information. - https://launchpad.net/~canonical-kernel-esm/+archive/ubuntu/proposed/+subscriptions +This kernel is built and delivered using private PPA(s). You need to add the +PPA repo URL(s) (including the username and password) to the file +${getabis_ppa}. -Once generated your personal keys can be found at the URL below: +One URL per line, like: - https://launchpad.net/~/+archivesubscriptions +https://<user>:<pass>@private-ppa.launchpad.net/<ppa-team>/<ppa-name>/ubuntu -Obtain your PPA subscription key for the esm proposed ppa and add -it to ~/.getabis.precise similar to below: - - repo_url="https://someone:foobar@private-ppa.launchpad.net/canonical-kernel-esm/proposed/ubuntu" - -EOL +EOF exit 1 fi -repo_list=( - "$repo_url/pool/main/l/linux-lts-trusty" -) +readarray -t repo_list < <(sed "s,\s*$,/pool/main/l/linux-lts-trusty," \ + "${getabis_ppa}") package_prefixes linux-image
Buglink: https://bugs.launchpad.net/bugs/1829882 (Switch getabis to the new format (LP: #1829882)) All private/custom kernels are using the new getabis file format, except Precise. Fix that. Signed-off-by: Juerg Haefliger <juergh@canonical.com> --- debian.trusty/etc/getabis | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-)