| Message ID | 1498487022-7461-2-git-send-email-paolo.pisati@canonical.com |
|---|---|
| State | New |
| Headers | show |
Hi Paolo, 2 minor nitpicks: On 26/06/17 15:23, Paolo Pisati wrote: > BugLink: http://bugs.launchpad.net/bugs/1700576 > > This patch improves over the original snapcraft.yaml we ship in Xenial, > and makes the generated kernel snap nearly identical to the one we ship > in the store. > Among the different improvements, we have: > > 1) include the linux-firmwar and linux-firmware-snapdraone packages in typo: linux-firmware > the final snap > 2) rename it to snapdragon-kernel to match the snap we have in the store > 3) dynamic versioning > 4) autogenerated config from debian.$DEBIAN/config/* > > Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> > --- > snapcraft.yaml | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/snapcraft.yaml b/snapcraft.yaml > index 9eb3f40..9ceba92 100644 > --- a/snapcraft.yaml > +++ b/snapcraft.yaml > @@ -1,10 +1,10 @@ > -name: pc-kernel > +name: dragonboard-kernel > version: null > version-script: | > . debian/debian.env > dpkg-parsechangelog -l $DEBIAN/changelog -S version > -summary: The Ubuntu generic Linux kernel > -description: This Ubuntu generic Linux kernel > +summary: The canonical snapdragon arm64 kernel > +description: The canonical snapdragon arm64 kernel Should that be "The Canonical snapgragon..." > grade: stable > confinement: strict > type: kernel > @@ -14,18 +14,24 @@ parts: > plugin: kernel > source: . > source-type: git > - kconfigflavour: generic > + kconfigflavour: snapdragon > kconfigs: > - CONFIG_DEBUG_INFO=n > + install: | > + cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc-snappy.dtb $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc.dtb > firmware: > plugin: nil > stage-packages: > - linux-firmware > + - linux-firmware-snapdragon > organize: > lib/firmware: firmware > prime: > - -usr > - -lib > + install: | > + mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/wlan > + ln -s /run/macaddr0 $SNAPCRAFT_PART_INSTALL/firmware/wlan/ > build-packages: > - cpio > - libssl-dev >
On 26.06.2017 16:23, Paolo Pisati wrote: > BugLink: http://bugs.launchpad.net/bugs/1700576 > > This patch improves over the original snapcraft.yaml we ship in Xenial, > and makes the generated kernel snap nearly identical to the one we ship > in the store. > Among the different improvements, we have: > > 1) include the linux-firmwar and linux-firmware-snapdraone packages in > the final snap > 2) rename it to snapdragon-kernel to match the snap we have in the store > 3) dynamic versioning > 4) autogenerated config from debian.$DEBIAN/config/* > > Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- When applying we could fix those spelling errors... > snapcraft.yaml | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/snapcraft.yaml b/snapcraft.yaml > index 9eb3f40..9ceba92 100644 > --- a/snapcraft.yaml > +++ b/snapcraft.yaml > @@ -1,10 +1,10 @@ > -name: pc-kernel > +name: dragonboard-kernel > version: null > version-script: | > . debian/debian.env > dpkg-parsechangelog -l $DEBIAN/changelog -S version > -summary: The Ubuntu generic Linux kernel > -description: This Ubuntu generic Linux kernel > +summary: The canonical snapdragon arm64 kernel > +description: The canonical snapdragon arm64 kernel > grade: stable > confinement: strict > type: kernel > @@ -14,18 +14,24 @@ parts: > plugin: kernel > source: . > source-type: git > - kconfigflavour: generic > + kconfigflavour: snapdragon > kconfigs: > - CONFIG_DEBUG_INFO=n > + install: | > + cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc-snappy.dtb $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc.dtb > firmware: > plugin: nil > stage-packages: > - linux-firmware > + - linux-firmware-snapdragon > organize: > lib/firmware: firmware > prime: > - -usr > - -lib > + install: | > + mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/wlan > + ln -s /run/macaddr0 $SNAPCRAFT_PART_INSTALL/firmware/wlan/ > build-packages: > - cpio > - libssl-dev >
On 26/06/17 15:55, Colin Ian King wrote: > Hi Paolo, > > 2 minor nitpicks: > > On 26/06/17 15:23, Paolo Pisati wrote: >> BugLink: http://bugs.launchpad.net/bugs/1700576 >> >> This patch improves over the original snapcraft.yaml we ship in Xenial, >> and makes the generated kernel snap nearly identical to the one we ship >> in the store. >> Among the different improvements, we have: >> >> 1) include the linux-firmwar and linux-firmware-snapdraone packages in > > typo: linux-firmware > >> the final snap >> 2) rename it to snapdragon-kernel to match the snap we have in the store >> 3) dynamic versioning >> 4) autogenerated config from debian.$DEBIAN/config/* >> >> Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> >> --- >> snapcraft.yaml | 14 ++++++++++---- >> 1 file changed, 10 insertions(+), 4 deletions(-) >> >> diff --git a/snapcraft.yaml b/snapcraft.yaml >> index 9eb3f40..9ceba92 100644 >> --- a/snapcraft.yaml >> +++ b/snapcraft.yaml >> @@ -1,10 +1,10 @@ >> -name: pc-kernel >> +name: dragonboard-kernel >> version: null >> version-script: | >> . debian/debian.env >> dpkg-parsechangelog -l $DEBIAN/changelog -S version >> -summary: The Ubuntu generic Linux kernel >> -description: This Ubuntu generic Linux kernel >> +summary: The canonical snapdragon arm64 kernel >> +description: The canonical snapdragon arm64 kernel > > Should that be "The Canonical snapgragon..." > > >> grade: stable >> confinement: strict >> type: kernel >> @@ -14,18 +14,24 @@ parts: >> plugin: kernel >> source: . >> source-type: git >> - kconfigflavour: generic >> + kconfigflavour: snapdragon >> kconfigs: >> - CONFIG_DEBUG_INFO=n >> + install: | >> + cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc-snappy.dtb $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc.dtb >> firmware: >> plugin: nil >> stage-packages: >> - linux-firmware >> + - linux-firmware-snapdragon >> organize: >> lib/firmware: firmware >> prime: >> - -usr >> - -lib >> + install: | >> + mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/wlan >> + ln -s /run/macaddr0 $SNAPCRAFT_PART_INSTALL/firmware/wlan/ >> build-packages: >> - cpio >> - libssl-dev >> > > As what Stefan said, lets fix those spelling mistakes when it is applied Acked-by: Colin Ian King@canonical.com
Applied to xenial snapdragon branch. Typos mentioned corrected. Thanks. Cascardo.
diff --git a/snapcraft.yaml b/snapcraft.yaml index 9eb3f40..9ceba92 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,10 +1,10 @@ -name: pc-kernel +name: dragonboard-kernel version: null version-script: | . debian/debian.env dpkg-parsechangelog -l $DEBIAN/changelog -S version -summary: The Ubuntu generic Linux kernel -description: This Ubuntu generic Linux kernel +summary: The canonical snapdragon arm64 kernel +description: The canonical snapdragon arm64 kernel grade: stable confinement: strict type: kernel @@ -14,18 +14,24 @@ parts: plugin: kernel source: . source-type: git - kconfigflavour: generic + kconfigflavour: snapdragon kconfigs: - CONFIG_DEBUG_INFO=n + install: | + cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc-snappy.dtb $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc.dtb firmware: plugin: nil stage-packages: - linux-firmware + - linux-firmware-snapdragon organize: lib/firmware: firmware prime: - -usr - -lib + install: | + mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/wlan + ln -s /run/macaddr0 $SNAPCRAFT_PART_INSTALL/firmware/wlan/ build-packages: - cpio - libssl-dev
BugLink: http://bugs.launchpad.net/bugs/1700576 This patch improves over the original snapcraft.yaml we ship in Xenial, and makes the generated kernel snap nearly identical to the one we ship in the store. Among the different improvements, we have: 1) include the linux-firmwar and linux-firmware-snapdraone packages in the final snap 2) rename it to snapdragon-kernel to match the snap we have in the store 3) dynamic versioning 4) autogenerated config from debian.$DEBIAN/config/* Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- snapcraft.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)