Add support for opensuse

host-bin/enter-chroot

@@ -676,11 +676,18 @@ if [ "$NOLOGIN" != 1 ] && grep -q '^root:' "$passwd" 2>/dev/null; then
     fi
 
     # Launch systemd-logind if available and not already running
-    # Whitelisted for saucy and trusty
+    # Whitelisted for saucy, trusty and tumbleweed
     systemd_dir="`fixabslinks '/run/systemd'`"
-    if [ -x "$CHROOT/lib/systemd/systemd-logind" ] && \
+    systemd_logind="/lib/systemd/systemd-logind"
+    # openSUSE has a different systemd folder
+    if [ "$CHROOTRELEASE" = 'tumbleweed' ]; then
+        systemd_logind="/usr/lib/systemd/systemd-logind"
+    fi
+
+    if [ -x "$CHROOT$systemd_logind" ] && \
             [ ! -d "$systemd_dir" ] && \
-            [ "$CHROOTRELEASE" = 'saucy' -o "$CHROOTRELEASE" = 'trusty' ]; then
+            [ "$CHROOTRELEASE" = 'saucy' -o "$CHROOTRELEASE" = 'trusty' \
+            -o "$CHROOTRELEASE" = 'tumbleweed' ]; then
         # Every piece of systemd code ever assumes that this directory exists
         mkdir -p "$systemd_dir"
 
@@ -691,7 +698,7 @@ if [ "$NOLOGIN" != 1 ] && grep -q '^root:' "$passwd" 2>/dev/null; then
                   "$CHROOT/sys/fs/cgroup/systemd"
         fi
         # systemd-logind doesn't fork
-        chrootcmd "/lib/systemd/systemd-logind >/dev/null 2>&1 </dev/null &"
+        chrootcmd "${systemd_logind} >/dev/null 2>&1 </dev/null &"
     fi
 
     chrootcmd "/usr/local/bin/croutonfindnacld >/dev/null 2>&1 </dev/null &"

installer/opensuse/bootstrap

@@ -0,0 +1,46 @@
+#!/bin/sh -e
+# Copyright (c) 2016 The crouton Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This is a distro-specific bootstrap script, sourced from main.sh, and as such
+# has access to all of the variables set by main.sh, namely $tmp (the temporary
+# directory), $INSTALLERDIR/$DISTRO, $RELEASE, $BOOTSTRAP_RELEASE (if different
+# from $RELEASE), $ARCH, and $MIRROR.
+
+# Tumbleweed
+url_tumbleweed_armv7hl="http://download.opensuse.org/ports/armv7hl/tumbleweed/images/openSUSE-Tumbleweed-ARM-JeOS.armv7hl-rootfs.armv7l-Current.tbz"
+url_tumbleweed_aarch64="http://download.opensuse.org/ports/aarch64/tumbleweed/images/openSUSE-Tumbleweed-ARM-JeOS.aarch64-rootfs.aarch64-Current.tbz"
+
+# Leap
+url_leap_42_2_armv7hl="http://download.opensuse.org/ports/armv7hl/distribution/leap/42.2/appliances/openSUSE-Leap42.2-ARM-JeOS.armv7-rootfs.armv7l.tbz"
+url_leap_42_2_aarch64="http://download.opensuse.org/ports/aarch64/distribution/leap/42.2/appliances/openSUSE-Leap42.2-ARM-JeOS.aarch64-rootfs.aarch64.tbz"
+url_leap_42_3_aarch64="http://download.opensuse.org/ports/aarch64/distribution/leap/42.3/appliances/openSUSE-Leap42.3-ARM-JeOS.aarch64-rootfs.aarch64.tbz"
+
+BOOTSTRAP_ARCH="$ARCH"
+BOOTSTRAP_RELEASE="$RELEASE"
+
+# Rename factory to tumbleweed
+if [ "$RELEASE" = "factory" ]; then
+    BOOTSTRAP_RELEASE=tumbleweed
+elif [ "${RELEASE#leap}" != "$RELEASE" ]; then
+     BOOTSTRAP_RELEASE=$(echo "$RELEASE" | tr - _ | tr . _)
+     echo $BOOTSTRAP_RELEASE
+fi
+
+# fix up the good old toolchain/kernel naming conflict
+if [ "$ARCH" = "arm64" ]; then
+     BOOTSTRAP_ARCH=aarch64
+fi
+
+eval "URL=\"\${url_${BOOTSTRAP_RELEASE}_${BOOTSTRAP_ARCH}-}\""
+
+if [ -z "$URL" ]; then
+    echo "Unknown Distribution / Architecture: $BOOTSTRAP_RELEASE $BOOTSTRAP_ARCH" >&2
+    exit 1
+fi
+
+mkdir -p "$tmp/$subdir"
+curl -# -L --connect-timeout 60 --retry 2 "$URL" | tar -jx -C "$tmp/$subdir"
+
+rm -rf "$tmp/$subdir/dev/"*

installer/opensuse/defaults

@@ -0,0 +1,18 @@
+#!/bin/sh -e
+# Copyright (c) 2016 The crouton Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file is sourced from main.sh to update distro-specific defaults.
+# It must set at least ARCH and MIRROR if not already specified.
+
+if [ -z "$ARCH" ]; then
+    ARCH="$(uname -m)"
+fi
+
+case "$ARCH" in
+arm64 | aarch64) ARCH="arm64";;
+arm*) ARCH="armv7hl";;
+*) error 2 "Invalid architecture '$ARCH'.";;
+esac
+

installer/opensuse/getrelease.sh

@@ -0,0 +1,50 @@
+#!/bin/sh -e
+# Copyright (c) 2017 The crouton authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+USAGE="${0##*/} -a|-r /path/to/chroot
+
+Detects the release (-r) or arch (-a) of the chroot and prints it on stdout.
+Fails with an error code of 1 if the chroot does not belong to this distro."
+
+if [ "$#" != 2 ] || [ "$1" != '-a' -a "$1" != '-r' ]; then
+    echo "$USAGE" 1>&2
+    exit 2
+fi
+
+sources="${2%/}/etc/os-release"
+if [ ! -s "$sources" ]; then
+    exit 1
+fi
+
+# Create release name from /etc/os-release file
+# sed specialist can make that more elegant...
+rel="$(grep CPE_NAME "$sources" | cut -d ":" -f 4)"
+if [ "$rel" = "opensuse" -o "$rel" = "tumbleweed" ]; then
+    rel=tumbleweed
+elif [ "$rel" = "leap" ]; then
+    ver="$(grep CPE_NAME "$sources" | cut -d ":" -f 5)"
+    rel="$rel-${ver%\"}"
+else
+    exit 1
+fi
+
+# Print the architecture if requested
+# Why use sed if you know cut...
+sources="${2%/}/etc/products.d/openSUSE.prod"
+if [ ! -s "$sources" ]; then
+    exit 1
+fi
+
+if [ "$1" = '-a' ]; then
+    arch="$(grep "<arch>" "$sources" | cut -d '>' -f 2 | cut -d '<' -f 1)"
+    if [ "$arch" = "aarch64" ]; then
+        arch="arm64"
+    fi
+    echo "$arch"
+else
+    echo "$rel"
+fi
+
+exit 0

installer/opensuse/prepare

@@ -0,0 +1,130 @@
+#!/bin/sh -e
+# Copyright (c) 2016 The crouton Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This is a distro-specific continuation of the prepare.sh script.
+
+PKGEXT='rpm'
+DISTROAKA='opensuse'
+
+
+# install_dist: see install() in prepare.sh for details.
+install_dist() {
+    local pkgs='' params='' asdeps=''
+    while [ "$#" != 0 ]; do
+        if [ "$1" = "--minimal" ]; then
+            params='--no-recommends'
+        elif [ "$1" = "--asdeps" ]; then
+            shift
+            continue
+        else
+            break
+        fi
+        shift
+    done
+    while [ "$#" != 0 ]; do
+        if [ "$1" = '--' ]; then
+            shift
+            break
+        fi
+        pkgs="$pkgs $1"
+        shift
+    done
+    zypper -q install -y $params $pkgs $(list_uninstalled_dist - "$@") || return $?
+}
+
+
+# install_pkg_dist: see install_pkg() in prepare.sh for details.
+install_pkg_dist() {
+    local params=''
+    if [ "$1" = '--minimal' ]; then
+        params='--no-recommends'
+        shift
+    fi
+    if [ "$#" != 0 ]; then
+        zypper -q install -y $params "$@" || return $?
+    fi
+}
+
+
+# install_dummy_dist: see install_dummy() in prepare.sh for details.
+install_dummy_dist() {
+    if [ "$#" = 0 ]; then
+        return
+    fi
+    local pkgname="crouton-$1" pkgprovides="$1" requires=""
+    shift
+    while [ "$#" != 0 ]; do
+        if [ "$1" = '--' ]; then
+            shift
+            break
+        fi
+        pkgprovides="$pkgprovides, $1"
+        shift
+    done
+    local pkgdepends="$1"
+    if [ "$#" != 0 ]; then
+        shift
+        while [ "$#" != 0 ]; do
+            pkgdepends="$pkgdepends, $1"
+            shift
+        done
+    fi
+
+    if [ -n "$pkgdepends" ]; then
+        requires="Requires: ${pkgdepends}"
+    fi
+
+    local tmp="$(mktemp -d crouton.XXXXXX --tmpdir=/tmp)"
+    addtrap "rm -rf '$tmp'"
+    cat > "$tmp/dummy.spec" <<EOF
+Name: $pkgname
+Version: 1.0.0
+Release: 1.0.0
+Group: dummy
+Vendor: dummy
+License: %{vendor}
+Provides: $pkgprovides
+$requires
+Summary: Provides a dummy ${pkgname#*-} for crouton
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+%{summary}
+
+%files
+EOF
+    rpmbuild --define='_rpmdir "$tmp"' -bb "$tmp/dummy.spec" > "$tmp/build.log"
+    if [ $? != 0 ]; then
+        echo "ERROR: Could not build dummy rpm!"
+	exit 1
+    fi
+    pkg="$(awk '/^wrote:/ { print $2 }' < "$tmp/build.log")"
+    rm "$tmp/build.log"
+    zypper -q install -y --force-resolution "$pkg"
+}
+
+
+# remove_dist: see remove() in prepare.sh for details.
+remove_dist() {
+    zypper -q remove --clean-deps -y "$@"
+}
+
+
+# list_uninstalled_dist: see list_uninstalled() in prepare.sh for details.
+list_uninstalled_dist() {
+    local suffix="$1" pkg
+    shift
+    for pkg in "$@"; do
+        if ! zypper se -i "$pkg" 2>/dev/null | grep -q '^i'; then
+            echo -n "$pkg$suffix "
+        fi
+    done
+}
+
+# enable network ping for all users
+chmod u+s /usr/bin/ping
+
+# add rpmbuild for dummy packages
+install rpmbuild

installer/opensuse/releases

@@ -0,0 +1,3 @@
+tumbleweed
+leap-42.2
+leap-42.3

installer/prepare.sh

@@ -199,7 +199,7 @@ compile() {
     fi
     shift 2
     echo "Installing dependencies for $out..." 1>&2
-    local pkgs="gcc libc6-dev $*"
+    local pkgs="gcc opensuse=glibc-devel,libc6-dev $*"
     install --minimal --asdeps $pkgs </dev/null
     echo "Compiling $out..." 1>&2
     local tmp="`mktemp crouton.XXXXXX --tmpdir=/tmp`"

targets/audio

@@ -85,8 +85,8 @@ build_cras() {
     install --minimal alsa-utils \
         libasound2$pkgsuffix libspeexdsp1$pkgsuffix
 
-    install --minimal --asdeps gcc $pkgdepextra libc6-dev$pkgsuffix \
-        pkg-config libspeexdsp-dev$pkgsuffix
+    install --minimal --asdeps gcc $pkgdepextra opensuse=glibc-devel,libc6-dev$pkgsuffix \
+        pkg-config opensuse=speexdsp-devel,libspeexdsp-dev$pkgsuffix
 
     # precise does not allow libasound2-dev and libasound2-dev:i386 to be
     # installed simultaneously
@@ -99,6 +99,13 @@ build_cras() {
             ln -sfT libasound.so.2 "$libasoundso"
         fi
         ALSALIBDIR="/usr/lib$archextrapath/alsa-lib"
+    elif [ "$DISTROAKA" = "opensuse" ]; then
+        install --minimal --asdeps alsa-devel
+        if [ "$ARCH" = "arm64" -o "$ARCH" = "x86_64"]; then
+            ALSALIBDIR="/usr/lib64/alsa-lib"
+        else
+            ALSALIBDIR="/usr/lib/alsa-lib"
+        fi
     else
         install --minimal --asdeps libasound2-dev$pkgsuffix
         ALSALIBDIR="`PKG_CONFIG_PATH="$pkgconfigpath" \

targets/chromium

@@ -3,9 +3,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 if [ "${TARGETNOINSTALL:-c}" = 'c' ] &&
-        [ "$DISTRO" = 'debian' -o "$DISTRO" = 'kali' ] &&
+        [ "$DISTRO" = 'debian' -o "$DISTRO" = 'kali' -o "$DISTROAKA" = 'opensuse' ] &&
         [ "${ARCH#arm}" != "$ARCH" ]; then
-    error 99 "chromium target is not supported on Debian/ARM."
+    error 99 "chromium target is not supported on $DISTRO on ARM."
 fi
 REQUIRES='x11'
 DESCRIPTION="Chromium browser. Uses the distro's version, which may be old."

targets/cli-extra

@@ -9,7 +9,7 @@ CHROOTBIN='croutonpowerd'
 . "${TARGETSDIR:="$PWD"}/common"
 
 ### Append to prepare.sh:
-install dbus openssh-client kbd
+install opensuse=dbus-1,dbus opensuse=openssh,openssh-client kbd
 
 TIPS="$TIPS
 You can start a shell in a new VT via the startcli host command: sudo startcli

targets/core

@@ -110,7 +110,7 @@ fi
 fixkeyboardmode
 
 # Install critical packages
-install --minimal sudo wget ca-certificates apt-transport-https
+install --minimal sudo wget ca-certificates opensuse=,apt-transport-https
 
 # Generate and set default locale
 if [ ! -f '/etc/default/locale' ] && hash locale-gen 2>/dev/null; then

targets/extension

@@ -19,7 +19,7 @@ fi
 . "${TARGETSDIR:="$PWD"}/common"
 
 ### Append to prepare.sh:
-install x11-utils xsel
+install opensuse=xprop,x11-utils xsel
 
 compile websocket ''
 

targets/gnome

@@ -16,9 +16,9 @@ fi
 
 ### Append to prepare.sh:
 install --minimal evolution-data-server gnome-control-center \
-        gnome-screensaver gnome-session $legacy_session_package \
-        gnome-shell gnome-themes-standard gvfs-backends nautilus \
-        unzip gtk2-engines-pixbuf pulseaudio
+        opensuse=,gnome-screensaver gnome-session $legacy_session_package \
+        gnome-shell opensuse=gnome-themes,gnome-themes-standard gvfs-backends \
+        nautilus unzip opensuse=gtk2-engines,gtk2-engines-pixbuf pulseaudio
 
 TIPS="$TIPS
 You can start GNOME via the startgnome host command: sudo startgnome