From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6656722054226640896 X-Received: by 2002:a7b:cb94:: with SMTP id m20mr257423wmi.3.1549893116137; Mon, 11 Feb 2019 05:51:56 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2d50:: with SMTP id t77ls1669618wmt.11.canary-gmail; Mon, 11 Feb 2019 05:51:55 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ2Cx0wTJhqZR+UOeipNTVPZbu1U1Pk6YZdhp5YXJZy2oPfVcp8TgVFqYLXswLLIdU2C+e/ X-Received: by 2002:a1c:c282:: with SMTP id s124mr801503wmf.24.1549893115630; Mon, 11 Feb 2019 05:51:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549893115; cv=none; d=google.com; s=arc-20160816; b=MmQA0cvMu5RqlwOkNfrvGFRUS3bwlmLKrs92on5jnQa1s5PSJ+5Ver4XxpxUgmTNe0 cEu1JI7YJ/k2ZMbfFZJ5N4OF+CtAhrMVUR5+tsCUdnO4Nw6ovGharhlzwuQVz6//s+Jc iXIAwX+w8mIMh032shBvPtns6TYM6SP4rv5OmOsGTeLXc3MZMmBVoq2kRZdJ+UVPxzOG r1QC5hXY1ZpQsRl/Wr1W1I3eEAw4RvX6Tv1f7Kr22NhJGHFvmGn5EeQwq9L7rrwsUmRu CksWjcJseyrMguHxbDmPKGymJNOMFW1GxMI/5OKQ2E2DpsfOXP1WQwI4uEAkhe5HGB0a vm/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=JH6IVF8zkJ9hC2jAUGOSpLUETBybyG7HXwPTwWp20Q8=; b=oJavKNEno+UUuouEwVip7mAwLbqB0nBvc/oUw/a5TG6b7l7Oic0SnShONIVJiuxP/M qNJsIc2ds8GToteTPYV5dIemaluQPvXVhRjAeM8euvbArM12XPaiwxDCBt/hdHIoHQM0 pk1k8jUo5+tvb9tIlBVPJnWghgJ29zdfZ7DEC9QfiHk+P165Piri69gNNoWaQYNfoLRR 4CN7ewQ6ZyzEIwpw/c/EVfB9k4zt/AmQesKE/UC6ZfJu3ve4wMUSF8IPW1WbvDs9ez4h wMZ7yy0WPoBM1hhrdeGANQfXhBPFzSkEgm97KD8yK2uJuufR0cWgaeTHPdOkTmBJWJQ+ 1MCA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id t2si359756wrn.3.2019.02.11.05.51.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Feb 2019 05:51:55 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x1BDps0F012660 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 11 Feb 2019 14:51:55 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.181]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x1BDpsi3009887; Mon, 11 Feb 2019 14:51:54 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH] remove raspberry support Date: Mon, 11 Feb 2019 14:51:48 +0100 Message-Id: <20190211135148.31132-1-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <86465cf4-3351-e1f4-d502-f2c499e28aa4@siemens.com> References: <86465cf4-3351-e1f4-d502-f2c499e28aa4@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: b6w8ddkZPXju From: Claudius Heine Signed-off-by: Claudius Heine --- README.md | 4 -- doc/user_manual.md | 30 +--------- meta-isar/classes/rpi-sdimg.bbclass | 57 ------------------- meta-isar/conf/conf-notes.txt | 1 - .../conf/distro/raspbian-configscript.sh | 21 ------- meta-isar/conf/distro/raspbian-jessie.conf | 12 ---- meta-isar/conf/distro/raspbian-jessie.list | 2 - meta-isar/conf/local.conf.sample | 1 - meta-isar/conf/machine/rpi.conf | 7 --- meta-isar/conf/multiconfig/rpi-jessie.conf | 33 ----------- meta-isar/recipes-app/hello/hello_2.9.bb | 1 - .../example-module/example-module.bb | 2 +- scripts/ci_build.sh | 1 - 13 files changed, 4 insertions(+), 168 deletions(-) delete mode 100644 meta-isar/classes/rpi-sdimg.bbclass delete mode 100644 meta-isar/conf/distro/raspbian-configscript.sh delete mode 100644 meta-isar/conf/distro/raspbian-jessie.conf delete mode 100644 meta-isar/conf/distro/raspbian-jessie.list delete mode 100644 meta-isar/conf/machine/rpi.conf delete mode 100644 meta-isar/conf/multiconfig/rpi-jessie.conf diff --git a/README.md b/README.md index 7094c88..1af703b 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,6 @@ To test the QEMU image, run the following command: The default root password is 'root'. -To test the RPi board, flash the image to an SD card using the instructions from the official site, -section "WRITING AN IMAGE TO THE SD CARD": - https://www.raspberrypi.org/documentation/installation/installing-images/README.md - # Supported distributions List of supported distributions, architectures and features can be found in the [Supported_Configurations](Supported_Configurations.md). diff --git a/doc/user_manual.md b/doc/user_manual.md index ff4939c..b73d63d 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -149,7 +149,6 @@ BBMULTICONFIG = " \ qemuamd64-jessie \ qemuamd64-stretch \ qemuamd64-buster \ - rpi-jessie \ bananapi-stretch \ " ``` @@ -168,7 +167,6 @@ $ bitbake \ multiconfig:qemuamd64-jessie:isar-image-base \ multiconfig:qemuamd64-stretch:isar-image-base \ multiconfig:qemuamd64-buster:isar-image-base \ - multiconfig:rpi-jessie:isar-image-base \ multiconfig:bananapi-stretch:isar-image-base ``` @@ -183,7 +181,6 @@ tmp/deploy/images/isar-image-base-debian-jessie-qemui386.ext4.img tmp/deploy/images/isar-image-base-debian-stretch-qemui386.ext4.img tmp/deploy/images/isar-image-base-debian-jessie-qemuamd64.ext4.img tmp/deploy/images/isar-image-base-debian-stretch-qemuamd64.ext4.img -tmp/deploy/images/isar-image-base.rpi-sdimg tmp/deploy/images/isar-image-base-debian-stretch-bananapi.wic.img ``` @@ -287,10 +284,10 @@ images for. If BitBake is called with image targets (e.g., `isar-image-base`), the following variables define the default configuration to build for: - - `MACHINE` - The board to build for (e.g., `qemuarm`, `rpi`). BitBake looks + - `MACHINE` - The board to build for (e.g., `qemuarm`, `qemuamd64`). BitBake looks for conf/multiconfig/${MACHINE}.conf in every layer. - - `DISTRO` - The distro to use (e.g. `raspbian-jessie`, `debian-stretch`). + - `DISTRO` - The distro to use (e.g. `debian-buster`, `debian-stretch`). BitBake looks for conf/distro/${DISTRO}.conf in every layer. - `DISTRO_ARCH` - The Debian architecture to build for (e.g., `armhf`). @@ -324,7 +321,6 @@ In Isar, each machine can use its specific Linux distro to generate `buildchroot - debian-jessie - debian-stretch - debian-buster - - raspbian-jessie User can select appropriate distro for specific machine by setting the following variable in machine configuration file: ``` @@ -349,7 +345,6 @@ Please refer to `Add a Custom Application` section for more information about wr Isar can generate various images types for specific machine. The type of the image to be generated may be specified through the `IMAGE_TYPE` variable. Currently, the following image types are provided: - `ext4` - Raw ext4 filesystem image (default option for `qemuarm` machine). - - `rpi-sdimg` - A complete, partitioned Raspberry Pi SD card image (default option for the `rpi` machine). - `wic-img` - A full disk image with user-specified partitions created and populated using the wic tool. --- @@ -363,14 +358,6 @@ The distro is defined by the set of the following variables: - `DISTRO_APT_PREFERENCES` - List of apt preference files - `DISTRO_KERNELS` - List of supported kernel suffixes -Below is an example for Raspbian Jessie: -``` -DISTRO_APT_SOURCES += "conf/distro/raspbian-jessie.list" -DISTRO_APT_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de" -DISTRO_CONFIG_SCRIPT?= "raspbian-configscript.sh" -DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv" -``` - To add new distro, user should perform the following steps: - Create `distro` folder in your layer: @@ -404,16 +391,6 @@ Every machine is described in its configuration file. The file defines the follo - `MACHINE_SERIAL` - The name of serial device that will be used for console output. - `IMAGE_TYPE` - The type of images to be generated for this machine. -Below is an example of machine configuration file for `Raspberry Pi` board: -``` -IMAGE_PREINSTALL = "linux-image-rpi-rpfv \ - raspberrypi-bootloader-nokernel" -KERNEL_IMAGE = "vmlinuz-4.4.0-1-rpi" -INITRD_IMAGE = "initrd.img-4.4.0-1-rpi" -MACHINE_SERIAL = "ttyAMA0" -IMAGE_TYPE = "rpi-sdimg" -``` - To add new machine user should perform the following steps: - Create the `machine` directory in your layer: @@ -472,10 +449,9 @@ IMAGE_TYPE = "my-image" ### Reference Classes -Isar contains three image type classes that can be used as reference: +Isar contains additional image type classes that can be used as reference: - `ext4-img` - - `rpi-sdimg` - `wic-img` --- diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass deleted file mode 100644 index 91b09cd..0000000 --- a/meta-isar/classes/rpi-sdimg.bbclass +++ /dev/null @@ -1,57 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2015-2016 ilbers GmbH -# -# Based on SD class from meta-raspberrypi - -inherit ext4-img - -# Boot partition volume id -BOOTDD_VOLUME_ID ?= "${MACHINE}" - -# Boot partition size [in KiB] -BOOT_SPACE ?= "40960" - -# Set alignment to 4MB [in KiB] -IMAGE_ROOTFS_ALIGNMENT = "4096" - -SDIMG = "${DEPLOY_DIR_IMAGE}/${PN}.rpi-sdimg" -SDIMG_ROOTFS = "${EXT4_IMAGE_FILE}" - -do_rpi_sdimg () { - # Align partitions - ROOTFS_SIZE=$(du -b ${SDIMG_ROOTFS} | cut -f 1) - ROOTFS_SIZE=$(expr ${ROOTFS_SIZE} + 1) - ROOTFS_SIZE=$(expr ${ROOTFS_SIZE} - ${ROOTFS_SIZE} % 1024) - ROOTFS_SIZE=$(expr ${ROOTFS_SIZE} / 1024) - ROOTFS_SIZE=$(expr ${ROOTFS_SIZE} - ${ROOTFS_SIZE} % ${IMAGE_ROOTFS_ALIGNMENT} + ${IMAGE_ROOTFS_ALIGNMENT}) - - BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) - BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT}) - SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE}) - - echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB" - - #Initialize sdcard image file - dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE} - - # Create partition table - parted -s ${SDIMG} mklabel msdos - # Create boot partition and mark it as bootable - parted -s ${SDIMG} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) - parted -s ${SDIMG} set 1 boot on - # Create rootfs partition to the end of disk - parted -s ${SDIMG} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s - parted ${SDIMG} print - - # Create a vfat image with boot files - BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }') - rm -f ${WORKDIR}/boot.img - mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS - mcopy -i ${WORKDIR}/boot.img -s ${IMAGE_ROOTFS}/boot/* ::/ - - # Burn Partitions - dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync -} - -addtask rpi_sdimg before do_build after do_ext4_image diff --git a/meta-isar/conf/conf-notes.txt b/meta-isar/conf/conf-notes.txt index 87bd2dc..576b630 100644 --- a/meta-isar/conf/conf-notes.txt +++ b/meta-isar/conf/conf-notes.txt @@ -1,4 +1,3 @@ Common targets are: multiconfig:qemuarm-stretch:isar-image-base multiconfig:qemuamd64-stretch:isar-image-base - multiconfig:rpi-jessie:isar-image-base diff --git a/meta-isar/conf/distro/raspbian-configscript.sh b/meta-isar/conf/distro/raspbian-configscript.sh deleted file mode 100644 index 7a32c5d..0000000 --- a/meta-isar/conf/distro/raspbian-configscript.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH - -set -e - -readonly MACHINE_SERIAL="$1" -readonly BAUDRATE_TTY="$2" - -# Enable tty conditionally, systemd does not have the file but its own magic -if [ -f /etc/inittab ]; then - echo "T0:23:respawn:/sbin/getty -L $MACHINE_SERIAL $BAUDRATE_TTY vt100" \ - >> /etc/inittab -fi - -KERNEL_IMAGE="$(find /boot -maxdepth 1 -name "vmlinuz*" -printf "%p\n")" - -cat > /boot/config.txt << EOF -kernel=$KERNEL_IMAGE -EOF diff --git a/meta-isar/conf/distro/raspbian-jessie.conf b/meta-isar/conf/distro/raspbian-jessie.conf deleted file mode 100644 index 5e907e5..0000000 --- a/meta-isar/conf/distro/raspbian-jessie.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Raspbian stable distribution configuration -# -# This software is a part of ISAR. -# Copyright (C) 2015-2016 ilbers GmbH - -BASE_DISTRO = "raspbian" -BASE_DISTRO_CODENAME = "jessie" - -DISTRO_APT_SOURCES += "conf/distro/raspbian-jessie.list" -DISTRO_APT_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de" -DISTRO_CONFIG_SCRIPT ?= "${LAYERDIR_isar}/conf/distro/raspbian-configscript.sh" -DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv" diff --git a/meta-isar/conf/distro/raspbian-jessie.list b/meta-isar/conf/distro/raspbian-jessie.list deleted file mode 100644 index 0a5af41..0000000 --- a/meta-isar/conf/distro/raspbian-jessie.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://archive.raspbian.org/raspbian jessie main contrib non-free firmware -deb-src http://archive.raspbian.org/raspbian jessie main contrib non-free firmware diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index a671b20..3fd1538 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -53,7 +53,6 @@ BBMULTICONFIG = " \ hikey-stretch \ qemuamd64-buster \ qemuamd64-buster-tgz \ - rpi-jessie \ " # diff --git a/meta-isar/conf/machine/rpi.conf b/meta-isar/conf/machine/rpi.conf deleted file mode 100644 index 31f2219..0000000 --- a/meta-isar/conf/machine/rpi.conf +++ /dev/null @@ -1,7 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH - -MACHINE_SERIAL ?= "ttyAMA0" -BAUDRATE_TTY ?= "9600" - -IMAGE_TYPE ?= "rpi-sdimg" diff --git a/meta-isar/conf/multiconfig/rpi-jessie.conf b/meta-isar/conf/multiconfig/rpi-jessie.conf deleted file mode 100644 index 03c32e2..0000000 --- a/meta-isar/conf/multiconfig/rpi-jessie.conf +++ /dev/null @@ -1,33 +0,0 @@ -# -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH -# -# This configuration file is a part of bitbake multiconfig. Bitbake combines -# these settings with local.conf ones and start task execution with this -# environment. - -# This sets the default machine to be rpi in this configuration: -MACHINE ?= "rpi" - -# This sets the default distribution configuration: -DISTRO ?= "raspbian-jessie" -DISTRO_ARCH ?= "armhf" - -KERNEL_NAME ?= "rpi-rpfv" - -IMAGE_PREINSTALL += " \ - bind9-host \ - dnsutils \ - iproute2 \ - iputils-ping \ - isc-dhcp-client \ - lrzsz \ - net-tools \ - netcat-openbsd \ - openssh-client \ - openssh-server \ - raspberrypi-bootloader-nokernel \ - telnet \ - traceroute \ - vim \ - " diff --git a/meta-isar/recipes-app/hello/hello_2.9.bb b/meta-isar/recipes-app/hello/hello_2.9.bb index 63d1562..8e01b6f 100644 --- a/meta-isar/recipes-app/hello/hello_2.9.bb +++ b/meta-isar/recipes-app/hello/hello_2.9.bb @@ -8,4 +8,3 @@ require hello.inc DEFAULT_PREFERENCE_debian-jessie = "1" -DEFAULT_PREFERENCE_raspbian-jessie = "1" diff --git a/meta-isar/recipes-kernel/example-module/example-module.bb b/meta-isar/recipes-kernel/example-module/example-module.bb index b725416..fe4b18f 100644 --- a/meta-isar/recipes-kernel/example-module/example-module.bb +++ b/meta-isar/recipes-kernel/example-module/example-module.bb @@ -11,7 +11,7 @@ # has hard dependencies from linux-compiler-gcc-4.8-arm, what # conflicts with the host binaries. python() { - if d.getVar('KERNEL_NAME') in ['armmp', 'arm64', 'rpi-rpfv', 'amd64', '686-pae']: + if d.getVar('KERNEL_NAME') in ['armmp', 'arm64', 'amd64', '686-pae']: d.setVar('ISAR_CROSS_COMPILE', '0') } diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 1789183..dc0158d 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -115,7 +115,6 @@ else multiconfig:qemuamd64-stretch:isar-image-base \ multiconfig:qemuamd64-buster:isar-image-base \ multiconfig:qemuamd64-buster-tgz:isar-image-base \ - multiconfig:rpi-jessie:isar-image-base # qemu-user-static of <= buster too old to build that #multiconfig:qemuarm64-buster:isar-image-base fi -- 2.20.1