Drop build-type

We're only using 'plain' in CI and this complicates the whole
stack up to the flash scripts

The corresponding kernel builds are failing since >1mo.

Jenkinsfile

@@ -5,12 +5,12 @@ node {
    build_on_x86 = [ 'imx6', 'qemu-x86_64' ]
    qcow2_builds = [ 'qemu-x86_64' ]
    separate_boot_image = []
-   currentBuild.description = "${build_type} ${params.board} ${params.dist} image"
+   currentBuild.description = "plain ${params.board} ${params.dist} image"
 
    parameters {
         string(name: 'board', defaultValue: "imx6", description: 'What board type to build for?')
         string(name: 'dist', defaultValue: "buster+ci", description: 'What distribuition to build for?')
-        string(name: 'build_type', defaultValue: "unstable", description: 'What type of build is this?')
+        string(name: 'build_type', defaultValue: "plain", description: 'What type of build is this?')
         string(name: 'publish', defaultValue: "false", description: 'Should the image get published?')
         string(name: 'kernel_url', defaultValue: "", description: 'The URL of the kernel')
         string(name: 'uboot_url', defaultValue: "", description: 'The URL for u-boot')
@@ -36,18 +36,18 @@ node {
      }
      stage('Clean') {
           sh "[ ! -x /usr/local/bin/drop-loop-mappings ] || /usr/local/bin/drop-loop-mappings"
-          sh "make DIST='${params.dist}' BOARD='${params.board}' TYPE='${params.build_type}' clean"
+          sh "make DIST='${params.dist}' BOARD='${params.board}' clean"
      }
      stage('check') {
-          sh "make DIST='${params.dist}' BOARD='${params.board}' TYPE='${params.build_type}' check"
+          sh "make DIST='${params.dist}' BOARD='${params.board}' check"
      }
      stage('Build') {
-          sh "make DIST='${params.dist}' BOARD='${params.board}' TYPE='${params.build_type}'"
+          sh "make DIST='${params.dist}' BOARD='${params.board}'"
      }
      stage('Publish') {
           if( "${params.publish}"=="true" ) {
-            sh "make DIST='${params.dist}' BOARD='${params.board}' TYPE='${params.build_type}' KERNEL_URL='${params.kernel_url}' UBOOT_URL='${params.uboot_url}' sha256sums"
-            sh "bin/publish_ci_files -t image -T ${params.build_type} ${params.board}.img.xz sha256sums"
+            sh "make DIST='${params.dist}' BOARD='${params.board}' KERNEL_URL='${params.kernel_url}' UBOOT_URL='${params.uboot_url}' sha256sums"
+            sh "bin/publish_ci_files -t image ${params.board}.img.xz sha256sums"
           } else {
             echo 'This image will not be published'
           }

Makefile

 # SPDX-License-Identifier: GPL-3.0+
 
 BOARD ?= librem5r4
-TYPE ?= plain
 DIST ?= byzantium
 
 SHELL := /bin/bash
@@ -41,7 +40,7 @@ $(IMAGES): $(STAMPFILE)
 $(STAMPFILE): | local.sh-link
 
 $(STAMPFILE): $(DEPS)
-	./build-image -b $(BOARD) -T $(TYPE) -d $(DIST) -l "$(LUKS)"
+	./build-image -b $(BOARD) -d $(DIST) -l "$(LUKS)"
 	touch $@
 
 %.img.xz: %.img

build-image

@@ -13,8 +13,6 @@ usage() {
   echo "    -h Display this help message."
   echo "    -b [devkit|librem5r1|librem5r2|librem5r3|librem5r4|qemu-x86_64] select the board type."
   echo "    -d <distro> distro to use. [ amber-phone, byzantium ]"
-  # TODO: add stable and drop ci
-  echo "    -T kernel/uboot build type (legacy/current/next/plain)"
   echo "    -B build rootfs tarball as well"
   echo "    -l <passphrase>: luks enrypt root volume with passphrase"
 }
@@ -129,7 +127,6 @@ cwd=$(pwd)
 distro=${DIST:-byzantium}
 mirror=
 pureos_board=devkit
-build_type=plain
 NULL=
 # Device tree file name. Only set this if you're not using
 # flash-kernel and want manual uboot script configuration.
@@ -165,7 +162,7 @@ while getopts ":hb:d:T:Bl:" opt; do
       distro=$OPTARG
       ;;
     T)
-      build_type=$OPTARG
+      # unused nowadays. Ignore for backward compat.
       ;;
     B)
       build_tarball=1
@@ -204,7 +201,7 @@ _uboot_url="${uboot_url}"
 build_auth
 
 [ -n "${debootstrap_dist}" ] || debootstrap_dist="${distro}"
-echo "Building ${mainimg} (board_type: ${board_type}, arch: ${arch}, build_type: ${build_type}, ${debootstrap_dist})"
+echo "Building ${mainimg} (board_type: ${board_type}, arch: ${arch}, ${debootstrap_dist})"
 echo "Installing extra packages ${packages}"
 echo "Installing early packages ${packages_early}"
 [ -z "${board_packages}" ] || echo "Installing extra board specific packages ${board_packages}"

conf/board

@@ -8,29 +8,9 @@ case ${pureos_board} in
   devkit)
     arch=arm64
     kernel_arch=arm64
-    case "${build_type}" in
-      legacy)
-        kernel_url="${kernel_base}/kernel_linux-next_imx8-legacy-librem5/${archive_path}"
-        uboot_url="${uboot_base}/uboot_devkit_build/${archive_path}"
-        ;;
-      next)
-        kernel_url="${kernel_base}/kernel_linux-next_imx8-next-librem5/${archive_path}"
-        uboot_url="${uboot_base}/uboot_devkit_build/${archive_path}"
-        ;;
-      current)
-        kernel_url="${kernel_base}/kernel_linux-next_imx8-current-librem5/${archive_path}"
-        uboot_url="${uboot_base}/uboot_devkit_build/${archive_path}"
-        ;;
-      plain)
-        board_packages=linux-image-librem5
-        # uboot should be a deb too:
-        uboot_url="${uboot_base}/uboot_devkit_build/${archive_path}"
-        ;;
-      *)
-        echo "unknown kernel type for devkit build ${build_type}"
-        exit 1
-        ;;
-    esac
+    board_packages=linux-image-librem5
+    # uboot should be a deb too:
+    uboot_url="${uboot_base}/uboot_devkit_build/${archive_path}"
     board_type=unknown
     qemu=/usr/bin/qemu-aarch64-static
     uboot_type=devkit
@@ -51,29 +31,9 @@ case ${pureos_board} in
   librem5*)
     arch=arm64
     kernel_arch=arm64
-    case "${build_type}" in
-      legacy)
-        kernel_url="${kernel_base}/kernel_linux-next_imx8-legacy-librem5/${archive_path}"
-        uboot_url="${uboot_base}/uboot_librem5_build/${archive_path}"
-        ;;
-      next)
-        kernel_url="${kernel_base}/kernel_linux-next_imx8-next-librem5/${archive_path}"
-        uboot_url="${uboot_base}/uboot_librem5_build/${archive_path}"
-        ;;
-      current)
-        kernel_url="${kernel_base}/kernel_linux-next_imx8-current-librem5/${archive_path}"
-        uboot_url="${uboot_base}/uboot_librem5_build/${archive_path}"
-        ;;
-      plain)
-        board_packages=linux-image-librem5
-        # uboot should be a deb too:
-        uboot_url="${uboot_base}/uboot_librem5_build/${archive_path}"
-        ;;
-      *)
-        echo "unknown kernel type for librem5 build ${build_type}"
-        exit 1
-        ;;
-    esac
+    board_packages=linux-image-librem5
+    # uboot should be a deb too:
+    uboot_url="${uboot_base}/uboot_librem5_build/${archive_path}"
     board_type=unknown
     qemu=/usr/bin/qemu-aarch64-static
     uboot_type=librem5