| Message ID | 20180416170039.7144-1-cascardo@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [xenial/hwe-edge] UBUNTU: Packaging: Do not build snapdragon packages | expand |
On Mon, Apr 16, 2018 at 02:00:39PM -0300, Thadeu Lima de Souza Cascardo wrote: > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> Acked-by: Seth Forshee <seth.forshee@canonical.com>
On 16.04.2018 19:00, Thadeu Lima de Souza Cascardo wrote: > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- /me <3 more comments... Otherwise it sounds reasonable and by glancing over should do the right thing... potentially last two seds might be one with multiple -e, but not really time critical here. -Stefan > debian.hwe-edge/etc/update-from-bionic-master | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/debian.hwe-edge/etc/update-from-bionic-master b/debian.hwe-edge/etc/update-from-bionic-master > index d5771c060f28..8181716e6917 100755 > --- a/debian.hwe-edge/etc/update-from-bionic-master > +++ b/debian.hwe-edge/etc/update-from-bionic-master > @@ -99,6 +99,9 @@ fi > # > rsync -av --delete ${DEBIAN_SOURCE}/d-i/ ${DEBIAN_TARGET}/d-i > > +# Remove snapdragon from d-i > +sed -i /snapdragon/d ${DEBIAN_TARGET}/d-i/kernel-versions > + > # > # Update configs from master > # > @@ -109,6 +112,10 @@ rsync -av --delete ${DEBIAN_SOURCE}/config/ ${DEBIAN_TARGET}/config > # > rsync -av --delete ${DEBIAN_SOURCE}/rules.d/*.mk ${DEBIAN_TARGET}/rules.d/ > > +# We don't build snapdragon > +sed -i '/_snapdragon/d' ${DEBIAN_TARGET}/rules.d/arm64.mk > +sed -i 's/^\(flavo.*\)\ssnapdragon\(.*\)$/\1\2/' ${DEBIAN_TARGET}/rules.d/arm64.mk > + > # > # Update modprobe.d from master > # >
On 16.04.2018 19:00, Thadeu Lima de Souza Cascardo wrote: > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> > --- Applied with a bit more info to xenial/hwe-edge so the next crank-run avoids snapdragon. -Stefan > debian.hwe-edge/etc/update-from-bionic-master | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/debian.hwe-edge/etc/update-from-bionic-master b/debian.hwe-edge/etc/update-from-bionic-master > index d5771c060f28..8181716e6917 100755 > --- a/debian.hwe-edge/etc/update-from-bionic-master > +++ b/debian.hwe-edge/etc/update-from-bionic-master > @@ -99,6 +99,9 @@ fi > # > rsync -av --delete ${DEBIAN_SOURCE}/d-i/ ${DEBIAN_TARGET}/d-i > > +# Remove snapdragon from d-i > +sed -i /snapdragon/d ${DEBIAN_TARGET}/d-i/kernel-versions > + > # > # Update configs from master > # > @@ -109,6 +112,10 @@ rsync -av --delete ${DEBIAN_SOURCE}/config/ ${DEBIAN_TARGET}/config > # > rsync -av --delete ${DEBIAN_SOURCE}/rules.d/*.mk ${DEBIAN_TARGET}/rules.d/ > > +# We don't build snapdragon > +sed -i '/_snapdragon/d' ${DEBIAN_TARGET}/rules.d/arm64.mk > +sed -i 's/^\(flavo.*\)\ssnapdragon\(.*\)$/\1\2/' ${DEBIAN_TARGET}/rules.d/arm64.mk > + > # > # Update modprobe.d from master > # >
diff --git a/debian.hwe-edge/etc/update-from-bionic-master b/debian.hwe-edge/etc/update-from-bionic-master index d5771c060f28..8181716e6917 100755 --- a/debian.hwe-edge/etc/update-from-bionic-master +++ b/debian.hwe-edge/etc/update-from-bionic-master @@ -99,6 +99,9 @@ fi # rsync -av --delete ${DEBIAN_SOURCE}/d-i/ ${DEBIAN_TARGET}/d-i +# Remove snapdragon from d-i +sed -i /snapdragon/d ${DEBIAN_TARGET}/d-i/kernel-versions + # # Update configs from master # @@ -109,6 +112,10 @@ rsync -av --delete ${DEBIAN_SOURCE}/config/ ${DEBIAN_TARGET}/config # rsync -av --delete ${DEBIAN_SOURCE}/rules.d/*.mk ${DEBIAN_TARGET}/rules.d/ +# We don't build snapdragon +sed -i '/_snapdragon/d' ${DEBIAN_TARGET}/rules.d/arm64.mk +sed -i 's/^\(flavo.*\)\ssnapdragon\(.*\)$/\1\2/' ${DEBIAN_TARGET}/rules.d/arm64.mk + # # Update modprobe.d from master #
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> --- debian.hwe-edge/etc/update-from-bionic-master | 7 +++++++ 1 file changed, 7 insertions(+)