Merge ~gary-wzl77/snappy-hwe-snaps/+git/pc-amd64-gadget-cpc:resolve_grub_conflict into ~snappy-hwe-team/snappy-hwe-snaps/+git/pc-amd64-gadget-cpc:master

[Gary.Wang]

Merge https://github.com/sil2100/pc-amd64-gadget

We need these minor changes from sil2100 to avoid grub required packages conflicts on some distros. I hit the package conflicts problem when I was trying to verify the classic image creation on zesty. See here: http://paste.ubuntu.com/25856488/

Merge https://github.com/sil2100/pc-amd64-gadget

We need these minor changes from sil2100 to avoid grub required packages conflicts on some distros. I hit the package conflicts problem when I was trying to verify the classic image creation on zesty. See here: http://paste.ubuntu.com/25856488/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:3c07dc48c0508d4ebb2f61d7b384f0ebc4ad3a2f
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/40/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/90/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/90/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/90/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/90/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/885
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/633
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/653/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/40/rebuild

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve (continuous-integration)

diff --git a/Makefile b/Makefile
index 3816068..050210c 100644
--- a/Makefile
+++ b/Makefile
@@ -53,16 +53,16 @@ GRUB_MODULES = \
 	video
 
 all:
-	dd if=/usr/lib/grub/i386-pc/boot.img of=pc-boot.img bs=440 count=1
+	dd if=$(SNAPCRAFT_STAGE)/usr/lib/grub/i386-pc/boot.img of=pc-boot.img bs=440 count=1
 	/bin/echo -n -e '\x90\x90' | dd of=pc-boot.img seek=102 bs=1 conv=notrunc
-	grub-mkimage -O i386-pc -o pc-core.img -p '(,gpt2)/EFI/ubuntu' $(GRUB_MODULES)
+	grub-mkimage -d $(SNAPCRAFT_STAGE)/usr/lib/grub/i386-pc/ -O i386-pc -o pc-core.img -p '(,gpt2)/EFI/ubuntu' $(GRUB_MODULES)
 	# The first sector of the core image requires an absolute pointer to the
 	# second sector of the image.  Since this is always hard-coded, it means our
 	# BIOS boot partition must be defined with an absolute offset.  The
 	# particular value here is 2049, or 0x01 0x08 0x00 0x00 in little-endian.
 	/bin/echo -n -e '\x01\x08\x00\x00' | dd of=pc-core.img seek=500 bs=1 conv=notrunc
-	cp /usr/lib/shim/shimx64.efi.signed shim.efi.signed
-	cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed grubx64.efi
+	cp $(SNAPCRAFT_STAGE)/usr/lib/shim/shimx64.efi.signed shim.efi.signed
+	cp $(SNAPCRAFT_STAGE)/usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed grubx64.efi
 
 
 install:
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 75d3b3a..bea8d36 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -9,11 +9,17 @@ confinement: strict
 icon: icon.png
 
 parts:
-  grub:
-    source: .
-    plugin: make
-    build-packages:
+  grub-prepare:
+    plugin: nil
+    stage-packages:
       - grub-efi-amd64-signed
       - grub-pc-bin
       - shim-signed
-        
+    prime: [ -* ]
+  grub:
+    source: .
+    build-packages:
+      - grub-common
+    plugin: make
+    after: [grub-prepare]
+