diff options
author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2017-01-26 11:07:40 +0100 |
---|---|---|
committer | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2017-01-26 11:07:40 +0100 |
commit | 741e998382e7c66664576006b048c78daa1a341d (patch) | |
tree | 4ace3337cefa3e2bba5dc3d6ab66df3f317e4ec2 | |
parent | 8d06faa521ec12140346a26d4d6782cbccfd9616 (diff) |
stretch-arm64-alip: switch to LXQt
Replace our LXDE image with LXQt. We had LXQt images as alternative options so
far, let's make it default.
Change-Id: Ife114c68149c6d51de54485a42bca03be63ac4b1
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
23 files changed, 33 insertions, 420 deletions
diff --git a/stretch-arm64-lxqt/customization/hooks/22-display-manager-autologin.chroot b/stretch-arm64-alip/customization/hooks/22-display-manager-autologin.chroot index 84a6c7c..84a6c7c 100755 --- a/stretch-arm64-lxqt/customization/hooks/22-display-manager-autologin.chroot +++ b/stretch-arm64-alip/customization/hooks/22-display-manager-autologin.chroot diff --git a/stretch-arm64-alip/customization/hooks/22-lightdm-autologin.chroot b/stretch-arm64-alip/customization/hooks/22-lightdm-autologin.chroot deleted file mode 100755 index 695dc19..0000000 --- a/stretch-arm64-alip/customization/hooks/22-lightdm-autologin.chroot +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# Enable lightdm autologin for linaro user -if [ -e /etc/lightdm/lightdm.conf ]; then - sed -i "s|^#autologin-user=.*|autologin-user=linaro|" /etc/lightdm/lightdm.conf - sed -i "s|^#autologin-user-timeout=.*|autologin-user-timeout=0|" /etc/lightdm/lightdm.conf -fi diff --git a/stretch-arm64-lxqt/customization/hooks/23-customize-lxqt.chroot b/stretch-arm64-alip/customization/hooks/23-customize-lxqt.chroot index 63c578f..63c578f 100755 --- a/stretch-arm64-lxqt/customization/hooks/23-customize-lxqt.chroot +++ b/stretch-arm64-alip/customization/hooks/23-customize-lxqt.chroot diff --git a/stretch-arm64-alip/customization/package-lists/linaro.list.chroot b/stretch-arm64-alip/customization/package-lists/linaro.list.chroot index 9648b12..b912841 100644 --- a/stretch-arm64-alip/customization/package-lists/linaro.list.chroot +++ b/stretch-arm64-alip/customization/package-lists/linaro.list.chroot @@ -1,4 +1,5 @@ -# Packages needed for Linaro - ALIP +# Packages needed for Linaro - LXQt +#linaro-default-settings #ltrace 96boards-tools-common acpi-support-base @@ -10,8 +11,9 @@ apt apt-utils babeltrace bc -blueman +bluedevil bluez +breeze btrfs-tools build-essential bzip2 @@ -26,7 +28,7 @@ debconf debconf-i18n debian-keyring default-jre -dmz-cursor-theme +desktop-file-utils dnsmasq-base eject evtest @@ -38,14 +40,11 @@ fonts-freefont-ttf fonts-ipafont-gothic fonts-ipafont-mincho fonts-unfonts-core -gconf2 gdb gdbserver gdisk git glshim -gnome-keyring -gnome-system-tools gnupg gpsd gpsd-clients @@ -70,25 +69,32 @@ iputils-ping isc-dhcp-client iw kbd +kde-config-sddm +kde-window-manager kmod +kwin-x11 less libxatracker2 -lightdm -linaro-artwork -linaro-default-settings linaro-overlay-minimal lm-sensors locales lsb-release lsof -lxde -lxde-common -lxlauncher -lxmusic -lxsession-default-apps -lxsession-logout -lxshortcut -lxtask +lximage-qt +lxqt-about +lxqt-admin +lxqt-common +lxqt-config +lxqt-globalkeys +lxqt-notificationd +lxqt-openssh-askpass +lxqt-panel +lxqt-policykit +lxqt-powermanagement +lxqt-qtplugin +lxqt-runner +lxqt-session +lxqt-sudo makedev mawk mesa-utils @@ -103,14 +109,16 @@ network-manager-gnome nodejs-legacy npm ntpdate -obconf obexftp obexpushd -openbox openssh-client openssh-server parted -pavucontrol +pavucontrol-qt +pcmanfm-qt +phonon4qt5-backend-gstreamer +pinentry-qt +plasma-nm policykit-1 powerdebug powertop @@ -123,15 +131,19 @@ python-minimal python-mraa python-upm python3 +qterminal read-edid resolvconf rfkill rsyslog +sddm +sddm-theme-breeze ssh-import-id strace sudo systemd systemd-sysv +systemsettings trace-cmd udev unzip @@ -139,7 +151,6 @@ usb-modeswitch usbutils user-setup vim -vim-tiny wamerican wget whiptail @@ -147,8 +158,7 @@ wireless-tools wpasupplicant x11-utils x11-xserver-utils -xdg-user-dirs-gtk -xfce4-power-manager-plugins +xdg-user-dirs xinit xmms2-client-cli xmms2-plugin-mad diff --git a/stretch-arm64-lxqt/Makefile b/stretch-arm64-lxqt/Makefile deleted file mode 100755 index b93db0d..0000000 --- a/stretch-arm64-lxqt/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -# (C) 2012-2015 Fathi Boudra <fathi.boudra@linaro.org> - -# Calls all necessary live-build programs in the correct order to complete -# the bootstrap, chroot, binary, and source stage. - -# You need live-build package installed and superuser privileges. - -BUILD_NUMBER?=1 -BASEIMG=linaro-stretch-lxqt -IMAGEPREFIX=$(BASEIMG)-`date +%Y%m%d`-$(BUILD_NUMBER) -LOGFILE=$(IMAGEPREFIX).build-log.txt -CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2 -LISTFILE=$(IMAGEPREFIX).contents -PKGSFILE=$(IMAGEPREFIX).packages -TARGZFILE=$(IMAGEPREFIX).tar.gz -MD5SUMSFILE=$(IMAGEPREFIX).md5sums.txt -SHA1SUMSFILE=$(IMAGEPREFIX).sha1sums.txt - -all: - set -e; sudo lb build 2>&1 | tee $(LOGFILE) - if [ -f binary-tar.tar.gz ]; then \ - tar -jcf $(CONFIGFILE) auto/ config/ configure; \ - sudo mv binary.contents $(LISTFILE); \ - sudo mv chroot.packages.live $(PKGSFILE); \ - sudo mv binary-tar.tar.gz $(TARGZFILE); \ - md5sum $(LOGFILE) $(CONFIGFILE) $(LISTFILE) $(PKGSFILE) $(TARGZFILE) > $(MD5SUMSFILE); \ - sha1sum $(LOGFILE) $(CONFIGFILE) $(LISTFILE) $(PKGSFILE) $(TARGZFILE) > $(SHA1SUMSFILE); \ - fi - -clean: - sudo lb clean --purge - rm -f $(BASEIMG)-* - rm -rf config diff --git a/stretch-arm64-lxqt/README b/stretch-arm64-lxqt/README deleted file mode 100644 index 917e1f3..0000000 --- a/stretch-arm64-lxqt/README +++ /dev/null @@ -1,16 +0,0 @@ -* To build binary image: - * install live-build qemu-user-static - * run configure - * run make - -* Scripts: - * configure - * Makefile - -* Configuration Layout - -`-- ./config - -* Customization Layout - -`-- ./customization diff --git a/stretch-arm64-lxqt/configure b/stretch-arm64-lxqt/configure deleted file mode 100755 index 98fbbb9..0000000 --- a/stretch-arm64-lxqt/configure +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -# (C) 2012-2016 Fathi Boudra <fathi.boudra@linaro.org> - -# Create configuration for live-build. - -# You need live-build package installed. - -set -e - -echo "I: create configuration" -export LB_BOOTSTRAP_INCLUDE="apt-transport-https gnupg" -lb config \ - --apt-indices false \ - --apt-recommends false \ - --apt-secure false \ - --architectures arm64 \ - --archive-areas 'main contrib non-free' \ - --backports false \ - --binary-filesystem ext4 \ - --binary-images tar \ - --bootappend-live "hostname=linaro-lxqt username=linaro" \ - --bootstrap-qemu-arch arm64 \ - --bootstrap-qemu-static /usr/bin/qemu-aarch64-static \ - --cache false \ - --chroot-filesystem none \ - --compression gzip \ - --debootstrap-options "--variant=minbase --include=apt-transport-https,gnupg" \ - --distribution stretch \ - --gzip-options '-9 --rsyncable' \ - --iso-publisher 'Linaro; http://www.linaro.org/; linaro-dev@lists.linaro.org' \ - --iso-volume 'Linaro Stretch $(date +%Y%m%d-%H:%M)' \ - --linux-flavours none \ - --linux-packages none \ - --mode debian \ - --security true \ - --system normal \ - --updates true - -echo "I: copy customization" -test -d customization && cp -rf customization/* config/ - -echo "I: done" diff --git a/stretch-arm64-lxqt/customization/archives/linaro-overlay-repo.key.chroot b/stretch-arm64-lxqt/customization/archives/linaro-overlay-repo.key.chroot deleted file mode 100644 index 31f1900..0000000 --- a/stretch-arm64-lxqt/customization/archives/linaro-overlay-repo.key.chroot +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) - -mQENBFFKYd4BCAD1znxWHazOdG+F4BSPXdT3OrX3bwScw7ZVpyY9v4kNJwpr/PSj -BICrpFPY0OkX7TjvtFAGTJF8YA0hnq5GFA2YVCRd1Xplz0zeS/ktMDEYEBA1B4Mk -1wzX1Kp7LyJEntYBtd9g0Ge3f8Z4DCOTG15RnEONYXtbqdZ6xHGwDJtxyzU+ZPaH -RfxGDdHlIKmCaV4W17zXoJOW7KIR1NwakfgBBUgPVH+i1iuIvtniKe6mAvAUDfmN -DOMaMgofzIshKkq1wncwBmW81eW9Mg+JzTZaa0XAah1anbdCMoCS91txG2O3Gj1z -OF1tY0WXYL9oPeBxDoN+KgKPyehKiSRwQ+0XABEBAAG0E0xpbmFybyByZXBvc2l0 -b3JpZXOJATgEEwECACIFAlFKYd4CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheA -AAoJEOE9iPfjwdVsqAoH/RGrCKW1b9jImsxVUqrBfHPekiFk44JiG04f46qY7u/l -ZiWgsayBcE9JInUQF7GWYVamgj55263mOZfsezxEtxr+KWz0ny6miyQH+51XpI74 -8+6ljExfnYR/Fdkiplcc+Fr5oGWBZXNmTedo0nYWl3aVsjCgl7/wMt/hwbx3J/aA -66/CmG2IMAEwbXdedrk+hiTNBjBaaKnkiqCX7fOstE1Ie0q7ro6d0nhkZezxVK1a -GSOsIE2xtTOPlVp9k3YmxVVisZIRjIcEJu6YnuBI2G4MaOh6RJTQpw9Hprr58Z6v -vzJBYZzXnLMl7RrXEw0NIYmPcEM6m5cphUlDpRBd8Tg= -=dkH9 ------END PGP PUBLIC KEY BLOCK----- diff --git a/stretch-arm64-lxqt/customization/archives/linaro-overlay-repo.list.chroot b/stretch-arm64-lxqt/customization/archives/linaro-overlay-repo.list.chroot deleted file mode 100644 index 31c2b30..0000000 --- a/stretch-arm64-lxqt/customization/archives/linaro-overlay-repo.list.chroot +++ /dev/null @@ -1,2 +0,0 @@ -deb http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main -deb-src http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main diff --git a/stretch-arm64-lxqt/customization/hooks/01-setup_user_linaro.chroot b/stretch-arm64-lxqt/customization/hooks/01-setup_user_linaro.chroot deleted file mode 100755 index 9c65f97..0000000 --- a/stretch-arm64-lxqt/customization/hooks/01-setup_user_linaro.chroot +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -echo "I: create linaro user" -adduser --gecos linaro --disabled-login linaro - -echo "I: set linaro user password" -echo "linaro:linaro" | chpasswd diff --git a/stretch-arm64-lxqt/customization/hooks/02-add_linaro_to_groups.chroot b/stretch-arm64-lxqt/customization/hooks/02-add_linaro_to_groups.chroot deleted file mode 100755 index ad43cb7..0000000 --- a/stretch-arm64-lxqt/customization/hooks/02-add_linaro_to_groups.chroot +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -x - -DEFGROUPS="adm,dialout,cdrom,audio,dip,video,plugdev,bluetooth,pulse-access,sudo,systemd-journal,netdev,staff" - -IFS=',' -for group in $DEFGROUPS; do - /bin/egrep -i "^$group" /etc/group - if [ $? -eq 0 ]; then - echo "Group '$group' exists in /etc/group" - else - echo "Group '$group' does not exists in /etc/group, creating" - groupadd $group - fi -done -unset IFS - -echo "I: add linaro to ($DEFGROUPS) groups" -usermod -a -G ${DEFGROUPS} linaro diff --git a/stretch-arm64-lxqt/customization/hooks/03-check_sudoers_for_admin.chroot b/stretch-arm64-lxqt/customization/hooks/03-check_sudoers_for_admin.chroot deleted file mode 100755 index fe86124..0000000 --- a/stretch-arm64-lxqt/customization/hooks/03-check_sudoers_for_admin.chroot +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# check to make sure sudoers file has ref for the sudo group -SUDOEXISTS="$(awk '$1 == "%sudo" { print $1 }' /etc/sudoers)" -if [ -z "$SUDOEXISTS" ]; then - # append sudo entry to sudoers - echo "# Members of the sudo group may gain root privileges" >> /etc/sudoers - echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -fi - -# make sure that NOPASSWD is set for %sudo -# expecially in the case that we didn't add it to /etc/sudoers -# just blow the %sudo line away and force it to be NOPASSWD -sed -i -e ' -/\%sudo/ c \ -%sudo ALL=(ALL) NOPASSWD: ALL -' /etc/sudoers diff --git a/stretch-arm64-lxqt/customization/hooks/21-silence-systemd.chroot b/stretch-arm64-lxqt/customization/hooks/21-silence-systemd.chroot deleted file mode 100755 index 14849bc..0000000 --- a/stretch-arm64-lxqt/customization/hooks/21-silence-systemd.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# Make systemd less spammy - -sed -i 's/#LogLevel=info/LogLevel=warning/' \ - /etc/systemd/system.conf - -sed -i 's/#LogTarget=journal-or-kmsg/LogTarget=journal/' \ - /etc/systemd/system.conf diff --git a/stretch-arm64-lxqt/customization/hooks/22-disable-systemd-services.chroot b/stretch-arm64-lxqt/customization/hooks/22-disable-systemd-services.chroot deleted file mode 100755 index 3c0bbdd..0000000 --- a/stretch-arm64-lxqt/customization/hooks/22-disable-systemd-services.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# workaround 90s delay -services=(NetworkManager systemd-networkd) -for service in ${services[@]}; do - systemctl disable ${service}-wait-online.service -done - -systemctl mask wpa_supplicant@ diff --git a/stretch-arm64-lxqt/customization/hooks/98-resolvconf.binary b/stretch-arm64-lxqt/customization/hooks/98-resolvconf.binary deleted file mode 100755 index f6a3898..0000000 --- a/stretch-arm64-lxqt/customization/hooks/98-resolvconf.binary +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -echo "I: Create /etc/resolv.conf link" -ln -sf /etc/resolvconf/run/resolv.conf binary/etc/resolv.conf -echo "I: Install fallback DNS to 8.8.8.8" -echo "nameserver 8.8.8.8" > binary/etc/resolvconf/resolv.conf.d/tail diff --git a/stretch-arm64-lxqt/customization/hooks/99-cleanup_proxy.binary b/stretch-arm64-lxqt/customization/hooks/99-cleanup_proxy.binary deleted file mode 100755 index 751faf5..0000000 --- a/stretch-arm64-lxqt/customization/hooks/99-cleanup_proxy.binary +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -echo "I: Clean up proxy" -sed -i "s|localhost:3142/||" ./binary/etc/apt/sources.list -sed -i "s|localhost:3142/||" ./binary/etc/apt/sources.list.d/*.list diff --git a/stretch-arm64-lxqt/customization/includes.chroot/etc/default/locale b/stretch-arm64-lxqt/customization/includes.chroot/etc/default/locale deleted file mode 100644 index f9c983c..0000000 --- a/stretch-arm64-lxqt/customization/includes.chroot/etc/default/locale +++ /dev/null @@ -1 +0,0 @@ -LANG=C.UTF-8 diff --git a/stretch-arm64-lxqt/customization/includes.chroot/etc/hostname b/stretch-arm64-lxqt/customization/includes.chroot/etc/hostname deleted file mode 100644 index 2e84782..0000000 --- a/stretch-arm64-lxqt/customization/includes.chroot/etc/hostname +++ /dev/null @@ -1 +0,0 @@ -linaro-lxqt diff --git a/stretch-arm64-lxqt/customization/includes.chroot/etc/hosts b/stretch-arm64-lxqt/customization/includes.chroot/etc/hosts deleted file mode 100644 index b553792..0000000 --- a/stretch-arm64-lxqt/customization/includes.chroot/etc/hosts +++ /dev/null @@ -1,7 +0,0 @@ -127.0.0.1 localhost -::1 localhost ip6-localhost ip6-loopback -fe00::0 ip6-localnet -ff00::0 ip6-mcastprefix -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters -127.0.1.1 linaro-lxqt diff --git a/stretch-arm64-lxqt/customization/includes.chroot/etc/kernel-img.conf b/stretch-arm64-lxqt/customization/includes.chroot/etc/kernel-img.conf deleted file mode 100644 index d24d4df..0000000 --- a/stretch-arm64-lxqt/customization/includes.chroot/etc/kernel-img.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Kernel image management overrides -# See kernel-img.conf(5) for details -do_symlinks = yes -do_bootloader = no -do_initrd = yes -link_in_boot = yes diff --git a/stretch-arm64-lxqt/customization/includes.chroot/etc/rc.local b/stretch-arm64-lxqt/customization/includes.chroot/etc/rc.local deleted file mode 100755 index bedc8cf..0000000 --- a/stretch-arm64-lxqt/customization/includes.chroot/etc/rc.local +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -e -# -# rc.local -# -# This script is executed at the end of each multiuser runlevel. -# Make sure that the script will "exit 0" on success or any other -# value on error. -# -# In order to enable or disable this script just change the execution -# bits. -# -# By default this script does nothing. - -# Generate the SSH keys if non-existent -test -f /etc/ssh/ssh_host_rsa_key || dpkg-reconfigure openssh-server - -exit 0 diff --git a/stretch-arm64-lxqt/customization/package-lists/linaro.list.chroot b/stretch-arm64-lxqt/customization/package-lists/linaro.list.chroot deleted file mode 100644 index b912841..0000000 --- a/stretch-arm64-lxqt/customization/package-lists/linaro.list.chroot +++ /dev/null @@ -1,172 +0,0 @@ -# Packages needed for Linaro - LXQt -#linaro-default-settings -#ltrace -96boards-tools-common -acpi-support-base -adduser -alsa-base -alsa-utils -anacron -apt -apt-utils -babeltrace -bc -bluedevil -bluez -breeze -btrfs-tools -build-essential -bzip2 -ca-certificates -chromium -console-setup -cpufrequtils -crda -curl -dbus-x11 -debconf -debconf-i18n -debian-keyring -default-jre -desktop-file-utils -dnsmasq-base -eject -evtest -fbset -file -fonts-arphic-ukai -fonts-arphic-uming -fonts-freefont-ttf -fonts-ipafont-gothic -fonts-ipafont-mincho -fonts-unfonts-core -gdb -gdbserver -gdisk -git -glshim -gnupg -gpsd -gpsd-clients -gstreamer1.0-libav -gstreamer1.0-plugins-bad -gstreamer1.0-plugins-good -gstreamer1.0-tools -gvfs -hostapd -htop -i2c-tools -idlestat -ifupdown -initramfs-tools -initscripts -input-utils -iotop -iperf -iproute2 -iptables -iputils-ping -isc-dhcp-client -iw -kbd -kde-config-sddm -kde-window-manager -kmod -kwin-x11 -less -libxatracker2 -linaro-overlay-minimal -lm-sensors -locales -lsb-release -lsof -lximage-qt -lxqt-about -lxqt-admin -lxqt-common -lxqt-config -lxqt-globalkeys -lxqt-notificationd -lxqt-openssh-askpass -lxqt-panel -lxqt-policykit -lxqt-powermanagement -lxqt-qtplugin -lxqt-runner -lxqt-session -lxqt-sudo -makedev -mawk -mesa-utils -mesa-utils-extra -modemmanager -mutrace -net-tools -netbase -netcat-openbsd -netperf -network-manager-gnome -nodejs-legacy -npm -ntpdate -obexftp -obexpushd -openssh-client -openssh-server -parted -pavucontrol-qt -pcmanfm-qt -phonon4qt5-backend-gstreamer -pinentry-qt -plasma-nm -policykit-1 -powerdebug -powertop -ppp -procps -psmisc -pulseaudio-module-bluetooth -python-libsoc -python-minimal -python-mraa -python-upm -python3 -qterminal -read-edid -resolvconf -rfkill -rsyslog -sddm -sddm-theme-breeze -ssh-import-id -strace -sudo -systemd -systemd-sysv -systemsettings -trace-cmd -udev -unzip -usb-modeswitch -usbutils -user-setup -vim -wamerican -wget -whiptail -wireless-tools -wpasupplicant -x11-utils -x11-xserver-utils -xdg-user-dirs -xinit -xmms2-client-cli -xmms2-plugin-mad -xmms2-plugin-pulse -xmms2-plugin-vorbis -xserver-xorg -xserver-xorg-input-evdev -xserver-xorg-video-fbdev -xserver-xorg-video-modesetting -xterm -zip diff --git a/stretch-arm64-lxqt/customization/preseed/dictionaries-common.cfg.chroot b/stretch-arm64-lxqt/customization/preseed/dictionaries-common.cfg.chroot deleted file mode 100644 index b86c980..0000000 --- a/stretch-arm64-lxqt/customization/preseed/dictionaries-common.cfg.chroot +++ /dev/null @@ -1 +0,0 @@ -dictionaries-common dictionaries-common/default-wordlist select american (American English) |