Merge branch 'testing' of https://tildegit.org/tildelinux/lb-config into main

Reviewed-on: tildelinux/lb-config#1

.drone.yml

@@ -0,0 +1,123 @@
+---
+kind: pipeline
+type: docker
+name: main
+
+clone:
+  disable: true
+
+steps:
+- name: build_img
+  image: debian:buster
+  privileged: true
+  volumes:
+  - name: builds
+    path: /tl-builds
+  - name: proc
+    path: /proc
+  - name: pts
+    path: /dev/pts
+  commands:
+  - apt-get update
+  - apt-get install -y live-build
+  - apt-get install -y git
+  - lb config
+  - rm -r config
+  - git clone --recurse-submodules -b main https://tildegit.org/tildelinux/lb-config config
+  - lb build 
+  - mv live-image-amd64.img /tl-builds/tildelinux.img
+- name: sha512sum
+  image: debian:buster
+  privileged: true
+  volumes:
+  - name: builds
+    path: /tl-builds
+  commands:
+  - cd /tl-builds
+  - sha512sum *.img > SHA512SUMS
+trigger:
+  branch: main
+
+volumes:
+- name: builds
+  host:
+    path: /home/sose/tl-builds
+- name: proc
+  host:
+    path: /proc
+- name: pts
+  host:
+    path: /dev/pts
+
+---
+kind: pipeline
+type: docker
+name: testing
+
+clone:
+  disable: true
+
+steps:
+- name: build_img
+  image: debian:buster
+  privileged: true
+  volumes:
+  - name: builds
+    path: /tl-builds
+  - name: proc
+    path: /proc
+  - name: pts
+    path: /dev/pts
+  commands:
+  - apt-get update
+  - apt-get install -y live-build
+  - apt-get install -y syslinux-efi
+  - apt-get install -y git
+  - lb config
+  - rm -r config
+  - git clone --recurse-submodules -b testing https://tildegit.org/tildelinux/lb-config config
+  - lb build 
+  - mv live-image-amd64.img /tl-builds/testing/tildelinux-testing.img
+- name: build_img_nopersist
+  image: debian:buster
+  privileged: true
+  volumes:
+  - name: builds
+    path: /tl-builds
+  - name: proc
+    path: /proc
+  - name: pts
+    path: /dev/pts
+  commands:
+  - apt-get update
+  - apt-get install -y live-build
+  - apt-get install -y syslinux-efi
+  - apt-get install -y git
+  - lb clean
+  - cd config
+  - git apply patches/0001-remove-peristence.patch
+  - cd ..
+  - lb build 
+  - mv live-image-amd64.img /tl-builds/testing/tildelinux-testing-nopersistence.img
+- name: sha512sum
+  image: debian:buster
+  privileged: true
+  volumes:
+  - name: builds
+    path: /tl-builds
+  commands:
+  - cd /tl-builds/testing
+  - sha512sum *.img > SHA512SUMS
+trigger:
+  branch: testing
+
+volumes:
+- name: builds
+  host:
+    path: /home/sose/tl-builds
+- name: proc
+  host:
+    path: /proc
+- name: pts
+  host:
+    path: /dev/pts

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "includes.chroot/root/tl-setup"]
-	path = includes.chroot/root/tl-setup
+[submodule "includes.chroot/tilde/tl-setup"]
+	path = includes.chroot/tilde/tl-setup
 	url = https://tildegit.org/tildelinux/tl-setup

hooks/live/0060-configure-syslinux-efi.hook.binary

@@ -0,0 +1,7 @@
+#!/bin/sh
+echo "Configuring Syslinux EFI bootloader..."
+mkdir -p "EFI/BOOT"
+cp "/usr/lib/SYSLINUX.EFI/efi64/syslinux.efi" "EFI/BOOT/BOOTX64.efi"
+cp "/usr/lib/syslinux/modules/efi64/"* "EFI/BOOT"
+cp "syslinux/"*.cfg "EFI/BOOT"
+cp "syslinux/splash.png" "EFI/BOOT"

includes.chroot/etc/calamares/branding/tildelinux/branding.desc

@@ -0,0 +1,222 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Product branding information. This influences some global
+# user-visible aspects of Calamares, such as the product
+# name, window behavior, and the slideshow during installation.
+#
+# Additional styling can be done using the stylesheet.qss
+# file, also in the branding directory.
+---
+componentName: tildelinux
+
+
+### WELCOME / OVERALL WORDING
+#
+# These settings affect some overall phrasing and looks,
+# which are most visible in the welcome page.
+
+# This selects between different welcome texts. When false, uses
+# the traditional "Welcome to the %1 installer.", and when true,
+# uses "Welcome to the Calamares installer for %1." This allows
+# to distinguish this installer from other installers for the
+# same distribution.
+welcomeStyleCalamares:   false
+
+# Should the welcome image (productWelcome, below) be scaled
+# up beyond its natural size? If false, the image does not grow
+# with the window but remains the same size throughout (this
+# may have surprising effects on HiDPI monitors).
+welcomeExpandingLogo:   true
+
+### WINDOW CONFIGURATION
+#
+# The settings here affect the placement of the Calamares
+# window through hints to the window manager and initial
+# sizing of the Calamares window.
+
+# Size and expansion policy for Calamares.
+#  - "normal" or unset, expand as needed, use *windowSize*
+#  - "fullscreen", start as large as possible, ignore *windowSize*
+#  - "noexpand", don't expand automatically, use *windowSize*
+windowExpanding:    normal
+
+# Size of Calamares window, expressed as w,h. Both w and h
+# may be either pixels (suffix px) or font-units (suffix em).
+#   e.g.    "800px,600px"
+#           "60em,480px"
+# This setting is ignored if "fullscreen" is selected for
+# *windowExpanding*, above. If not set, use constants defined
+# in CalamaresUtilsGui, 800x520.
+windowSize: 800px,520px
+
+# Placement of Calamares window. Either "center" or "free".
+# Whether "center" actually works does depend on the window
+# manager in use (and only makes sense if you're not using
+# *windowExpanding* set to "fullscreen").
+windowPlacement: center
+
+### PANELS CONFIGURATION
+#
+# Calamares has a main content area, and two panels (navigation
+# and progress / sidebar). The panels can be controlled individually,
+# or switched off. If both panels are switched off, the layout of
+# the main content area loses its margins, on the assumption that
+# you're doing something special.
+
+# Kind of sidebar (panel on the left, showing progress).
+#  - "widget" or unset, use traditional sidebar (logo, items)
+#  - "none", hide it entirely
+#  - "qml", use calamares-sidebar.qml from branding folder
+# In addition, you **may** specify a side, separated by a comma,
+# from the kind. Valid sides are:
+#  - "left" (if not specified, uses this)
+#  - "right"
+#  - "top"
+#  - "bottom"
+# For instance, "widget,right" is valid; so is "qml", which defaults
+# to putting the sidebar on the left. Also valid is "qml,top".
+# While "widget,top" is valid, the widgets code is **not** flexible
+# and results will be terrible.
+sidebar: widget
+
+# Kind of navigation (button panel on the bottom).
+#  - "widget" or unset, use traditional navigation
+#  - "none", hide it entirely
+#  - "qml", use calamares-navigation.qml from branding folder
+# In addition, you **may** specify a side, separated by a comma,
+# from the kind. The same sides are valid as for *sidebar*,
+# except the default is *bottom*.
+navigation: widget
+
+
+### STRINGS, IMAGES AND COLORS
+#
+# This section contains the "branding proper" of names
+# and images, rather than global-look settings.
+
+# These are strings shown to the user in the user interface.
+# There is no provision for translating them -- since they
+# are names, the string is included as-is.
+#
+# The four Url strings are the Urls used by the buttons in
+# the welcome screen, and are not shown to the user. Clicking
+# on the "Support" button, for instance, opens the link supportUrl.
+# If a Url is empty, the corresponding button is not shown.
+#
+# bootloaderEntryName is how this installation / distro is named
+# in the boot loader (e.g. in the GRUB menu).
+#
+# These strings support substitution from /etc/os-release
+# if KDE Frameworks 5.58 are available at build-time. When
+# enabled, @{var-name} is replaced by the equivalent value
+# from os-release. All the supported var-names are in all-caps,
+# and are listed on the FreeDesktop.org site,
+#       https://www.freedesktop.org/software/systemd/man/os-release.html
+# Note that ANSI_COLOR and CPE_NAME don't make sense here, and
+# are not supported (the rest are). Remember to quote the string
+# if it contains substitutions, or you'll get YAML exceptions.
+#
+# The *Url* entries are used on the welcome page, and they
+# are visible as buttons there if the corresponding *show* keys
+# are set to "true" (they can also be overridden).
+strings:
+    productName:         "Tildelinux"
+    shortProductName:    Tildelinux
+    version:             96
+    shortVersion:        96
+    versionedName:       Tildelinux 96
+    shortVersionedName:  Tildelinux 96
+    bootloaderEntryName: Tildelinux
+#    productUrl:          https://calamares.io/
+#    supportUrl:          https://github.com/calamares/calamares/issues
+#    knownIssuesUrl:      https://calamares.io/about/
+#    releaseNotesUrl:     https://calamares.io/about/
+#    donateUrl:           https://kde.org/community/donations/index.php
+
+# These images are loaded from the branding module directory.
+#
+# productBanner is an optional image, which if present, will be shown
+#       on the welcome page of the application, above the welcome text.
+#       It is intended to have a width much greater than height.
+#       It is displayed at 64px height (also on HiDPI).
+#       Recommended size is 64px tall, and up to 460px wide.
+# productIcon is used as the window icon, and will (usually) be used
+#       by the window manager to represent the application. This image
+#       should be square, and may be displayed by the window manager
+#       as small as 16x16 (but possibly larger).
+# productLogo is used as the logo at the top of the left-hand column
+#       which shows the steps to be taken. The image should be square,
+#       and is displayed at 80x80 pixels (also on HiDPI).
+# productWallpaper is an optional image, which if present, will replace
+#       the normal solid background on every page of the application.
+#       It can be any size and proportion,
+#       and will be tiled to fit the entire window.
+#       For a non-tiled wallpaper, the size should be the same as
+#       the overall window, see *windowSize* above (800x520).
+# productWelcome is shown on the welcome page of the application in
+#       the middle of the window, below the welcome text. It can be
+#       any size and proportion, and will be scaled to fit inside
+#       the window. Use `welcomeExpandingLogo` to make it non-scaled.
+#       Recommended size is 320x150.
+#
+# These filenames can also use substitutions from os-release (see above).
+images:
+    # productBanner:       "banner.png"
+    productIcon:         ""
+    productLogo:         ""
+    # productWallpaper:    "wallpaper.png"
+    # productWelcome:      "languages.png"
+
+# Colors for text and background components.
+#
+#  - sidebarBackground is the background of the sidebar
+#  - sidebarText is the (foreground) text color
+#  - sidebarTextHighlight sets the background of the selected (current) step.
+#    Optional, and defaults to the application palette.
+#  - sidebarSelect is the text color of the selected step.
+#
+# These colors can **also** be set through the stylesheet, if the
+# branding component also ships a stylesheet.qss. Then they are
+# the corresponding CSS attributes of #sidebarApp.
+style:
+   sidebarBackground:    "#040304"
+   sidebarText:          "#3DE57A"
+   sidebarTextSelect:    "#3DE57A"
+   sidebarTextHighlight: "#211921"
+
+### SLIDESHOW
+#
+# The slideshow is displayed during execution steps (e.g. when the
+# installer is actually writing to disk and doing other slow things).
+
+# The slideshow can be a QML file (recommended) which can display
+# arbitrary things -- text, images, animations, or even play a game --
+# during the execution step. The QML **is** abruptly stopped when the
+# execution step is done, though, so maybe a game isn't a great idea.
+#
+# The slideshow can also be a sequence of images (not recommended unless
+# you don't want QML at all in your Calamares). The images are displayed
+# at a rate of 1 every 2 seconds during the execution step.
+#
+# To configure a QML file, list a single filename:
+#   slideshow:               "show.qml"
+# To configure images, like the filenames (here, as an inline list):
+slideshow: [ "/usr/share/images/tildelinux/verse.png" ]
+# slideshow:               "show.qml"
+# slideshow:               "show.qml"
+
+# There are two available APIs for a QML slideshow:
+#  - 1 (the default) loads the entire slideshow when the installation-
+#      slideshow page is shown and starts the QML then. The QML
+#      is never stopped (after installation is done, times etc.
+#      continue to fire).
+#  - 2 loads the slideshow on startup and calls onActivate() and
+#      onLeave() in the root object. After the installation is done,
+#      the show is stopped (first by calling onLeave(), then destroying
+#      the QML components).
+#
+# An image slideshow does not need to have the API defined.
+# slideshowAPI: 2
+
+

includes.chroot/etc/calamares/modules/mount.conf

@@ -0,0 +1,39 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Mount filesystems in the target (generally, before treating the
+# target as a usable chroot / "live" system). Filesystems are
+# automatically mounted from the partitioning module. Filesystems
+# listed here are **extra**. The filesystems listed in *extraMounts*
+# are mounted in all target systems. The filesystems listed in
+# *extraMountsEfi* are mounted in the target system **only** if
+# the host machine uses UEFI.
+---
+# Extra filesystems to mount. The key's value is a list of entries; each
+# entry has four keys:
+#   - device    The device node to mount
+#   - fs        The filesystem type to use
+#   - mountPoint Where to mount the filesystem
+#   - options (optional) Extra options to pass to mount(8)
+#
+extraMounts:
+    - device: proc
+      fs: proc
+      mountPoint: /proc
+    - device: sys
+      fs: sysfs
+      mountPoint: /sys
+    - device: /dev
+      mountPoint: /dev
+      options: bind
+    - device: tmpfs
+      fs: tmpfs
+      mountPoint: /run
+    - device: /run/udev
+      mountPoint: /run/udev
+      options: bind
+
+extraMountsEfi:
+    - device: efivarfs
+      fs: efivarfs
+      mountPoint: /sys/firmware/efi/efivars

includes.chroot/etc/calamares/modules/shellprocess.conf

@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration for the shell process job.
+#
+# Executes a list of commands found under the key *script*.
+# If the top-level key *dontChroot* is true, then the commands
+# are executed in the context of the live system, otherwise
+# in the context of the target system. In all of the commands,
+# the following substitutions will take place:
+#  - `@@ROOT@@` is replaced by the root mount point of the **target**
+#    system from the point of view of the command (for chrooted
+#    commands, that will be */*).
+#  - `@@USER@@` is replaced by the username, set on the user page.
+#
+# The (global) timeout for the command list can be set with
+# the *timeout* key. The value is a time in seconds, default
+# is 10 seconds if not set.
+#
+# If a command starts with "-" (a single minus sign), then the
+# return value of the command following the - is ignored; otherwise,
+# a failing command will abort the installation. This is much like
+# make's use of - in a command.
+#
+# The value of *script* may be:
+#   - a single string; this is one command that is executed.
+#   - a list of strings; these are executed one at a time, by
+#     separate shells (/bin/sh -c is invoked for each command).
+#   - an object, specifying a key *command* and (optionally)
+#     a key *timeout* to set the timeout for this specific
+#     command differently from the global setting.
+---
+dontChroot: false
+timeout: 10
+script:
+    - "/etc/calamares/userscripts/autologin.sh"
+    - "/etc/calamares/userscripts/confirm_install.sh"

includes.chroot/etc/calamares/settings.conf

@@ -145,6 +145,7 @@ sequence:
   - networkcfg
   - hwclock
   - services-systemd
+  - shellprocess
 #  - dracut
   - initramfs
 #  - grubcfg
@@ -166,7 +167,7 @@ sequence:
 # here, Calamares then takes care of finding it and loading the contents.
 #
 # YAML: string.
-branding: default
+branding: tildelinux
 
 # If this is set to true, Calamares will show an "Are you sure?" prompt right
 # before each execution phase, i.e. at points of no return. If this is set to

includes.chroot/etc/calamares/userscripts/autologin.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+mkdir -p '/etc/systemd/system/getty@tty1.service.d'
+echo "[Service]" > '/etc/systemd/system/getty@tty1.service.d/override.conf'
+echo "ExecStart=" >> '/etc/systemd/system/getty@tty1.service.d/override.conf'
+echo "ExecStart=-/sbin/agetty --autologin root %I \$TERM" >> '/etc/systemd/system/getty@tty1.service.d/override.conf'
+echo "Type=idle" >> '/etc/systemd/system/getty@tty1.service.d/override.conf'

includes.chroot/etc/calamares/userscripts/confirm_install.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+rm '/tilde/tl-setup/is_live'

includes.chroot/root/.bashrc

@@ -0,0 +1,3 @@
+if [ -f ../tilde/tl-setup/setup_incomplete ]; then
+	PS1="[Tildelinux Install]$PS1"
+fi

includes.chroot/root/.profile

@@ -6,8 +6,8 @@ fi
 
 mesg n || true
 
-if [ -f ~/tl-setup/setup_incomplete ]; then
-	cd ~/tl-setup
+if [ -f ../tilde/tl-setup/setup_incomplete ]; then
+	cd ../tilde/tl-setup
 	./setup.sh
 fi
 

includes.chroot/root/.xinitrc

@@ -0,0 +1 @@
+calamares

includes.chroot/root/tl-setup

@@ -1 +0,0 @@
-Subproject commit 2fb6dbee64b3e630bde3d20fe44942585c71b2bf

includes.chroot/tilde/bin/tl-setup

@@ -0,0 +1,2 @@
+#!/bin/sh
+sudo su -c 'cd /tilde/tl-setup && . ./setup.sh && setup_tildelinux'

includes.chroot/tilde/tl-setup

@@ -0,0 +1 @@
+Subproject commit a928cf6f8ce692b300525494dce47546143fb583

package-lists/base.list.chroot

@@ -7,3 +7,6 @@ ssh
 firmware-linux
 sshfs
 git
+curl
+wget
+rsync

package-lists/desktop.list.chroot

@@ -3,3 +3,4 @@ qterminal
 xorg
 network-manager-gnome
 calamares
+mpv

package-lists/lxqt.list.chroot

@@ -3,5 +3,11 @@ lxqt-config
 lxqt-qtplugin
 lxqt-notificationd
 lxqt-openssh-askpass
+lxqt-sudo
+lxqt-globalkeys
+lximage-qt
 pcmanfm-qt
 qt5-style-plugins
+ark
+qps
+qpdfview

readme.md

@@ -1,11 +1,14 @@
 # lb-config
+[![Build Status](https://drone.tildelinux.org/api/badges/tildelinux/lb-config/status.svg)](https://drone.tildelinux.org/tildelinux/lb-config)
+
+latest successfuly built image [here](https://drone.tildelinux.org/builds/tildelinux)
 
 live-build chroot and config files for tildelinux
 
 this is where the magic happens
 
-## building
-1. `sudo apt install live-build`
+## manual building
+1. `sudo apt install live-build syslinux-efi`
 2. `mkdir tildelinux && cd tildelinux`
 3. `lb config`
 4. `rm -r config`