diff --git a/Jenkinsfile b/Jenkinsfile
index 5879150191c3a0ad7a0a40bdb9cac58e441cd414..b55d80d775230d661b2a37ee7d1763a17b80382b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -100,7 +100,7 @@ def architectures = [
]
],
armhf: [
- boards: ['uboot', 'mx6qsabrelite'],
+ boards: ['uboot'],
types: [
minimal: [
args: "-t demopack:${demopack}",
diff --git a/apertis-image-mx6qsabrelite.yaml b/apertis-image-mx6qsabrelite.yaml
deleted file mode 100644
index b6b64c834f6bcdabd093ce58b6257fd02dc6cd40..0000000000000000000000000000000000000000
--- a/apertis-image-mx6qsabrelite.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-{{ $architecture := or .architecture "armhf" }}
-{{ $type := or .type "minimal" }}
-{{ $mirror := or .mirror "https://repositories.apertis.org/apertis/" }}
-{{ $suite := or .suite "18.12" }}
-{{ $timestamp := or .timestamp "00000000.0" }}
-{{ $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) }}
-{{ $image := or .image (printf "apertis-%s-%s-%s_%s" $suite $type $architecture $timestamp) }}
-
-{{ $cmdline := or .cmdline " console=tty0 console=ttymxc1,115200n8 plymouth.ignore-serial-consoles" }}
-
-{{ $demopack := or .demopack "disabled" }}
-{{ if eq $type "minimal" }}
-{{ $demopack := "disabled" }}
-{{ end }}
-
-architecture: {{ $architecture }}
-
-actions:
- - action: unpack
- description: Unpack {{ $ospack }}
- compression: gz
- file: {{ $ospack }}.tar.gz
-
- # Add multimedia demo pack
- # Provide URL via '-t demopack:"https://images.apertis.org/media/multimedia-demo.tar.gz"'
- # to add multimedia demo files
- {{ if ne $demopack "disabled" }}
- - action: download
- url: {{ $demopack }}
- name: mediademo
-
- - action: unpack
- origin: mediademo
- {{ end }}
-
- - action: image-partition
- imagename: {{ $image }}.img
-{{ if eq $type "minimal" }}
- imagesize: 4G
-{{ else }}
- imagesize: 15G
-{{end}}
- partitiontype: gpt
- gpt_gap: {{ sector 6144 }}b
-
- mountpoints:
- - mountpoint: /
- partition: system
- options: [ ro ]
- - mountpoint: /boot
- partition: boot
- - mountpoint: /home
- partition: general_storage
-
- partitions:
- - name: boot
- fs: ext2
- start: 6176s
- end: 256M
- flags: [ boot ]
- - name: system
- fs: btrfs
- start: 256M
-{{ if eq $type "minimal" }}
- end: 2048M
-{{ else }}
- end: 8192M
-{{end}}
- - name: general_storage
- fs: btrfs
-{{ if eq $type "minimal" }}
- start: 2048M
-{{ else }}
- start: 8192M
-{{end}}
- end: -4M
-
- - action: filesystem-deploy
- description: Deploying ospack onto image
-
- - action: run
- description: Add kernel parameters
- chroot: true
- command: sed -i '1 s/$/{{ $cmdline }}/' /etc/kernel/cmdline
-
- - action: apt
- description: Kernel and system packages
- packages:
- - kmod
- - linux-base
- - initramfs-tools
- - linux-image-armmp
- - u-boot-imx
- - u-boot-common
- - btrfs-tools
-
- - action: raw
- description: Install U-Boot
- origin: filesystem
- source: /usr/lib/u-boot/mx6qsabrelite/u-boot.imx
- offset: {{ sector 2 }}
-
- - action: run
- description: "Save installed package status"
- chroot: false
- command: gzip -c "${ROOTDIR}/var/lib/dpkg/status" > "${ARTIFACTDIR}/{{ $image }}.pkglist.gz"
-
- - action: run
- description: Cleanup /var/lib
- script: scripts/remove_var_lib_parts.sh
-
- - action: run
- description: List files on {{ $image }}
- chroot: false
- script: scripts/list-files "$ROOTDIR" | gzip > "${ARTIFACTDIR}/{{ $image }}.filelist.gz"
-
- - action: run
- description: Create block map for {{ $image }}.img
- postprocess: true
- command: bmaptool create {{ $image }}.img > {{ $image }}.img.bmap
-
- - action: run
- description: Compress {{ $image }}.img
- postprocess: true
- command: gzip -f {{ $image }}.img
-
- - action: run
- description: Checksum for {{ $image }}.img.gz
- postprocess: true
- command: sha256sum {{ $image }}.img.gz > {{ $image }}.img.gz.sha256
diff --git a/apertis-ostree-image-mx6qsabrelite.yaml b/apertis-ostree-image-mx6qsabrelite.yaml
deleted file mode 100644
index 24f8864f5aede377658298b580571710bfc9f5d4..0000000000000000000000000000000000000000
--- a/apertis-ostree-image-mx6qsabrelite.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
-{{ $architecture := or .architecture "armhf" }}
-{{ $type := or .type "minimal" }}
-{{ $suite := or .suite "18.12" }}
-{{ $image := or .image (printf "apertis-ostree-%s-%s-%s" $suite $type $architecture) }}
-
-{{ $board := or .board "mx6qsabrelite" }}
-{{ $repourl := or .repourl "https://images.apertis.org/ostree/repo" }}
-{{ $osname := or .osname "apertis" }}
-{{ $branch := or .branch (printf "%s/%s/%s-%s/%s" $osname $suite $architecture $board $type) }}
-{{ $ostree := or .ostree "repo" }}
-
-{{ $cmdline := or .cmdline "rootwait rw quiet splash plymouth.ignore-serial-consoles" }}
-
-{{ $demopack := or .demopack "disabled" }}
-
-architecture: {{ $architecture }}
-
-actions:
- - action: image-partition
- imagename: {{ $image }}.img
-{{ if eq $type "minimal" }}
- imagesize: 4G
-{{end}}
-{{ if eq $type "target" "development" }}
- imagesize: 15G
-{{end}}
- partitiontype: gpt
- gpt_gap: {{ sector 6144 }}b
-
- mountpoints:
- - mountpoint: /
- partition: system
- - mountpoint: /boot
- partition: boot
- - mountpoint: /home
- partition: general_storage
-
- partitions:
- - name: boot
- fs: ext2
- start: 6176s
- end: 1024M
- flags: [ boot ]
- - name: system
- fs: ext4
- start: 1024M
- end: 3000M
- - name: general_storage
- fs: btrfs
- start: 3000M
- end: 100%
-
- - action: run
- description: Setup bootloader
- chroot: false
- script: scripts/setup-uboot-bootloader.sh
-
- - action: ostree-deploy
- description: Deploying ostree onto image
- repository: {{ $ostree }}
- remote_repository: {{ $repourl }}
- branch: {{ $branch }}
- os: {{ $osname }}
- append-kernel-cmdline: {{ $cmdline }}
-
- # Add multimedia demo pack
- # Provide URL via '-t demopack:"https://images.apertis.org/media/multimedia-demo.tar.gz"'
- # to add multimedia demo files
- {{ if ne $demopack "disabled" }}
- - action: download
- url: {{ $demopack }}
- name: mediademo
-
- - action: unpack
- origin: mediademo
- {{ end }}
-
- - action: run
- description: Locating u-boot
- chroot: false
- command: cp ${ROOTDIR}/ostree/deploy/apertis/deploy/*/usr/lib/u-boot/mx6qsabrelite/u-boot.imx ${ROOTDIR}/boot/
-
- - action: raw
- description: Install U-Boot
- origin: filesystem
- source: /boot/u-boot.imx
- offset: {{ sector 2 }}
-
- - action: run
- description: Cleanup u-boot binary
- chroot: false
- command: rm -f ${ROOTDIR}/boot/u-boot.imx
-
- - action: run
- description: List files on {{ $image }}
- chroot: false
- script: scripts/list-files "$ROOTDIR" | gzip > "${ARTIFACTDIR}/{{ $image }}.filelist.gz"
-
- - action: run
- description: Create block map for {{ $image }}.img
- postprocess: true
- command: bmaptool create {{ $image }}.img > {{ $image }}.img.bmap
-
- - action: run
- description: Compress {{ $image }}.img
- postprocess: true
- command: gzip -f {{ $image }}.img
-
- - action: run
- description: Checksum for {{ $image }}.img.gz
- postprocess: true
- command: sha256sum {{ $image }}.img.gz > {{ $image }}.img.gz.sha256