From 1fa1ac4e170a3d0a25dfc42846384223609b201bb4b0e12785fc9e329e1ebe12 Mon Sep 17 00:00:00 2001 From: Nicolas Patricio Saenz Julienne Date: Mon, 25 Jan 2021 18:25:16 +0000 Subject: [PATCH] Accepting request 866652 from home:nsaenzjulienne:branches:hardware:boot Introduce _service file, get rid of get-from-git.sh OBS-URL: https://build.opensuse.org/request/show/866652 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/raspberrypi-eeprom?expand=0&rev=4 --- _service | 11 +++++++ get-from-git.sh | 31 ------------------- ...eeprom-2020.09.03138a1.63~g3ae6694.obscpio | 3 ++ raspberrypi-eeprom-2021.01.21.tar.bz2 | 3 -- raspberrypi-eeprom.obsinfo | 5 +++ raspberrypi-eeprom.spec | 5 ++- 6 files changed, 21 insertions(+), 37 deletions(-) create mode 100644 _service delete mode 100644 get-from-git.sh create mode 100644 raspberrypi-eeprom-2020.09.03138a1.63~g3ae6694.obscpio delete mode 100644 raspberrypi-eeprom-2021.01.21.tar.bz2 create mode 100644 raspberrypi-eeprom.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..2c2c6a4 --- /dev/null +++ b/_service @@ -0,0 +1,11 @@ + + + git + https://github.com/raspberrypi/rpi-eeprom.git + raspberrypi-eeprom + v(.*) + @PARENT_TAG@.@TAG_OFFSET@~g%h + + + + diff --git a/get-from-git.sh b/get-from-git.sh deleted file mode 100644 index c9bb89c..0000000 --- a/get-from-git.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -# this is a huge hunk of stuff, so reuse the local repo if possible -if [ -d rpi-eeprom/.git ]; then - cd rpi-eeprom - git pull - cd .. -else - set -e - git clone --depth 1 https://github.com/raspberrypi/rpi-eeprom.git - set +e -fi - -TOPDIR=$(pwd) -SOURCES="rpi-eeprom-* firmware LICENSE" -cd rpi-eeprom -LINE=$(git log --format=format:"%h %ai" -- ${SOURCES}|head -n 1) -set -- $LINE -REV=$1 -DATE=$2 -VER=${DATE//-/.} -set -e -git archive --prefix=raspberrypi-eeprom-$VER/ -o $TOPDIR/raspberrypi-eeprom-${VER}.tar master -- ${SOURCES} -cd $TOPDIR -osc rm -f raspberrypi-eeprom-*.tar.bz2 || true -bzip2 --force raspberrypi-eeprom-${VER}.tar -osc add raspberrypi-eeprom-${VER}.tar.bz2 -sed -i "s/^Version:.*/Version: $VER/" raspberrypi-eeprom.spec -osc vc raspberrypi-eeprom -m "Update to $REV ($DATE)" -osc service localrun format_spec_file - diff --git a/raspberrypi-eeprom-2020.09.03138a1.63~g3ae6694.obscpio b/raspberrypi-eeprom-2020.09.03138a1.63~g3ae6694.obscpio new file mode 100644 index 0000000..cf217b4 --- /dev/null +++ b/raspberrypi-eeprom-2020.09.03138a1.63~g3ae6694.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b51e37140c851b1bc16a10080fac43e542a9dc1e87bfebf67b400c4b53218096 +size 26358797 diff --git a/raspberrypi-eeprom-2021.01.21.tar.bz2 b/raspberrypi-eeprom-2021.01.21.tar.bz2 deleted file mode 100644 index 1519071..0000000 --- a/raspberrypi-eeprom-2021.01.21.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87a8fb2c186dd92a52b6a9a255c75fc0ccea6fbc5be5e5393e4b307bbe6ddee5 -size 5210072 diff --git a/raspberrypi-eeprom.obsinfo b/raspberrypi-eeprom.obsinfo new file mode 100644 index 0000000..5eb2c19 --- /dev/null +++ b/raspberrypi-eeprom.obsinfo @@ -0,0 +1,5 @@ +name: raspberrypi-eeprom +version: 2020.09.03138a1.63~g3ae6694 +mtime: 1611505181 +commit: 3ae6694fbbea25a689ae279cb08ca3cb0e5253d2 + diff --git a/raspberrypi-eeprom.spec b/raspberrypi-eeprom.spec index a040121..c0c3760 100644 --- a/raspberrypi-eeprom.spec +++ b/raspberrypi-eeprom.spec @@ -17,14 +17,13 @@ Name: raspberrypi-eeprom -Version: 2021.01.21 +Version: 2020.09.03138a1.63~g3ae6694 Release: 0 Summary: Raspberry Pi 4 EEPROM firmware License: SUSE-Firmware Group: System/Boot URL: https://github.com/raspberrypi/rpi-eeprom -Source0: raspberrypi-eeprom-%{version}.tar.bz2 -Source1: get-from-git.sh +Source0: %{name}-%{version}.tar Patch0: add-suse-config.patch Patch1: dont-use-env.patch Provides: rpi-eeprom