Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LXQT #2525

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

LXQT #2525

Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions host-bin/startlxqt
Original file line number Diff line number Diff line change
@@ -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.

set -e

APPLICATION="${0##*/}"

USAGE="$APPLICATION [options]

Wraps enter-chroot to start an LXQT session.
By default, it will log into the primary user on the first chroot found.

Options are directly passed to enter-chroot; run enter-chroot to list them."

exec sh -e "`dirname "\`readlink -f "$0"\`"`/enter-chroot" -t lxqt "$@" "" \
exec xinit /usr/bin/startlxqt
29 changes: 29 additions & 0 deletions targets/lxqt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/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.

if [ "${TARGETNOINSTALL:-c}" = 'c' ]; then
if release -lt trusty; then
error 99 "LXQT packages are not available for Ubuntu releases prior to xenial."
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trusty or xenial?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this case, trusty.
Prior to trusty, lxqt is not available at all as far as I've been able to find.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool. I think the text needs to be fixed, then.

fi
if release -lt stretch; then
error 99 "LXQT packages are not available for Debian releases prior to stretch."
fi
if release -lt kali-rolling; then
error 99 "LXQT packages are not available for Kali Linux prior to kali-rolling."
fi
fi

REQUIRES='x11'
DESCRIPTION='Installs the LXQT desktop environment. (Approx. 1GB)'
HOSTBIN='startlxqt'
CHROOTBIN='crouton-noroot startlxqt'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

crouton isn't responsible for installing startlxqt inside the chroot since you're using the distro-provided script/binary.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, sorry, startlxqt should be installed. In chroot-bin, add a symlink to crouton-noroot called startlxqt.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added the symlink: startlxqt -> crouton-noroot
Just let me know if/when you want the commits squashed.

. "${TARGETSDIR:="$PWD"}/common"

### Append to prepare.sh:
install lxqt lxqt-common openbox

TIPS="$TIPS
You can start LXQT via the startlxqt host command: sudo startlxqt
"
2 changes: 1 addition & 1 deletion test/tests/x0-alltargets
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ for target in "$SCRIPTDIR/targets/"*; do
# Some other targets do not require testing in this context,
# or have their own w* tests
for blacklist in audio core x11 xephyr xiwi xorg \
e17 gnome kde lxde unity xbmc xfce; do
e17 gnome kde lxde lxqt unity xbmc xfce; do
if [ "$target" = "$blacklist" ]; then
break
fi
Expand Down