patchstack/customized main

local customizations

Patch does not have a description.
7 files changed+339 -3
+ .ignore
1
  makefile
31
  mkosi.local.conf
14
  systemd
2
  mkosi.extra/usr/lib/tmpfiles.d/etc.conf
10
  mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf
1
+ mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf.d/gnome-xsession.conf
13
.ignore+1
             @@ -0,0 +1,1 @@            1systemd/**
makefile+27 -4
             @@ -1,10 +1,12 @@     1      1BIN_DIR := mkosi.profiles/custom/mkosi.extra/usr/local/bin     2      2PACKAGES_DIR := mkosi.profiles/custom/mkosi.packages     3      3btdu := $(BIN_DIR)/btdu            4jj := $(BIN_DIR)/jj     4      5opensnitch := $(PACKAGES_DIR)/opensnitch.rpm     5      6opensnitch_ui := $(PACKAGES_DIR)/opensnitch_ui.rpm     6       ALL := $(btdu) $(opensnitch) $(opensnitch_ui)     7       CURRENT_VERSION = $(shell mkosi summary --json | jq -r '.Images[] | select(.Image == "main") | .ImageVersion')            7ALL := $(btdu) $(jj) $(opensnitch) $(opensnitch_ui)            8LATEST_VERSION = $(shell mkosi summary --json | jq -r '.Images[] | select(.Image == "main") | .ImageVersion')            9INSTALLED_VERSION = $(shell grep IMAGE_VERSION /etc/os-release | cut -d= -f2 | tr -d \")     8     10     9     11.PHONY: deps    10     12deps: $(PACKAGES_DIR) $(BIN_DIR) $(ALL)             @@ -16,9 +18,18 @@    16     18$(BIN_DIR) $(PACKAGES_DIR):    17     19	mkdir -p $@    18     20           21$(jj): $(MAKE_TMPDIR)/jj.tar.gz           22	echo 9967a240e3294a0bce4444c55d40a35b70af44c69b558689aced95e4e497cef2 $(MAKE_TMPDIR)/jj.tar.gz | sha256sum --check           23	tar -xzf $(MAKE_TMPDIR)/jj.tar.gz -C $(MAKE_TMPDIR)           24	cp $(MAKE_TMPDIR)/jj $@           25           26$(MAKE_TMPDIR)/jj.tar.gz:           27	wget https://github.com/jj-vcs/jj/releases/download/v0.35.0/jj-v0.35.0-x86_64-unknown-linux-musl.tar.gz -O $(MAKE_TMPDIR)/jj.tar.gz           28    19     29$(btdu): $(MAKE_TMPDIR)/btdu    20     30	echo 35b9bb752e6aa902b8281e92a5411b2f1cfb9fa251089adf909dc95efc011c48 $(MAKE_TMPDIR)/btdu | sha256sum --check    21     31	cp $(MAKE_TMPDIR)/btdu $@           32	chmod +x $@    22     33    23     34$(MAKE_TMPDIR)/btdu:    24     35	wget https://github.com/CyberShadow/btdu/releases/download/v0.6.0/btdu-static-x86_64 -O $(MAKE_TMPDIR)/btdu             @@ -44,11 +55,23 @@    44     55	ln -s ~/Vaults/particleos_keys/sbctl/var/keys/db/db.key mkosi.key    45     56    46     57.PHONY: build           58build:    47     59	mkosi build --auto-bump    48     60           61.PHONY: systemd           62systemd:           63	sh -c 'cd systemd && mkosi -t none -f --distribution=fedora --release=43'           64    49     65.PHONY: sysupdate    50     66sysupdate:    51     67	mkosi sysupdate -- update    52     68	mkdir -p versions    53       	cat mkosi.output/ParticleOS_$(CURRENT_VERSION)_x86-64.manifest | gzip > versions/$(CURRENT_VERSION).manifest.gz    54       	cat mkosi.output/ParticleOS_$(CURRENT_VERSION)_x86-64.changelog | gzip > versions/$(CURRENT_VERSION).changelog.gz           69	cat mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.changelog | gzip > versions/$(LATEST_VERSION).changelog.gz           70           71.PHONY: diff_changelog           72diff_changelog:           73	sh -c 'diff --color=always -u <(gzip --decompress --to-stdout versions/$(INSTALLED_VERSION).changelog.gz) mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.changelog; test $$? -le 1'           74           75.PHONY: diff_manifest           76diff_manifest:           77	sh -c 'diff --color=always -u /etc/os-manifest mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.manifest; test $$? -le 1'
mkosi.local.conf+13 -1
             @@ -17,7 +17,14 @@    17     17[Content]    18     18VolatilePackageDirectories=./systemd/build/mkosi.builddir/fedora~43~x86-64/    19     19Packages=           20        # keyrings for building other distro images           21        archlinux-keyring           22        debian-keyring    20     23        ansible           24        ansible-collection-ansible-posix           25        ansible-collection-community-postgresql           26        ansible-collection-community-general           27        ansible-collection-community-crypto    21     28        awk    22     29        bash    23     30        bash-completion             @@ -29,8 +36,8 @@    29     36        cowsay    30     37        cmatrix    31     38        curl    32               debian-keyring    33     39        dictd           40        diffoscope    34     41        du-dust    35     42        duf    36     43        d2             @@ -71,6 +78,9 @@    71     78        ImageMagick    72     79        iperf3    73     80        java-latest-openjdk           81        katago-opencl           82        intel-opencl           83        OpenCL-ICD-Loader    74     84        @kde-desktop    75     85        kde-connect    76     86        kde-partitionmanager             @@ -95,6 +105,7 @@    95    105        neovim    96    106        ninja    97    107        okular          108        opentofu    98    109        osc    99    110        # needed for bell fish function   100    111        oxygen-sounds             @@ -112,6 +123,7 @@   112    123        plasma-vault   113    124        pnpm   114    125        powertop          126        progress   115    127        proxychains-ng   116    128        pv   117    129        python3-netaddr
systemd+1 -1
             @@ -1,1 +1,1 @@     1       15bd1496c9b59c1ec8ee05e78c65eeb3f148c898            153405835a2aa6e360863660f1e0e4d9a9688085f
mkosi.extra/usr/lib/tmpfiles.d/etc.conf+8 -2
             @@ -3,6 +3,7 @@     3      3# This overrides the same file from systemd since we want to symlink everything     4      4# into /etc instead of copying so updates to /usr propagate properly.     5      5L /etc/os-release - - - - ../usr/lib/os-release            6L /etc/os-manifest - - - - ../usr/lib/os-manifest     6      7L+ /etc/mtab - - - - ../proc/self/mounts     7      8# Contains the default systemd locale     8      9L /etc/locale.conf             @@ -48,6 +49,8 @@    48     49L? /etc/tuned    49     50# Required by gdm    50     51L? /etc/gdm           52# Required by sdm           53L? /etc/sddm    51     54# Required by geoclue    52     55L? /etc/geoclue    53     56# Required by fwupd             @@ -65,10 +68,10 @@    65     68L? /etc/PackageKit    66     69# ModemManager needds its dbus policy file    67     70L? /etc/dbus1/systemd.d/org.freedesktop.ModemManager1.conf           71# man fails without this in /etc/           72L? /etc/manpath.config    68     73# Required by man-db-cache-update.service    69     74L? /etc/sysconfig/man-db    70       # sddm breaks otherwise, at least with homed?    71       L? /etc/sddm    72     75    73     76## custom    74     77C /etc/opensnitchd             @@ -93,6 +96,9 @@    93     96L? /etc/firejail    94     97L? /etc/login.defs    95     98           99# OpenCL          100L? /etc/OpenCL          101    96    102# abrtd    97    103L? /etc/libreport    98    104
mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf-1
             @@ -9,6 +9,5 @@     9      9        gnome-core    10     10        gnome-initial-setup    11     11        gnome-keyring-pkcs11    12               gnome-session-xsession    13     12        gnome-software-plugin-flatpak    14     13        gnome-software-plugin-fwupd
mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf.d/gnome-xsession.conf+13
             @@ -0,0 +1,13 @@            1# SPDX-License-Identifier: LGPL-2.1-or-later            2            3[TriggerMatch]            4Distribution=debian            5Release=trixie            6            7[TriggerMatch]            8Distribution=ubuntu            9Release=|oracular           10Release=|plucky           11           12[Content]           13Packages=gnome-session-xsession
jcgl updated patch to version 26
jcgl updated patch to version 25
jcgl updated patch to version 24
jcgl updated patch to version 23
jcgl updated patch to version 22
jcgl updated patch to version 21
jcgl updated patch to version 20
jcgl updated patch to version 19
jcgl updated patch to version 18
jcgl updated patch to version 17
jcgl updated patch to version 16
jcgl updated patch to version 15
jcgl updated patch to version 14
jcgl updated patch to version 13
jcgl updated patch to version 12
jcgl updated patch to version 11
jcgl updated patch to version 10
jcgl updated patch to version 9
jcgl updated patch to version 8
jcgl updated patch to version 7
jcgl updated patch to version 6
jcgl updated patch to version 5
jcgl updated patch to version 4
jcgl updated patch to version 3
jcgl updated patch to version 2
jcgl created patch version 1