local customizations

             @@ -12,3 +12,4 @@    12     12mkosi.packages/    13     13keys/    14     14mkosi.profiles/custom/mkosi.extra/usr/local/bin/           15versions/

             @@ -0,0 +1,1 @@            1systemd/**

             @@ -1,8 +1,77 @@     1       BINDIR := mkosi.profiles/custom/mkosi.extra/usr/local/bin     2            3       $(BINDIR)/btdu: $(MAKE_TMPDIR)/btdu            1BIN_DIR := mkosi.profiles/custom/mkosi.extra/usr/local/bin            2PACKAGES_DIR := mkosi.profiles/custom/mkosi.packages            3btdu := $(BIN_DIR)/btdu            4jj := $(BIN_DIR)/jj            5opensnitch := $(PACKAGES_DIR)/opensnitch.rpm            6opensnitch_ui := $(PACKAGES_DIR)/opensnitch_ui.rpm            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 \")           10           11.PHONY: deps           12deps: $(PACKAGES_DIR) $(BIN_DIR) $(ALL)           13           14.PHONY: clean           15clean:           16	rm -fv $(ALL)           17           18$(BIN_DIR) $(PACKAGES_DIR):           19	mkdir -p $@           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           29$(btdu): $(MAKE_TMPDIR)/btdu     4     30	echo 35b9bb752e6aa902b8281e92a5411b2f1cfb9fa251089adf909dc95efc011c48 $(MAKE_TMPDIR)/btdu | sha256sum --check     5       	mv $(MAKE_TMPDIR)/btdu $@           31	cp $(MAKE_TMPDIR)/btdu $@           32	chmod +x $@     6     33     7     34$(MAKE_TMPDIR)/btdu:     8     35	wget https://github.com/CyberShadow/btdu/releases/download/v0.6.0/btdu-static-x86_64 -O $(MAKE_TMPDIR)/btdu           36           37$(opensnitch): $(MAKE_TMPDIR)/opensnitch.rpm           38	echo 2caf4e13ffd1b7af48306a2e9e979042f526823720b42bee4c00194f140d64dd $(MAKE_TMPDIR)/opensnitch.rpm | sha256sum --check           39	cp $(MAKE_TMPDIR)/opensnitch.rpm $@           40           41$(MAKE_TMPDIR)/opensnitch.rpm:           42		wget https://github.com/evilsocket/opensnitch/releases/download/v1.7.2/opensnitch-1.7.2-1.x86_64.rpm -O $(MAKE_TMPDIR)/opensnitch.rpm           43           44$(opensnitch_ui): $(MAKE_TMPDIR)/opensnitch_ui.rpm           45	echo b26029cbc83880ebc92170035d50237c13b17ffc0b3cf52b89fa1348edfdfb43 $(MAKE_TMPDIR)/opensnitch_ui.rpm | sha256sum --check           46	cp $(MAKE_TMPDIR)/opensnitch_ui.rpm $@           47           48$(MAKE_TMPDIR)/opensnitch_ui.rpm:           49	wget https://github.com/evilsocket/opensnitch/releases/download/v1.7.2/opensnitch-ui-1.7.2-1.noarch.rpm -O $(MAKE_TMPDIR)/opensnitch_ui.rpm           50           51mkosi.crt:           52	ln -s ~/Vaults/particleos_keys/sbctl/var/keys/db/db.pem mkosi.crt           53           54mkosi.key:           55	ln -s ~/Vaults/particleos_keys/sbctl/var/keys/db/db.key mkosi.key           56           57.PHONY: build           58build:           59	mkosi build --auto-bump           60           61.PHONY: systemd           62systemd:           63	sh -c 'cd systemd && mkosi -t none -f --distribution=fedora --release=43'           64           65.PHONY: sysupdate           66sysupdate:           67	mkosi sysupdate -- update           68	mkdir -p versions           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'

             @@ -11,10 +11,20 @@    11     11[Config]    12     12Profiles=desktop,kde,custom    13     13           14[Output]           15ManifestFormat=changelog           16    14     17[Content]    15     18VolatilePackageDirectories=./systemd/build/mkosi.builddir/fedora~43~x86-64/    16     19Packages=           20        # keyrings for building other distro images           21        archlinux-keyring           22        debian-keyring    17     23        ansible           24        ansible-collection-ansible-posix           25        ansible-collection-community-postgresql           26        ansible-collection-community-general           27        ansible-collection-community-crypto    18     28        awk    19     29        bash    20     30        bash-completion             @@ -26,9 +36,11 @@    26     36        cowsay    27     37        cmatrix    28     38        curl    29               debian-keyring    30     39        dictd           40        diffoscope    31     41        du-dust           42        duf           43        d2    32     44        emacs    33     45        entr    34     46        exfatprogs             @@ -66,6 +78,9 @@    66     78        ImageMagick    67     79        iperf3    68     80        java-latest-openjdk           81        katago-opencl           82        intel-opencl           83        OpenCL-ICD-Loader    69     84        @kde-desktop    70     85        kde-connect    71     86        kde-partitionmanager             @@ -90,6 +105,7 @@    90    105        neovim    91    106        ninja    92    107        okular          108        opentofu    93    109        osc    94    110        # needed for bell fish function    95    111        oxygen-sounds             @@ -107,7 +123,9 @@   107    123        plasma-vault   108    124        pnpm   109    125        powertop          126        progress   110    127        proxychains-ng          128        pv   111    129        python3-netaddr   112    130        ripgrep   113    131        rubygem-asciidoctor             @@ -120,7 +138,7 @@   120    138        stgit   121    139        tcpdump   122    140        # not yet available for fedora 43   123               # terraform-ls          141        terraform-ls   124    142        tmux   125    143        toolbox   126    144        tor             @@ -136,15 +154,8 @@   136    154        wireshark   137    155        yubikey-manager   138    156        kernel   139               repository/opensnitch-ui-1.7.1-1.noarch.rpm   140               repository/opensnitch-1.7.1-1.x86_64.rpm          157        # repository directory comes from mkosi.packages          158        repository/opensnitch_ui.rpm          159        repository/opensnitch.rpm   141    160        python3-grpcio+protobuf   142    161        python3-slugify   143          144       [Validation]   145       SecureBootKey=./keys/sbctl/var/keys/db/db.key   146       SecureBootCertificate=./keys/sbctl/var/keys/db/db.pem   147       SignExpectedPcrKey=./keys/sbctl/var/keys/db/db.key   148       SignExpectedPcrCertificate=./keys/sbctl/var/keys/db/db.pem   149       VerityKey=./keys/sbctl/var/keys/db/db.key   150       VerityCertificate=./keys/sbctl/var/keys/db/db.pem

             @@ -1,1 +1,1 @@     1       c2678480a79ad1fcab0b5c9a4c3195dbe0c490d1            153405835a2aa6e360863660f1e0e4d9a9688085f

             @@ -0,0 +1,4 @@            1#!/usr/bin/sh            2            3chmod 755 /usr/bin/dumpcap            4setcap -r /usr/bin/dumpcap

             @@ -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             @@ -104,3 +110,4 @@   104    110   105    111# miscellaneous legacy file   106    112L? /etc/shells          113L? /etc/hosts

             @@ -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

             @@ -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