Search
SailfishOS Open Build Service
>
Projects
>
nemo
:
devel:hw
:
droid:tools
>
android-tools
> _service:gitpkg:0009-Added-latest-ubuntu-14.04-support-to-debian-version-.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File _service:gitpkg:0009-Added-latest-ubuntu-14.04-support-to-debian-version-.patch of Package android-tools
From 9dee737e9fa2aa35d70736fa4174dd328b147420 Mon Sep 17 00:00:00 2001 From: Tom Swindell <tom.swindell@jollamobile.com> Date: Tue, 22 Jul 2014 14:58:27 +0000 Subject: [PATCH] Added latest ubuntu 14.04 support to debian version check. Signed-off-by: Tom Swindell <tom.swindell@jollamobile.com> --- mer-android-chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mer-android-chroot b/mer-android-chroot index 358c864..f6fc1fb 100755 --- a/mer-android-chroot +++ b/mer-android-chroot @@ -247,7 +247,7 @@ do_it_all() { if grep squeeze ${uburoot}/etc/debian_version > /dev/null; then # For older 10.04 setarch x86_64 chroot ${uburoot} /usr/bin/sudo -i -u $user "if [ -d \"$cwd\" ]; then cd \"$cwd\"; fi; exec bash --init-file /parentroot/usr/share/ubu-chroot/mer-ubusdk-bash-setup -i"; - elif grep wheezy ${uburoot}/etc/debian_version > /dev/null; then + elif grep "wheezy\|jessie" ${uburoot}/etc/debian_version > /dev/null; then # This is for ubuntu 12.04 (arg quoting for sudo is different) setarch x86_64 chroot ${uburoot} /usr/bin/sudo -i -u $user exec bash -i -c "if [ -d \"$cwd\" ]; then cd \"$cwd\"; fi; exec bash --init-file /parentroot/usr/share/ubu-chroot/mer-ubusdk-bash-setup" else -- 1.8.4.5