Skip to content

Gadget snapcraft #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Gadget snapcraft #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
/snappy/*/stage
/snappy/*/prime
/snappy/*/parts
/snappy/gadget/uboot.env
/snappy/gadget/uboot.conf
/snappy/gadget/boot-assets
/snappy/gadget/prebuilt/uboot.env
/snappy/gadget/prebuilt/uboot.conf
/snappy/gadget/prebuilt/boot-assets
2 changes: 1 addition & 1 deletion snappy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
## Build image

```
UBUNTU_IMAGE_SKIP_COPY_UNVERIFIED_MODEL=1 ubuntu-image -c stable --image-size 2G --extra-snaps pine64_16.04-2_arm64.snap --extra-snaps kernel/pine64-kernel_3.10.104-2_arm64.snap -o test2.img pine64.model --debug
UBUNTU_IMAGE_SKIP_COPY_UNVERIFIED_MODEL=1 ubuntu-image -c stable --image-size 2G --extra-snaps gadget/pine64_16.04-3_arm64.snap --extra-snaps kernel/pine64-kernel_3.10.104-2_arm64.snap -o test4.img pine64.model --debug
```
27 changes: 13 additions & 14 deletions snappy/gadget.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,30 @@ include common.mk
all: build

clean:
rm -rf $(GADGET_DIR)/boot-assets
rm -f $(GADGET_DIR)/uboot.conf
rm -f $(GADGET_DIR)/uboot.env
rm -f $(GADGET_SNAP)
rm -rf $(GADGET_DIR)/prebuilt/boot-assets
rm -f $(GADGET_DIR)/prebuilt/uboot.conf
rm -f $(GADGET_DIR)/prebuilt/uboot.env
cd gadget; snapcraft clean

distclean: clean

u-boot:
@if [ ! -d $(GADGET_DIR)/boot-assets ] ; then mkdir -p $(GADGET_DIR)/boot-assets; fi
@if [ ! -d $(GADGET_DIR)/prebuilt/boot-assets ] ; then mkdir -p $(GADGET_DIR)/prebuilt/boot-assets; fi
@if [ ! -f $(UBOOT_BIN) ]; then echo "Build u-boot first."; exit 1; fi
cp -fa $(UBOOT_BIN) $(GADGET_DIR)/boot-assets/u-boot-with-dtb.bin
cp -fa $(UBOOT_BIN) $(GADGET_DIR)/prebuilt/boot-assets/u-boot-with-dtb.bin

dtbs:
@if [ ! -d $(GADGET_DIR)/boot-assets/dtbs ] ; then mkdir -p $(GADGET_DIR)/boot-assets/dtbs; fi
dtc -Odtb -o $(GADGET_DIR)/boot-assets/dtbs/sun50i-a64-pine64-plus.dtb $(BLOBS_DIR)/pine64.dts
dtc -Odtb -o $(GADGET_DIR)/boot-assets/dtbs/sun50i-a64-pine64.dtb $(BLOBS_DIR)/pine64noplus.dts
dtc -Odtb -o $(GADGET_DIR)/boot-assets/dtbs/sun50i-a64-pine64so.dtb $(BLOBS_DIR)/pine64so.dts
@if [ ! -d $(GADGET_DIR)/prebuilt/boot-assets/dtbs ] ; then mkdir -p $(GADGET_DIR)/prebuilt/boot-assets/dtbs; fi
dtc -Odtb -o $(GADGET_DIR)/prebuilt/boot-assets/dtbs/sun50i-a64-pine64-plus.dtb $(BLOBS_DIR)/pine64.dts
dtc -Odtb -o $(GADGET_DIR)/prebuilt/boot-assets/dtbs/sun50i-a64-pine64.dtb $(BLOBS_DIR)/pine64noplus.dts
dtc -Odtb -o $(GADGET_DIR)/prebuilt/boot-assets/dtbs/sun50i-a64-pine64so.dtb $(BLOBS_DIR)/pine64so.dts

preload: u-boot dtbs
cp -fa $(BLOBS_DIR)/boot0.bin $(GADGET_DIR)/boot-assets/boot0.bin
mkenvimage -r -s 131072 -o $(GADGET_DIR)/uboot.env $(GADGET_DIR)/uboot.env.in
@if [ ! -f $(GADGET_DIR)/uboot.conf ]; then ln -s uboot.env $(GADGET_DIR)/uboot.conf; fi
cp -fa $(BLOBS_DIR)/boot0.bin $(GADGET_DIR)/prebuilt/boot-assets/boot0.bin
mkenvimage -r -s 131072 -o $(GADGET_DIR)/prebuilt/uboot.env $(GADGET_DIR)/prebuilt/uboot.env.in

snappy: preload
snapcraft snap gadget
cd gadget; snapcraft --target-arch amd64 snap

build: dtbs preload snappy

Expand Down
0 snappy/gadget/meta/readme.md → snappy/gadget/README.md
View file
Open in desktop
File renamed without changes.
0 snappy/gadget/meta/gadget.yaml → snappy/gadget/gadget.yaml
View file
Open in desktop
File renamed without changes.
0 snappy/gadget/uboot.env.in → snappy/gadget/prebuilt/uboot.env.in
View file
Open in desktop
File renamed without changes.
0 snappy/gadget/meta/icon.png → snappy/gadget/setup/gui/icon.png
View file
Open in desktop
File renamed without changes
0 snappy/gadget/meta/hooks/prepare-device → snappy/gadget/snap/hooks/prepare-device
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions snappy/gadget/meta/snap.yaml → snappy/gadget/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ description: |
type: gadget
architectures:
- arm64
confinement: strict
grade: stable
parts:
prebuilt:
plugin: dump
source: prebuilt