aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2015-07-07 09:38:38 +0200
committerCarlo Landmeter <clandmeter@gmail.com>2015-07-07 09:48:12 +0200
commit1b8dc7c88d83530ed99c1a05b4473cab94d5f1a2 (patch)
treed57a55badbafbdfc81ad86d29d9f422ad066f7f3
parent4c33c4970dead95052cae7f7a5ad0bb87641c3b7 (diff)
downloadaports-1b8dc7c88d83530ed99c1a05b4473cab94d5f1a2.tar.bz2
aports-1b8dc7c88d83530ed99c1a05b4473cab94d5f1a2.tar.xz
testing/chromium: no subpkgs and rename sandbox
Seems sandbox (suid) bin is still needed even if we use newer user namespaces functions. Sandbox bin has incorrect filename, it has to be renamed when installed.
-rw-r--r--testing/chromium/APKBUILD25
1 files changed, 8 insertions, 17 deletions
diff --git a/testing/chromium/APKBUILD b/testing/chromium/APKBUILD
index 3d943b65e0..12827da0ce 100644
--- a/testing/chromium/APKBUILD
+++ b/testing/chromium/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=chromium
pkgver=43.0.2357.130
-pkgrel=6
+pkgrel=7
pkgdesc="chromium web browser"
url="http://www.chromium.org/"
arch="x86_64"
@@ -21,7 +21,7 @@ makedepends="$depends_dev xdg-utils yasm gperf bison flex perl python bash
paxmark findutils"
install=""
options=suid
-subpackages="$pkgname-doc $pkgname-sandbox $pkgname-chromedriver $pkgname-dbg"
+subpackages="$pkgname-doc"
source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
chromium-launcher.sh
chromium.default
@@ -160,6 +160,12 @@ package() {
"$pkgdir"/usr/lib/$pkgname/$bin || return 1
done
+ install -Dm4755 "$_builddir"/out/Release/chrome_sandbox \
+ "$pkgdir"/usr/lib/$pkgname/chrome-sandbox || return 1
+
+ install -Dm755 "$_builddir"/out/Release/chromedriver \
+ "$pkgdir"/usr/lib/$pkgname/chromedriver || return 1
+
for pak in out/Release/*.pak; do
install -Dm644 $pak \
"$pkgdir"/usr/lib/$pkgname/${pak##*/} || return 1
@@ -206,21 +212,6 @@ package() {
done
}
-chromedriver() {
- pkgdesc="WebDriver driver for the Chromium Browser"
- depends=
- install -Dm755 "$_builddir"/out/Release/chromedriver \
- "$subpkgdir"/usr/lib/$pkgname/chromedriver || return 1
-}
-
-sandbox() {
- # this is currently not support and moved to subpkg
- pkgdesc="Chromium sandbox suid helper"
- depends=
- install -Dm4755 "$_builddir"/out/Release/chrome_sandbox \
- "$subpkgdir"/usr/lib/$pkgname/chrome_sandbox || return 1
-}
-
md5sums="352e936a3fef5e6de87c9a911eb75d94 chromium-43.0.2357.130.tar.xz
cdd5fd06a4138a7b6bc954f532193817 chromium-launcher.sh
ecea1c003138f189f491cb06f267cc11 chromium.default