Delete a bunch of stuff I don't think I'll need.

This commit is contained in:
jimmy committed 2022-08-23 20:51:52 -04:00
1 parent a8d8515b75
commit 5b22a10316
38 files changed
+1 -3517

No files matched your search

+1 -1
View File
@@ -41,7 +41,7 @@ export CHECKPOINTS=build
IMAGETYPES := regular ostree direct
FORMATS := img qcow2 oci.tar repo rootfs ext4 tar
aarch64_TARGETS := rpi4
COMMON_TARGETS := qemu aws
COMMON_TARGETS := qemu
HOST_TARGETS := $(COMMON_TARGETS) $($(HOST_ARCH)_TARGETS)
ALL_TARGETS := $(COMMON_TARGETS) $(foreach a,$(ARCHES), $($(a)_TARGETS))
@@ -1,19 +0,0 @@
## custom.conf
# GDM configuration storage
[daemon]
# Uncomment the line below to force the login screen to use Xorg
# WaylandEnable=false
AutomaticLoginEnable=True
AutomaticLogin=neptune
[security]
[xdmcp]
[chooser]
[debug]
# Uncomment the line below to turn on debugging
#Enable=true
@@ -1,19 +0,0 @@
## custom.conf
# GDM configuration storage
[daemon]
# Uncomment the line below to force the login screen to use Xorg
WaylandEnable=false
AutomaticLoginEnable=True
AutomaticLogin=neptune
[security]
[xdmcp]
[chooser]
[debug]
# Uncomment the line below to turn on debugging
#Enable=true
@@ -1,14 +0,0 @@
[Unit]
Description=Init neptune gdm session conf
ConditionPathExists=!/var/lib/AccountsService/users/neptune
Before=gdm.service
[Service]
Type=service
ExecStart=/bin/sh -c ' \
echo -e "[User]\nSession=neptune-%i\nXSession=neptune-xorg\nPasswordHint=\nIcon=/var/lib/AccountsService/icons/guest\nSystemAccount=false\n" \
> /var/lib/AccountsService/users/neptune'
RemainAfterExit=yes
[Install]
WantedBy=multi-user.target
@@ -1,79 +0,0 @@
formatVersion: 1
formatType: am-configuration
---
# basic AM functionality - the builtin apps are in 'apps'.
# installations will go into the standard QStandardPath AppLocalDataLocation
# (e.g. ~/.local/share/Luxoft Sweden AB/Neptune UI) /am hierarchy
applications:
builtinAppsManifestDir: "${CONFIG_PWD}/apps"
installedAppsManifestDir: "${stdpath:AppLocalDataLocation}/neptune3-ui/manifests"
installationDir: "${stdpath:AppLocalDataLocation}/neptune3-ui/apps"
documentDir: "${stdpath:AppLocalDataLocation}/neptune3-ui/docs"
# QML apps will be able to import from modules...
runtimes:
qml:
importPaths: [ "${CONFIG_PWD}/imports_shared" ]
environmentVariables:
QT_PLUGIN_PATH: "${CONFIG_PWD}"
SERVER_CONF_PATH: "${CONFIG_PWD}/server.conf"
native:
importPaths: [ "${CONFIG_PWD}/imports_shared" ]
environmentVariables:
QT_PLUGIN_PATH: "${CONFIG_PWD}"
SERVER_CONF_PATH: "${CONFIG_PWD}/server.conf"
# ... as well as the SystemUI
ui:
fullscreen: yes
style: "${CONFIG_PWD}/styles/neptune"
iconThemeName: "neptune"
iconThemeSearchPaths: [ "${CONFIG_PWD}/imports_shared/assets/icons" ]
mainQml: "${CONFIG_PWD}/Main.qml"
importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/imports_system", "${CONFIG_PWD}/sysui" ]
windowIcon: "${CONFIG_PWD}/imports_shared/assets/icons/neptune/sysui/ic-menu-home.png"
enableTouchEmulation: yes
systemProperties:
public:
showCluster: no
showHUD: no
devMode: yes
enableCursorManagement: no
hardwareVariant: 'high'
#Qt Safe Renderer settings
qsrEnabled: no
qsrServerAddress: '127.0.0.1'
qsrServerPort: '1111'
showSystemAppsInLauncher: no
private:
appStoreServerUrl: 'http://demoappsdeploy.qt.io:8514'
userName: 't'
userPassword: 't'
imei: '112163001487801'
orientation: 'Landscape'
adjustSizesForScreen: yes
# development setup: no security
flags:
noSecurity: yes
noUiWatchdog: yes
# default logging
logging:
rules:
- "*=false"
- "qt.*=false"
- "qt.gamepad*=true"
- "am.*=false"
- "qml*=true"
- "cursor.navigation=false"
- "qt3ds.*=false"
- "shared.com.pelagicore.map.info=false"
- "*.warning=false"
- "*.critical=true"
@@ -1,7 +0,0 @@
[Desktop Entry]
Type=Application
Exec=neptune3-ui
StartupNotify=false
Terminal=false
Name[en_US]=neptune3-ui
Comment[en_US]=Launches neptune3-ui on logging in
@@ -1,7 +0,0 @@
[Desktop Entry]
Type=Application
Exec=env QT_QPA_PLATFORM=wayland QT_IM_MODULE=qtvirtualkeyboard neptune3-ui
StartupNotify=false
Terminal=false
Name[en_US]=neptune3-ui
Comment[en_US]=Launches neptune3-ui on logging in
@@ -1,3 +0,0 @@
[GNOME Session]
Name=Neptune XOrg
RequiredComponents=mutter;neptune3-ui-xorg;
@@ -1,3 +0,0 @@
[GNOME Session]
Name=Neptune
RequiredComponents=mutter;neptune3-ui;
@@ -1,7 +0,0 @@
[Desktop Entry]
Name=Neptune (Wayland)
Comment=This session logs you into Neptune
Exec=gnome-session --session=neptune
Type=Application
DesktopNames=GNOME
X-GDM-SessionRegisters=true
@@ -1,7 +0,0 @@
[Desktop Entry]
Name=Neptune (XOrg)
Comment=This session logs you into Neptune
Exec=gnome-session --session=neptune-xorg
Type=Application
DesktopNames=GNOME
X-GDM-SessionRegisters=true
-125
View File
@@ -1,125 +0,0 @@
version: '2'
mpp-vars:
name: gadget
image_size: '3221225472'
pipelines:
- mpp-import-pipelines:
path: include/build.ipp.yml
- name: rootfs
build: name:build
stages:
- type: org.osbuild.kernel-cmdline
options:
root_fs_uuid:
mpp-eval: rootfs_uuid
kernel_opts:
mpp-eval: ''' '' .join(kernel_opts)'
- type: org.osbuild.rpm
options:
gpgkeys:
- mpp-eval: centos_gpg_key
- mpp-eval: redhat_gpg_key
disable_dracut: true
exclude:
docs: true
inputs:
packages:
type: org.osbuild.files
origin: org.osbuild.source
mpp-depsolve:
architecture: $arch
ignore-weak-deps: true
module-platform-id: $distro_module_id
baseurl: $distro_baseurl/BaseOS/$arch/os/
repos:
mpp-join:
- mpp-eval: distro_repos
- mpp-eval: distro_devel_repos
- mpp-eval: target_repos
- mpp-eval: extra_repos
- - id: osbuild
baseurl: https://download.copr.fedorainfracloud.org/results/@osbuild/osbuild/centos-stream-9-$arch
packages:
mpp-join:
- mpp-eval: base_rpms
- mpp-eval: image_rpms
- mpp-eval: extra_rpms
- - "@Development Tools"
- firewalld
# Some convenience packages
- bash-completion
- dnf
- emacs-nox
- less
- strace
- sudo
- vim
- git
- wget
- make
# Dependencies to build RPMs and images
- rpm-build
- hostname
- openssl-devel
- bc
- binutils-devel
- bpftool
- clang
- dwarves
- gcc-plugin-devel
- libcap-devel
- libcap-ng-devel
- libmnl-devel
- llvm
- net-tools
- numactl-devel
- osbuild-ostree
- osbuild-tools
- openssh-clients
- openssh-server
- perl-devel
- python3-devel
- python3-docutils
- rsync
- iputils
- iproute
- qemu-kvm
- fuse-devel
- kernel-rpm-macros
# Container tools
- podman
- buildah
- skopeo
# Gadget
- pi_gadget
excludes:
- dracut-config-rescue
- type: org.osbuild.locale
options:
language: en_US.UTF-8
- type: org.osbuild.users
options:
users:
guest:
password:
mpp-eval: guest_password
- type: org.osbuild.firewall
options:
enabled_services:
- cockpit
- ssh
- type: org.osbuild.sshd.config
options:
config:
PermitRootLogin:
mpp-eval: ssh_permit_root_login
- type: org.osbuild.systemd
options:
enabled_services:
- NetworkManager.service
- firewalld.service
- rngd.service
- sshd.service
- cockpit.socket
- mpp-import-pipelines:
path: include/image.ipp.yml
-206
View File
@@ -1,206 +0,0 @@
version: '2'
mpp-vars:
name: neptune
display_server: wayland
pipelines:
- mpp-import-pipelines:
path: include/build.ipp.yml
- name: rootfs
build: name:build
stages:
- type: org.osbuild.kernel-cmdline
options:
root_fs_uuid:
mpp-eval: rootfs_uuid
kernel_opts:
mpp-eval: ''' '' .join(kernel_opts)'
- type: org.osbuild.rpm
options:
gpgkeys:
- mpp-eval: centos_gpg_key
- mpp-eval: redhat_gpg_key
disable_dracut: true
exclude:
docs: true
inputs:
packages:
type: org.osbuild.files
origin: org.osbuild.source
mpp-depsolve:
architecture: $arch
ignore-weak-deps: true
module-platform-id: $distro_module_id
baseurl: $distro_baseurl/BaseOS/$arch/os/
repos:
mpp-join:
- mpp-eval: distro_repos
- mpp-eval: target_repos
- mpp-eval: extra_repos
- - id: copr-neptune
baseurl: https://download.copr.fedorainfracloud.org/results/pingou/qtappmanager-fedora/centos-stream-9-$arch/
packages:
mpp-join:
- mpp-eval: base_rpms
- mpp-eval: image_rpms
- mpp-eval: extra_rpms
- - dnf
- firewalld
- gdm
- gnome-control-center
- gnome-session-xsession
- gnome-shell
- gnome-terminal
- langpacks-en
- neptune3-ui
- openssh-clients
- openssh-server
- plymouth
- polkit
- sudo
- xorg-x11-drv-fbdev
excludes:
- dracut-config-rescue
- gnome-tour
- type: org.osbuild.locale
options:
language: en_US.UTF-8
- type: org.osbuild.users
options:
users:
guest:
password:
mpp-eval: guest_password
neptune:
password: ''
- type: org.osbuild.copy
inputs:
inlinefile:
type: org.osbuild.files
origin: org.osbuild.source
mpp-embed:
id: custom.conf
path: ../files/etc/gdm/custom-$display_server.conf
options:
paths:
- from:
mpp-format-string: input://inlinefile/{embedded['custom.conf']}
to: tree:///etc/gdm/custom.conf
- type: org.osbuild.copy
inputs:
inlinefile:
type: org.osbuild.files
origin: org.osbuild.source
mpp-embed:
id: init-neptune-session@.service
path: ../files/etc/systemd/system/init-neptune-session@.service
options:
paths:
- from:
mpp-format-string: input://inlinefile/{embedded['init-neptune-session@.service']}
to: tree:///etc/systemd/system/init-neptune-session@.service
- type: org.osbuild.copy
inputs:
inlinefile:
type: org.osbuild.files
origin: org.osbuild.source
mpp-embed:
id: neptune-wayland.desktop
path: ../files/usr/share/wayland-sessions/neptune-wayland.desktop
options:
paths:
- from:
mpp-format-string: input://inlinefile/{embedded['neptune-wayland.desktop']}
to: tree:///usr/share/wayland-sessions/neptune-wayland.desktop
- type: org.osbuild.copy
inputs:
inlinefile:
type: org.osbuild.files
origin: org.osbuild.source
mpp-embed:
id: neptune-xorg.desktop
path: ../files/usr/share/xsessions/neptune-xorg.desktop
options:
paths:
- from:
mpp-format-string: input://inlinefile/{embedded['neptune-xorg.desktop']}
to: tree:///usr/share/xsessions/neptune-xorg.desktop
- type: org.osbuild.copy
inputs:
inlinefile:
type: org.osbuild.files
origin: org.osbuild.source
mpp-embed:
id: neptune.session
path: ../files/usr/share/gnome-session/sessions/neptune.session
options:
paths:
- from:
mpp-format-string: input://inlinefile/{embedded['neptune.session']}
to: tree:///usr/share/gnome-session/sessions/neptune.session
- type: org.osbuild.copy
inputs:
inlinefile:
type: org.osbuild.files
origin: org.osbuild.source
mpp-embed:
id: neptune-xorg.session
path: ../files/usr/share/gnome-session/sessions/neptune-xorg.session
options:
paths:
- from:
mpp-format-string: input://inlinefile/{embedded['neptune-xorg.session']}
to: tree:///usr/share/gnome-session/sessions/neptune-xorg.session
- type: org.osbuild.copy
inputs:
inlinefile:
type: org.osbuild.files
origin: org.osbuild.source
mpp-embed:
id: am-config-neptune.yaml
path: ../files/usr/lib64/neptune3/am-config-neptune.yaml
options:
paths:
- from:
mpp-format-string: input://inlinefile/{embedded['am-config-neptune.yaml']}
to: tree:///usr/lib64/neptune3/am-config-neptune.yaml
- type: org.osbuild.copy
inputs:
inlinefile:
type: org.osbuild.files
origin: org.osbuild.source
mpp-embed:
id: neptune3-ui.desktop
path: ../files/usr/share/applications/neptune3-ui.desktop
options:
paths:
- from:
mpp-format-string: input://inlinefile/{embedded['neptune3-ui.desktop']}
to: tree:///usr/share/applications/neptune3-ui.desktop
- type: org.osbuild.copy
inputs:
inlinefile:
type: org.osbuild.files
origin: org.osbuild.source
mpp-embed:
id: neptune3-ui-xorg.desktop
path: ../files/usr/share/applications/neptune3-ui-xorg.desktop
options:
paths:
- from:
mpp-format-string: input://inlinefile/{embedded['neptune3-ui-xorg.desktop']}
to: tree:///usr/share/applications/neptune3-ui-xorg.desktop
- type: org.osbuild.sshd.config
options:
config:
PermitRootLogin:
mpp-eval: ssh_permit_root_login
- type: org.osbuild.systemd
options:
enabled_services:
- NetworkManager.service
- firewalld.service
- rngd.service
- sshd.service
- mpp-eval: "'init-neptune-session@wayland.service' if display_server == 'wayland' else 'init-neptune-session@xorg.service'"
- mpp-import-pipelines:
path: include/image.ipp.yml
-46
View File
@@ -1,46 +0,0 @@
version: '2'
mpp-vars:
name: soafee
pipelines:
- mpp-import-pipelines:
path: include/build.ipp.yml
- name: rootfs
build: name:build
stages:
- type: org.osbuild.kernel-cmdline
options:
root_fs_uuid:
mpp-eval: rootfs_uuid
kernel_opts:
mpp-eval: ''' '' .join(kernel_opts)'
- type: org.osbuild.rpm
options:
gpgkeys:
- mpp-eval: centos_gpg_key
- mpp-eval: redhat_gpg_key
disable_dracut: true
inputs:
packages:
type: org.osbuild.files
origin: org.osbuild.source
mpp-depsolve:
architecture: $arch
ignore-weak-deps: true
module-platform-id: $distro_module_id
baseurl: $distro_baseurl/BaseOS/$arch/os/
repos:
mpp-join:
- mpp-eval: distro_repos
- mpp-eval: target_repos
- mpp-eval: extra_repos
packages:
mpp-join:
- mpp-eval: base_rpms
- mpp-eval: image_rpms
- mpp-eval: extra_rpms
- - podman
- curl
excludes:
- dracut-config-rescue
- mpp-import-pipelines:
path: include/image.ipp.yml
@@ -1,79 +0,0 @@
version: '2'
mpp-vars:
name: upgrade-demo
pipelines:
- mpp-import-pipelines:
path: include/build.ipp.yml
- name: rootfs
build: name:build
stages:
- type: org.osbuild.kernel-cmdline
options:
root_fs_uuid:
mpp-eval: rootfs_uuid
kernel_opts:
mpp-eval: ''' '' .join(kernel_opts)'
- type: org.osbuild.rpm
options:
gpgkeys:
- mpp-eval: centos_gpg_key
- mpp-eval: redhat_gpg_key
disable_dracut: true
exclude:
docs: true
inputs:
packages:
type: org.osbuild.files
origin: org.osbuild.source
mpp-depsolve:
architecture: $arch
ignore-weak-deps: true
module-platform-id: $distro_module_id
baseurl: $distro_baseurl/BaseOS/$arch/os/
repos:
mpp-join:
- mpp-eval: distro_repos
- mpp-eval: target_repos
- mpp-eval: extra_repos
packages:
mpp-join:
- mpp-eval: base_rpms
- mpp-eval: image_rpms
- mpp-eval: extra_rpms
# Install the watchdog tools and service files
- - autosig-sample-watchdog
- autosig-sample-staticdelta
excludes:
- dracut-config-rescue
# Make sure we only try a failed boot once before rollback (default is 3)
- type: org.osbuild.copy
inputs:
inlinefile:
type: org.osbuild.files
origin: org.osbuild.source
mpp-embed:
id: greenboot.conf
text: "GREENBOOT_MAX_BOOT_ATTEMPTS=1\n"
options:
paths:
- from:
mpp-format-string: input://inlinefile/{embedded['greenboot.conf']}
to: tree:///etc/greenboot/greenboot.conf
- type: org.osbuild.locale
options:
language: en_US.UTF-8
- type: org.osbuild.systemd
options:
enabled_services:
- NetworkManager.service
- rngd.service
# Enable the watchdog ostree/greenboot integration
- watchdog-ostree-start.service
- watchdog-ostree-stop.service
# Work around bug for now (https://github.com/coreos/rpm-ostree/issues/3554)
- type: org.osbuild.mkdir
options:
paths:
- path: /var/lib/containers
- mpp-import-pipelines:
path: include/image.ipp.yml
@@ -1,76 +0,0 @@
version: '2'
mpp-vars:
extra_image_rpms:
- openssh-server
- sudo
- tuned
- cloud-init
- cloud-utils-growpart
- gdisk
- NetworkManager-cloud-setup
- rsync
- qemu-guest-agent
extra_build_rpms:
- python3-pyyaml
target_stages:
- type: org.osbuild.sshd.config
options:
config:
PermitRootLogin:
mpp-eval: ssh_permit_root_login
- type: org.osbuild.systemd
options:
enabled_services:
- sshd
- NetworkManager
- nm-cloud-setup.service
- nm-cloud-setup.timer
- cloud-init
- cloud-init-local
- cloud-config
- cloud-final
- reboot.target
- tuned
default_target: multi-user.target
- type: org.osbuild.systemd-logind
options:
filename: 00-getty-fixes.conf
config:
Login:
NAutoVTs: 0
- type: org.osbuild.cloud-init
options:
filename: 00-cs-default-user.cfg
config:
system_info:
default_user:
name: ec2-user
- type: org.osbuild.systemd.unit
options:
unit: nm-cloud-setup.service
dropin: 10-enable-for-ec2.conf
config:
Service:
Environment: NM_CLOUD_SETUP_EC2=yes
- type: org.osbuild.locale
options:
language: en_US.UTF-8
- type: org.osbuild.timezone
options:
zone: UTC
- type: org.osbuild.chrony
options:
servers:
- hostname: 169.254.169.123
prefer: true
iburst: true
minpoll: 4
maxpoll: 4
leapsectz: ""
- type: org.osbuild.keymap
options:
keymap: us
x11-keymap:
layouts:
- us
pipelines: []
@@ -1,88 +0,0 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: MIT-0
set -e
[ "$DEBUG" == 'true' ] && set -x
ARGC=$#
if [ $ARGC -ne 3 ]; then
echo "USAGE: $(basename $0) <Image Path> <S3 Bucket Name> <AMI Image Size in GB>"
exit 1
fi
IMAGE_FILE_PATH=$1
IMPORT_BUCKET_NAME=$2
AMI_DISK_SIZE_GB=$3
declare -A ARCHS_MAP=( ["x86_64"]="x86_64" ["aarch64"]="arm64")
IMAGE_NAME="$(basename -- ${IMAGE_FILE_PATH})"
AMI_NAME="${IMAGE_NAME%.*}"
IMAGE_ARCH="${AMI_NAME##*.}"
TMPDIR=$(mktemp -d)
IMAGE_IMPORT_JSON_FILE="${TMPDIR}/image-import.json"
AMI_REGISTER_JSON_FILE="${TMPDIR}/register-ami.json"
aws s3 cp "${IMAGE_FILE_PATH}" "s3://${IMPORT_BUCKET_NAME}"
cat <<EOF > "${IMAGE_IMPORT_JSON_FILE}"
{
"Description": "CentOS Stream 9 with Container support",
"Format": "RAW",
"UserBucket": {
"S3Bucket": "${IMPORT_BUCKET_NAME}",
"S3Key": "${IMAGE_NAME}"
}
}
EOF
echo "Importing image file into snapshot "
IMPORT_TASK_ID=$(aws ec2 import-snapshot --disk-container "file://${IMAGE_IMPORT_JSON_FILE}" | jq -r '.ImportTaskId')
IMPORT_STATUS=$(aws ec2 describe-import-snapshot-tasks --import-task-ids $IMPORT_TASK_ID | jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail.Status')
x=0
while [ "$IMPORT_STATUS" = "active" ] && [ $x -lt 120 ]
do
IMPORT_STATUS=$(aws ec2 describe-import-snapshot-tasks --import-task-ids $IMPORT_TASK_ID | jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail.Status')
IMPORT_STATUS_MSG=$(aws ec2 describe-import-snapshot-tasks --import-task-ids $IMPORT_TASK_ID | jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail.StatusMessage')
echo "Import Status: ${IMPORT_STATUS} / ${IMPORT_STATUS_MSG}"
x=$(( $x + 1 ))
sleep 15
done
if [ $x -eq 120 ]; then
echo "ERROR: Import task taking too long, exiting..."; exit 1;
elif [ "$IMPORT_STATUS" = "completed" ]; then
echo "Import completed Successfully"
else
echo "Import Failed, exiting"; exit 2;
fi
SNAPSHOT_ID=$(aws ec2 describe-import-snapshot-tasks --import-task-ids $IMPORT_TASK_ID | jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail.SnapshotId')
aws ec2 wait snapshot-completed --snapshot-ids $SNAPSHOT_ID
echo "Registering AMI with Snapshot $SNAPSHOT_ID"
cat <<EOF > "${AMI_REGISTER_JSON_FILE}"
{
"Architecture": "${ARCHS_MAP[$IMAGE_ARCH]}",
"BlockDeviceMappings": [
{
"DeviceName": "/dev/sda1",
"Ebs": {
"DeleteOnTermination": true,
"SnapshotId": "${SNAPSHOT_ID}",
"VolumeSize": ${AMI_DISK_SIZE_GB},
"VolumeType": "gp2"
}
}
],
"Description": "CS9 image with container support for ${IMAGE_ARCH}",
"RootDeviceName": "/dev/sda1",
"BootMode": "uefi",
"VirtualizationType": "hvm",
"EnaSupport": true
}
EOF
aws ec2 register-image --name ${AMI_NAME} --cli-input-json="file://${AMI_REGISTER_JSON_FILE}"
echo "AMI name: "${AMI_NAME}