ACK+Tweak+Applied: [PATCH] [SRU] [X/master-next] snapcraft: cleanup and remove unnecessary elements

[Kamal Mostafa]

Applied to X with "UBUNTU: SAUCE:" added -- Tim, maybe fix up the unstable
commit to match.

 -Kamal

On Thu, Jul 28, 2016 at 03:45:18PM +0200, Paolo Pisati wrote:
> 1) the branch name is only useful when distributing the snapcraft.yaml alone -
> when it is part of a git tree, the branch name should be omitted if the
> intention is to snap the branch containing the snapcraft.yaml file itself
> 
> 2) SQUASHFs is not a separate module anymore (see
> da89f0b2cfbd94e275c2a37053f7b3164fb60864)
> 
> 3) d101m_ucode.bin, d101s_ucode.bin and d102e_ucode.bin are only necessary when
> using an Intel(R) PRO/100 nic, while the main amd64 target is kvm (and that uses
> an Intel e1000 firmware-less nic)
> 
> Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
> ---
>  snapcraft.yaml | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/snapcraft.yaml b/snapcraft.yaml
> index bf4ca02..9ecb77df 100644
> --- a/snapcraft.yaml
> +++ b/snapcraft.yaml
> @@ -8,16 +8,9 @@ parts:
>    kernel:
>      plugin: kernel
>      source: .
> -    source-branch: master
>      source-type: git
>      kdefconfig: ['--makefile=debian/snapcraft.mk', 'branch=master','flavour=generic', 'config']
>      kconfigs:
>        - CONFIG_LOCALVERSION="-xenial_generic"
>        - CONFIG_DEBUG_INFO=n
> -    kernel-initrd-modules:
> -      - squashfs
> -    kernel-initrd-firmware:
> -      - lib/firmware/e100/d101m_ucode.bin
> -      - lib/firmware/e100/d101s_ucode.bin
> -      - lib/firmware/e100/d102e_ucode.bin
>      kernel-image-target: bzImage
> -- 
> 2.7.4
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team