[neon/neon/calamares-settings/Neon/stable] /: remove pinebook code

Harald Sitter null at kde.org
Thu Nov 5 15:51:14 GMT 2020


Git commit f1e99c039cf6633e3ddda012d656d45530654b6c by Harald Sitter.
Committed on 05/11/2020 at 15:35.
Pushed by sitter into branch 'Neon/stable'.

remove pinebook code

Bhushan informs me that we no longer roll pinebook images and can safely
remove the settings

D  +0    -3    debian/calamares-settings-pinebook.install
D  +0    -12   debian/calamares-settings-pinebook.service
M  +0    -8    debian/control
D  +0    -6    pinebook/calamares/pinebook/modules/packages.conf
D  +0    -10   pinebook/calamares/pinebook/modules/packages_locale.conf
D  +0    -21   pinebook/calamares/pinebook/modules/users.conf
D  +0    -14   pinebook/calamares/pinebook/modules/welcome.conf
D  +0    -38   pinebook/calamares/pinebook/settings.conf
D  +0    -75   pinebook/lib/live/config/1200-calamares
D  +0    -5    pinebook/usr/lib/aarch64-linux-gnu/calamares/modules/deferred_remove/module.desc
D  +0    -6    pinebook/usr/lib/aarch64-linux-gnu/calamares/modules/deferred_resize/module.desc
D  +0    -11   pinebook/usr/sbin/deferred_removal
D  +0    -13   pinebook/usr/sbin/fs_resize

https://invent.kde.org/neon/neon/calamares-settings/commit/f1e99c039cf6633e3ddda012d656d45530654b6c

diff --git a/debian/calamares-settings-pinebook.install b/debian/calamares-settings-pinebook.install
deleted file mode 100644
index 2da9833..0000000
--- a/debian/calamares-settings-pinebook.install
+++ /dev/null
@@ -1,3 +0,0 @@
-pinebook/calamares/* calamares/
-pinebook/lib/* lib/
-pinebook/usr/* usr/
diff --git a/debian/calamares-settings-pinebook.service b/debian/calamares-settings-pinebook.service
deleted file mode 100644
index fa54b33..0000000
--- a/debian/calamares-settings-pinebook.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Calamares deferred removal
-ConditionPathExists=/var/lib/calamares/first_run_done
-Before=display-manager.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/deferred_removal
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/debian/control b/debian/control
index b29b015..73a667e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,11 +15,3 @@ Description: distribution-independent installer framework
  distribution-independent installer framework.
  .
  This package contains the calamares settings and branding for KDE neon.
-
-Package: calamares-settings-pinebook
-Architecture: arm64
-Depends: calamares, calamares-settings
-Description: distribution-independent installer framework
- distribution-independent installer framework.
- .
- This package contains the calamares settings and branding for KDE neon on Pinebook.
diff --git a/pinebook/calamares/pinebook/modules/packages.conf b/pinebook/calamares/pinebook/modules/packages.conf
deleted file mode 100644
index a89137c..0000000
--- a/pinebook/calamares/pinebook/modules/packages.conf
+++ /dev/null
@@ -1,6 +0,0 @@
----
-backend: apt
-
-operations:
-  - remove:
-      - '^live-*'
diff --git a/pinebook/calamares/pinebook/modules/packages_locale.conf b/pinebook/calamares/pinebook/modules/packages_locale.conf
deleted file mode 100644
index 5c2fec0..0000000
--- a/pinebook/calamares/pinebook/modules/packages_locale.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Try installing locale packages for KDE and Firefox,
-# but only if there is internet available.
----
-backend: apt
-skip_if_no_internet: true
-
-operations:
-  - try_install:
-      - kde-l10n-${LOCALE}
-      - 'firefox-l10n-${LOCALE}*'
diff --git a/pinebook/calamares/pinebook/modules/users.conf b/pinebook/calamares/pinebook/modules/users.conf
deleted file mode 100644
index 443a355..0000000
--- a/pinebook/calamares/pinebook/modules/users.conf
+++ /dev/null
@@ -1,21 +0,0 @@
----
-doAutologin: false
-setRootPassword: false
-sudoersGroup:    sudo
-defaultGroups:
-    - adm
-    - lpadmin
-    - sambashare
-    - lp
-    - video
-    - network
-    - storage
-    - sudo
-    - audio
-    - plugdev
-    - cdrom
-    - floppy
-    - dip
-    - netdev
-    - bluetooth
-    - input
diff --git a/pinebook/calamares/pinebook/modules/welcome.conf b/pinebook/calamares/pinebook/modules/welcome.conf
deleted file mode 100644
index 468bc6f..0000000
--- a/pinebook/calamares/pinebook/modules/welcome.conf
+++ /dev/null
@@ -1,14 +0,0 @@
----
-showSupportUrl:         true
-showKnownIssuesUrl:     true
-showReleaseNotesUrl:    true
-
-requirements:
-    # HTTP GET this URL to determine if internet access available
-    internetCheckUrl: http://networkcheck.kde.org
-    check:
-        - power
-        - internet
-        - root
-    required:
-        - root
diff --git a/pinebook/calamares/pinebook/settings.conf b/pinebook/calamares/pinebook/settings.conf
deleted file mode 100644
index 5275b20..0000000
--- a/pinebook/calamares/pinebook/settings.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# 0404 - fully remove plasmalnf mentions
-#      - add gnu-triplet to module search path (hack)
----
-modules-search: [ local, "/usr/lib/aarch64-linux-gnu/calamares/modules" ]
-
-instances:
-  - id:     pkg
-    config: packages.conf
-    module: packages
-  - id:     pkg_locale
-    config: packages_locale.conf
-    module: packages
-
-sequence:
-  - show:
-    - welcome
-    - locale
-    - keyboard
-    - users
-  - exec:
-    - machineid
-    - locale
-    - localecfg
-    - keyboard
-    - users
-    - networkcfg
-    - services-systemd
-    - displaymanager
-    - packages at pkg
-    - packages at pkg_locale
-    - deferred_remove
-    - deferred_resize
-  - show:
-    - finished
-
-branding: neon
-dont-chroot: true
-prompt-install: false
diff --git a/pinebook/lib/live/config/1200-calamares b/pinebook/lib/live/config/1200-calamares
deleted file mode 100755
index 3fcbbbd..0000000
--- a/pinebook/lib/live/config/1200-calamares
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2014-2017 Rohan Garg <rohan at kde.org>
-
-set -e
-
-Cmdline ()
-{
-	# Reading kernel command line
-	for _PARAMETER in ${LIVE_CONFIG_CMDLINE}
-	do
-		case "${_PARAMETER}" in
-			live-config.no_calamares=|no_calamares=)
-				NO_CALAMARES="true"
-				;;
-
-			live-config.username=*|username=*)
-				LIVE_USERNAME="${_PARAMETER#*username=}"
-				;;
-		esac
-	done
-}
-
-Init ()
-{
-	# Checking if package is installed or already configured
-	if  [ ! -e /usr/bin/calamares ]
-	then
-		exit 0
-	fi
-
-	echo -n " calamares"
-}
-
-Config ()
-{
-	if [ ! -e /usr/bin/calamares ]
-	then
-		exit 0
-	fi
-
-	if [ "${NO_CALAMARES}" != "true" ]
-	then
-		if [ ! -e /home/${LIVE_USERNAME}/Desktop ]
-		then
-			mkdir -p "/home/${LIVE_USERNAME}/Desktop"
-		fi
-
-cat > "/home/${LIVE_USERNAME}/Desktop/calamares.desktop" << EOF
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=First Time Run This Installer
-GenericName=First Time Run This Installer
-TryExec=calamares
-Exec=pkexec /usr/bin/calamares
-Comment=Calamares — System Installer
-Icon=calamares
-Terminal=false
-StartupNotify=true
-Categories=Qt;System;
-EOF
-
-		chmod a+x "/home/${LIVE_USERNAME}/Desktop/calamares.desktop"
-		chown -R ${LIVE_USERNAME}:${LIVE_USERNAME}  "/home/${LIVE_USERNAME}/Desktop"
-
-	fi
-	# Creating state file
-	touch /var/lib/live/config/calamares
-}
-
-Cmdline
-Init
-Config
diff --git a/pinebook/usr/lib/aarch64-linux-gnu/calamares/modules/deferred_remove/module.desc b/pinebook/usr/lib/aarch64-linux-gnu/calamares/modules/deferred_remove/module.desc
deleted file mode 100644
index f92e9bc..0000000
--- a/pinebook/usr/lib/aarch64-linux-gnu/calamares/modules/deferred_remove/module.desc
+++ /dev/null
@@ -1,5 +0,0 @@
----
-type: "job"
-interface:  "process"
-name: "deferred_remove"
-command: "mkdir -p /var/lib/calamares && touch /var/lib/calamares/first_run_done"
diff --git a/pinebook/usr/lib/aarch64-linux-gnu/calamares/modules/deferred_resize/module.desc b/pinebook/usr/lib/aarch64-linux-gnu/calamares/modules/deferred_resize/module.desc
deleted file mode 100644
index 31498ac..0000000
--- a/pinebook/usr/lib/aarch64-linux-gnu/calamares/modules/deferred_resize/module.desc
+++ /dev/null
@@ -1,6 +0,0 @@
----
-type: "job"
-interface:  "process"
-name: "deferred_resize"
-command: "/usr/sbin/fs_resize"
-timeout: 45
diff --git a/pinebook/usr/sbin/deferred_removal b/pinebook/usr/sbin/deferred_removal
deleted file mode 100755
index ac11633..0000000
--- a/pinebook/usr/sbin/deferred_removal
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2017 Rohan Garg <rohan at kde.org>
-# SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr at jriddell.org>
-
-set -x
-set -e
-
-/usr/bin/qdbus --system org.freedesktop.Accounts /org/freedesktop/Accounts org.freedesktop.Accounts.DeleteUser 1000 true
-/usr/bin/pkcon -y remove calamares calamares-settings-pinebook
-/sbin/resize2fs /dev/mmcblk0p1
diff --git a/pinebook/usr/sbin/fs_resize b/pinebook/usr/sbin/fs_resize
deleted file mode 100755
index 61b97ea..0000000
--- a/pinebook/usr/sbin/fs_resize
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2017 Rohan Garg <rohan at kde.org>
-
-set -e
-
-ROOT='/dev/mmcblk0'
-parted --script ${ROOT} p
-parted --script ${ROOT} rm 1
-parted --script ${ROOT} "mkpart primary ext4 40960s -1s"
-parted --script ${ROOT} p
-partprobe ${ROOT}
-resize2fs ${ROOT}p1



More information about the Neon-commits mailing list