Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-05-24 12:08:39 +0200
committerErich Eckner <git@eckner.net>2020-05-24 12:08:39 +0200
commit0e9cc0a37f4f3e42f801667de7c35d5c06547564 (patch)
tree731b2ba62375c5428bedfb60925092cc5ecbfe73
parent436ae0d954be2580adfefa23cd762bbf32d60fc5 (diff)
extra/linux-olpc-xo1: merge our changes to upstream
-rw-r--r--extra/linux-olpc-xo1/PKGBUILD50
1 files changed, 4 insertions, 46 deletions
diff --git a/extra/linux-olpc-xo1/PKGBUILD b/extra/linux-olpc-xo1/PKGBUILD
index fe1db08a..594fad3c 100644
--- a/extra/linux-olpc-xo1/PKGBUILD
+++ b/extra/linux-olpc-xo1/PKGBUILD
@@ -11,14 +11,14 @@ arch=(i486 i686 pentium4 x86_64)
license=(GPL2)
makedepends=(
bc kmod libelf
- xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick
+ xmlto python-sphinx python-sphinx_rtd_theme
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
+ config.${MODEL} # the main kernel config file
sphinx-workaround.patch
)
validpgpkeys=(
@@ -52,7 +52,7 @@ prepare() {
done
echo "Setting config..."
- cp ../config.olpc-xo1 .config
+ cp ../config.${MODEL} .config
make olddefconfig
make -s kernelrelease > version
@@ -62,7 +62,6 @@ prepare() {
build() {
cd $_srcname
make all
- make htmldocs
}
_package() {
@@ -103,11 +102,9 @@ _package-headers() {
localversion.* version vmlinux
install -Dt "$builddir/kernel" -m644 kernel/Makefile
install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
+ install -t "$builddir/arch/x86" -m644 arch/x86/Makefile_32.cpu
cp -t "$builddir" -a scripts
- # add objtool for external module building and enabled VALIDATION_STACK option
- install -Dt "$builddir/tools/objtool" tools/objtool/objtool
-
# add xfs and shmem for aufs building
mkdir -p "$builddir"/{fs/xfs,mm}
@@ -194,45 +191,6 @@ for _p in "${pkgname[@]}"; do
}"
done
-# vim:set ts=8 sts=2 sw=2 et:
-# upstream git revision: b048babc4fec7ba78bdd0f22e8894aa9b9db7893
-
-source_i486=('config.olpc-xo1')
-sha256sums_i486=('18730a94777487843be91aff97ca7553e6a666219c810fc570a920f877877c1d')
-
-for _rem_i486_dep in graphviz imagemagick; do
- if printf '%s\n' "${makedepends[@]}" | grep -qxF "${_rem_i486_dep}"; then
- makedepends=(${makedepends[@]/${_rem_i486_dep}/})
- makedepends_i686+=("${_rem_i486_dep}")
- makedepends_pentium4=("${makedepends_i686[@]}")
- fi
-done
-
-eval "$(
- if [ "${CARCH}" = 'i486' ]; then
- declare -f build | \
- sed '
- s/\bhtmldocs\b//
- '
- declare -f package_linux-docs | \
- sed '
- \@/Documentation/@ s/^\s*rm /\0-f /
- '
- fi
- declare -f prepare | \
- sed '
- s,\.\./config,../config.$MODEL,
- '
- declare -f package_linux-${MODEL}-headers | \
- sed '
- \,/tools/objtool" ,d
- \,arch/x86/Makefile, {
- a \
- install -t "${builddir}/arch/x86" -m644 arch/x86/Makefile_32.cpu
- }
- '
-)"
-
# use our tarballer instead of cloning from git
for ((i=0; i<${#source[@]}; i++)); do
infos=$(