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
diff --git a/live-build/auto/config b/live-build/auto/config
index 83a6f79..daaff5b 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -332,6 +332,8 @@ case $IMAGEFORMAT in
332 MODEL=pi3-arm64 ;;332 MODEL=pi3-arm64 ;;
333 armhf+cm3)333 armhf+cm3)
334 MODEL=cm3 ;;334 MODEL=cm3 ;;
335 armhf+imx6)
336 MODEL=nitrogen6x ;;
335 *)337 *)
336 echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2338 echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
337 exit 1339 exit 1
@@ -904,6 +906,12 @@ case $ARCH in
904 add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant906 add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
905 BINARY_REMOVE_LINUX=false907 BINARY_REMOVE_LINUX=false
906 ;;908 ;;
909 imx6)
910 COMPONENTS='main restricted universe multiverse'
911 KERNEL_FLAVOURS=generic
912 add_package install flash-kernel u-boot-tools wpasupplicant
913 BINARY_REMOVE_LINUX=false
914 ;;
907915
908 esac916 esac
909 ;;917 ;;

Subscribers

People subscribed via source and target branches

to all changes: