← Back to branch summary

~tobijk/livecd-rootfs/image-sets

« back to all changes in this revision

Viewing changes to live-build/auto/config

Merge lp:~sil2100/livecd-rootfs/use-ubuntu-image-classic

Show diffs side-by-side

added added

removed removed

Lines of Context:
live-build/auto/config
180
180
                                exit 1
181
181
                                ;;
182
182
                esac
183
 
                case $MODEL in
184
 
                        pc-amd64|pc-i386)
185
 
                                UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
186
 
                        *)
187
 
                                UBUNTU_IMAGE_ARGS="" ;;
188
 
                esac
189
 
                case $SUITE in
190
 
                        xenial)
191
 
                                # Ubuntu Core 16
192
 
                                ;;
193
 
                        *)
194
 
                                # Ubuntu Core 18
195
 
                                MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
196
 
                esac
197
 
 
198
 
                echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
199
 
                echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
200
 
                # Store model assertion in top dir to get it picked up later as a build artifact
201
 
                env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
202
 
                echo "Configured ubuntu-image for the following model assertion:"
203
 
                cat "$PREFIX".model-assertion
204
 
                echo "----------------------------------------------------------"
 
183
 
 
184
                if [ $PROJECT = "ubuntu-core" ]; then
 
185
                        # snap-based core images
 
186
 
 
187
                        case $MODEL in
 
188
                                pc-amd64|pc-i386)
 
189
                                        UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
 
190
                                *)
 
191
                                        UBUNTU_IMAGE_ARGS="" ;;
 
192
                        esac
 
193
                        case $SUITE in
 
194
                                xenial)
 
195
                                        # Ubuntu Core 16
 
196
                                        ;;
 
197
                                *)
 
198
                                        # Ubuntu Core 18
 
199
                                        MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
 
200
                        esac
 
201
 
 
202
                        echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
 
203
                        echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
 
204
                        # Store model assertion in top dir to get it picked up later as a build artifact
 
205
                        env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
 
206
                        echo "Configured ubuntu-image for the following model assertion:"
 
207
                        cat "$PREFIX".model-assertion
 
208
                        echo "----------------------------------------------------------"
 
209
                else
 
210
                        # classic images
 
211
 
 
212
                        UBUNTU_IMAGE_ARGS=""
 
213
                        UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
 
214
                        UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"
 
215
 
 
216
                        git clone lp:~canonical-foundations/snap-$MODEL/+git/github-mirror -b classic config/$PREFIX-gadget
 
217
 
 
218
                        echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
 
219
                        echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
 
220
 
 
221
                        echo "Configured ubuntu-image for the following gadget model: $MODEL"
 
222
                fi
205
223
                # Fake finished configuration for lb build
206
224
                mkdir -p .build
207
225
                touch .build/config