summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile1
-rw-r--r--patterns/base-desktop.yaml18
-rw-r--r--patterns/base.yaml14
-rw-r--r--patterns/console-tools.yaml4
-rw-r--r--patterns/development.yaml1
-rw-r--r--patterns/pc-adaptation.yaml7
-rw-r--r--patterns/x11.yaml13
8 files changed, 34 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..53752db
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+output
diff --git a/Makefile b/Makefile
index b296dcb..e5def49 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ install:
install -D scripts/* ${DESTDIR}/usr/share/image-configurations/base/scripts
test:
+ merge-patterns -o output/ -p patterns -s
kickstarter -c base.yaml -e ks -r base-repos.yaml
tag:
diff --git a/patterns/base-desktop.yaml b/patterns/base-desktop.yaml
new file mode 100644
index 0000000..ff9734e
--- /dev/null
+++ b/patterns/base-desktop.yaml
@@ -0,0 +1,18 @@
+Description: Base Desktop
+Name: base-desktop
+Packages:
+- xf86-input-synaptics
+- xf86-video-fbdev
+- xf86-video-intel
+- xf86-input-keyboard
+- xf86-input-evdev
+- xorg-launch-helper
+- user-session-units
+- update-desktop-files
+- desktop-file-utils
+- dbus-x11
+- xterm
+- connman
+- wpa_supplicant
+- rfkill
+Summary: Base Desktop
diff --git a/patterns/base.yaml b/patterns/base.yaml
index b0613e4..9e0c91b 100644
--- a/patterns/base.yaml
+++ b/patterns/base.yaml
@@ -1,21 +1,18 @@
Description: Base System
Name: base
Packages:
-- dracut
- openssh
- e2fsprogs
- util-linux
- grep
-- connman
-- rfkill
- kmod-compat
- kmod
-- kernel-adaptation-pc
- tzdata
+- pwdutils
+- pam
- setup
- filesystem
- systemd
-- user-session-units
- bash
- coreutils
- rpm
@@ -27,13 +24,8 @@ Packages:
- procps
- psmisc
- net-tools
-- parted
- kbd
- glibc-locale
-- linux-firmware
- pciutils
-- wpa_supplicant
-- rsync
-- update-desktop-files
-- desktop-file-utils
+- connman
Summary: Base System
diff --git a/patterns/console-tools.yaml b/patterns/console-tools.yaml
index ddc583f..6c5276b 100644
--- a/patterns/console-tools.yaml
+++ b/patterns/console-tools.yaml
@@ -1,16 +1,18 @@
Description: Console Tools
Name: console-tools
Packages:
+- rsync
+- parted
- zip
- vim
- unzip
- less
- xz
-- gdb
- nano
- strace
- diffutils
- patch
- findutils
- wdiff
+- powertop
Summary: Console Tools
diff --git a/patterns/development.yaml b/patterns/development.yaml
index 8ed041b..543609c 100644
--- a/patterns/development.yaml
+++ b/patterns/development.yaml
@@ -31,4 +31,5 @@ Packages:
- wdiff
- nasm
- vim
+- powertop
Summary: Development
diff --git a/patterns/pc-adaptation.yaml b/patterns/pc-adaptation.yaml
new file mode 100644
index 0000000..4a23824
--- /dev/null
+++ b/patterns/pc-adaptation.yaml
@@ -0,0 +1,7 @@
+Description: PC Adaptation
+Name: pc-adaptation
+Packages:
+ - dracut
+ - linux-firmware
+ - kernel-adaptation-pc
+Summary: PC Adaptation
diff --git a/patterns/x11.yaml b/patterns/x11.yaml
deleted file mode 100644
index d4fa28d..0000000
--- a/patterns/x11.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: X11
-Name: x11
-Packages:
-- xf86-input-synaptics
-- xf86-video-cirrus
-- xf86-video-fbdev
-- xf86-video-intel
-- xf86-input-keyboard
-- xf86-input-evdev
-- xorg-launch-helper
-- dbus-x11
-- xterm
-Summary: X11