snappy-hwe-snaps

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

  1. Git
  2. lp:~gary-wzl77/snappy-hwe-snaps/+git/pc-amd64-gadget-cpc
  3. resolve_grub_conflict
  4. Merge into master
Proposed by Gary.Wang
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 3c07dc48c0508d4ebb2f61d7b384f0ebc4ad3a2f
Merged at revision: 7ed2971e80456af91fca871f417ffb6c81a26ce3
Proposed branch: ~gary-wzl77/snappy-hwe-snaps/+git/pc-amd64-gadget-cpc:resolve_grub_conflict
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/pc-amd64-gadget-cpc:master
Diff against target: 52 lines (+15/-9)
2 files modified
Makefile (+4/-4)
snapcraft.yaml (+11/-5)
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato continuous-integration Approve
System Enablement Bot continuous-integration Needs Fixing
Review via email: mp+333018@code.launchpad.net

Commit message

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/

Description of the change

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/

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

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)
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/Makefile b/Makefile
index 3816068..050210c 100644
--- a/Makefile
+++ b/Makefile
@@ -53,16 +53,16 @@ GRUB_MODULES = \
53 video53 video
5454
55all:55all:
56 dd if=/usr/lib/grub/i386-pc/boot.img of=pc-boot.img bs=440 count=156 dd if=$(SNAPCRAFT_STAGE)/usr/lib/grub/i386-pc/boot.img of=pc-boot.img bs=440 count=1
57 /bin/echo -n -e '\x90\x90' | dd of=pc-boot.img seek=102 bs=1 conv=notrunc57 /bin/echo -n -e '\x90\x90' | dd of=pc-boot.img seek=102 bs=1 conv=notrunc
58 grub-mkimage -O i386-pc -o pc-core.img -p '(,gpt2)/EFI/ubuntu' $(GRUB_MODULES)58 grub-mkimage -d $(SNAPCRAFT_STAGE)/usr/lib/grub/i386-pc/ -O i386-pc -o pc-core.img -p '(,gpt2)/EFI/ubuntu' $(GRUB_MODULES)
59 # The first sector of the core image requires an absolute pointer to the59 # The first sector of the core image requires an absolute pointer to the
60 # second sector of the image. Since this is always hard-coded, it means our60 # second sector of the image. Since this is always hard-coded, it means our
61 # BIOS boot partition must be defined with an absolute offset. The61 # BIOS boot partition must be defined with an absolute offset. The
62 # particular value here is 2049, or 0x01 0x08 0x00 0x00 in little-endian.62 # particular value here is 2049, or 0x01 0x08 0x00 0x00 in little-endian.
63 /bin/echo -n -e '\x01\x08\x00\x00' | dd of=pc-core.img seek=500 bs=1 conv=notrunc63 /bin/echo -n -e '\x01\x08\x00\x00' | dd of=pc-core.img seek=500 bs=1 conv=notrunc
64 cp /usr/lib/shim/shimx64.efi.signed shim.efi.signed64 cp $(SNAPCRAFT_STAGE)/usr/lib/shim/shimx64.efi.signed shim.efi.signed
65 cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed grubx64.efi65 cp $(SNAPCRAFT_STAGE)/usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed grubx64.efi
6666
6767
68install:68install:
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 75d3b3a..bea8d36 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -9,11 +9,17 @@ confinement: strict
9icon: icon.png9icon: icon.png
1010
11parts:11parts:
12 grub:12 grub-prepare:
13 source: .13 plugin: nil
14 plugin: make14 stage-packages:
15 build-packages:
16 - grub-efi-amd64-signed15 - grub-efi-amd64-signed
17 - grub-pc-bin16 - grub-pc-bin
18 - shim-signed17 - shim-signed
19 18 prime: [ -* ]
19 grub:
20 source: .
21 build-packages:
22 - grub-common
23 plugin: make
24 after: [grub-prepare]
25

Subscribers

People subscribed via source and target branches

to all changes: