Merge ~fisterra-team/fisterra/+git/livecd-rootfs:nitrogen6x into ~fisterra-team/fisterra/+git/livecd-rootfs:master

Proposed by ethan.hsieh
Status: Needs review
Proposed branch: ~fisterra-team/fisterra/+git/livecd-rootfs:nitrogen6x
Merge into: ~fisterra-team/fisterra/+git/livecd-rootfs:master
Diff against target: 26 lines (+8/-0)
1 file modified
live-build/auto/config (+8/-0)
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Dave Jones Pending
Steve Langasek Pending
Patricia Gaughen Pending
The Fisterra team Pending
Review via email: mp+371559@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

This seems to look correct, thanks! I'll merge and release it in a bit, since it doesn't hurt to have it in the archives already.

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Pushed it to lp:livecd-rootfs. I'll release it once I have one more MP approved for this package.

Unmerged commits

ecc588a... by ethan.hsieh

Initial support for imx6 subarch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/live-build/auto/config b/live-build/auto/config
2index 83a6f79..daaff5b 100755
3--- a/live-build/auto/config
4+++ b/live-build/auto/config
5@@ -332,6 +332,8 @@ case $IMAGEFORMAT in
6 MODEL=pi3-arm64 ;;
7 armhf+cm3)
8 MODEL=cm3 ;;
9+ armhf+imx6)
10+ MODEL=nitrogen6x ;;
11 *)
12 echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
13 exit 1
14@@ -904,6 +906,12 @@ case $ARCH in
15 add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
16 BINARY_REMOVE_LINUX=false
17 ;;
18+ imx6)
19+ COMPONENTS='main restricted universe multiverse'
20+ KERNEL_FLAVOURS=generic
21+ add_package install flash-kernel u-boot-tools wpasupplicant
22+ BINARY_REMOVE_LINUX=false
23+ ;;
24
25 esac
26 ;;

Subscribers

People subscribed via source and target branches

to all changes: