From f65d8ed5e7567d8670011fc08bfb40066b68a3e7 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sun, 24 May 2020 11:10:50 +0200 Subject: linux-olpc-xo1: moved from [core] to [extra], config path fixed --- core/linux-olpc-xo1/PKGBUILD | 293 -- core/linux-olpc-xo1/config.olpc-xo1 | 4336 -------------------------- core/linux-olpc-xo1/sphinx-workaround.patch | 13 - extra/linux-olpc-xo1/PKGBUILD | 293 ++ extra/linux-olpc-xo1/config.olpc-xo1 | 4336 ++++++++++++++++++++++++++ extra/linux-olpc-xo1/sphinx-workaround.patch | 13 + 6 files changed, 4642 insertions(+), 4642 deletions(-) delete mode 100644 core/linux-olpc-xo1/PKGBUILD delete mode 100644 core/linux-olpc-xo1/config.olpc-xo1 delete mode 100644 core/linux-olpc-xo1/sphinx-workaround.patch create mode 100644 extra/linux-olpc-xo1/PKGBUILD create mode 100644 extra/linux-olpc-xo1/config.olpc-xo1 create mode 100644 extra/linux-olpc-xo1/sphinx-workaround.patch diff --git a/core/linux-olpc-xo1/PKGBUILD b/core/linux-olpc-xo1/PKGBUILD deleted file mode 100644 index f7ccf783..00000000 --- a/core/linux-olpc-xo1/PKGBUILD +++ /dev/null @@ -1,293 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) - -MODEL=olpc-xo1 -pkgbase=linux-${MODEL} -pkgver=5.6.6.arch1 -pkgrel=1 -pkgdesc='Linux for OLPC XO-1' -_srctag=v${pkgver%.*}-${pkgver##*.} -url="https://git.archlinux.org/linux.git/log/?h=$_srctag" -arch=(i486 i686 pentium4 x86_64) -license=(GPL2) -makedepends=( - bc kmod libelf - xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick - git -) -options=('!strip') -_srcname=archlinux-linux -source=( - "$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=$_srctag" - config # the main kernel config file - sphinx-workaround.patch -) -validpgpkeys=( - 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman - '8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig) -) -sha256sums=('SKIP' - 'dfd3310bc2d3c4adbaba5e4f2260a8a110706993be1c3e02a5ddfe88bf0c63ce' - '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c') - -export KBUILD_BUILD_HOST=archlinux -export KBUILD_BUILD_USER=$pkgbase -export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" - -prepare() { - cd $_srcname - - echo "Setting version..." - scripts/setlocalversion --save-scmversion - echo "-$pkgrel" > localversion.10-pkgrel - echo "${pkgbase#linux}" > localversion.20-pkgname - - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done - - echo "Setting config..." - cp ../config .config - make olddefconfig - - make -s kernelrelease > version - echo "Prepared $pkgbase version $( + +MODEL=olpc-xo1 +pkgbase=linux-${MODEL} +pkgver=5.6.6.arch1 +pkgrel=1 +pkgdesc='Linux for OLPC XO-1' +_srctag=v${pkgver%.*}-${pkgver##*.} +url="https://git.archlinux.org/linux.git/log/?h=$_srctag" +arch=(i486 i686 pentium4 x86_64) +license=(GPL2) +makedepends=( + bc kmod libelf + xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick + git +) +options=('!strip') +_srcname=archlinux-linux +source=( + "$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=$_srctag" + config.olpc-xo1 # the main kernel config file + sphinx-workaround.patch +) +validpgpkeys=( + 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds + '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman + '8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig) +) +sha256sums=('SKIP' + 'dfd3310bc2d3c4adbaba5e4f2260a8a110706993be1c3e02a5ddfe88bf0c63ce' + '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c') + +export KBUILD_BUILD_HOST=archlinux +export KBUILD_BUILD_USER=$pkgbase +export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" + +prepare() { + cd $_srcname + + echo "Setting version..." + scripts/setlocalversion --save-scmversion + echo "-$pkgrel" > localversion.10-pkgrel + echo "${pkgbase#linux}" > localversion.20-pkgname + + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + echo "Applying patch $src..." + patch -Np1 < "../$src" + done + + echo "Setting config..." + cp ../config.olpc-xo1 .config + make olddefconfig + + make -s kernelrelease > version + echo "Prepared $pkgbase version $(