Merge branch 'master' of github.com:dylanaraps/kiss-experiment

core/baselayout/checksums

@@ -4,7 +4,7 @@ e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696  fstab
 a0fa9cd303cf7f1718f51e5624a671a418946718b790508b8988bccd542c6451  host.conf
 eda9afe39a3562406f14cb8a5a142922b63e68467d3ba4821c02eaa142d9c4da  hosts
 e82a871a81ef0af4063475064857b884b63ad3bc01470dbb85da64a2f4d5dce4  issue
-4aff967e535fcaa0bcf1823dad845d28789d61beb73b05e740af2bb21f098b8b  os-release
+425c5b892fa181d8e3e3f1c7ed8ad61cc149630b1fed49f8bddf439e7a3416bc  os-release
 7762b65442cd3e930d9b4ec470e01bc53938bc5ed3d7aedeed47977b78f54843  passwd
 5aa69b5acea1deb625c46ce481d96e4e21558ae2e39ca74fc5b6a5674329f403  profile
 7e47176cd83b91bdbc3a0b10ae5d5c093b81a9c8c0c1fb714f5438381124c760  securetty

core/baselayout/files/os-release

@@ -2,7 +2,7 @@ NAME="KISS Linux"
 PRETTY_NAME="KISS Linux"
 ID=kiss
 BUILD_ID=rolling
-HOME_URL="https://kissx.github.io"
-DOCUMENTATION_URL="https://github.com/kissx/kiss"
-SUPPORT_URL="https://github.com/kissx/kiss/issues"
-BUG_REPORT_URL="https://github.com/kissx/kiss/issues"
+HOME_URL="https://kisslinux.github.io"
+DOCUMENTATION_URL="https://kisslinux.github.io"
+SUPPORT_URL="https://github.com/kisslinux/packages/issues"
+BUG_REPORT_URL="https://github.com/kisslinux/packages/issues"

core/e2fsprogs/build

@@ -2,6 +2,8 @@
 
 ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
     --enable-symlink-install \
     --disable-uuidd \
     --disable-libuuid \

core/e2fsprogs/version

@@ -1 +1 @@
-1.45.2 2
+1.45.2 3

core/grub/build

@@ -7,6 +7,9 @@
 # Grub is built in a function so the script argument needs to be stored.
 pkg_dir=$1
 
+# Change naming from GNU/Linux to Linux.
+sed 's|GNU/Linux|Linux|' -i grub/util/grub.d/10_linux.in
+
 build_grub() (
     cp -R grub "grub-${1##*=}"
     cd "grub-${1##*=}"
@@ -16,6 +19,7 @@ build_grub() (
     ./configure \
         --prefix=/usr \
         --sbindir=/usr/bin \
+        --sysconfdir=/etc \
         --disable-nls \
         --disable-werror \
         "$@"
@@ -27,6 +31,9 @@ build_grub() (
 build_grub --with-platform=pc
 build_grub --with-platform=efi --disable-efiemu
 
+# Install /etc/default/grub (used by grub-mkconfig).
+install -Dm0644 grub.default "$1/etc/default/grub"
+
 # Remove gdb debugging files.
 (
     cd "$pkg_dir"
@@ -37,3 +44,6 @@ build_grub --with-platform=efi --disable-efiemu
     rm -f usr/lib/grub/*/gmodule.pl
     rm -f usr/lib/charset.alias
 ) ||:
+
+# Remove unneedded file by musl
+rm -f "$1/usr/lib/charset.alias"

core/grub/checksums

@@ -1,3 +1,4 @@
 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f  grub-2.02.tar.xz
 dd64709462eb8218e88c1c4298fb6c0f3c5a741438509226c641b60cbd7818bd  0008-Fix-packed-not-aligned-error-on-GCC-8.patch
 55802405cfd186ce9a0f4f166c82538dbd71fb2526af2217e023789c208f26d3  grub-2.02-relocation_fix-1.patch
+93cde7ed22280bf1bf205d1e2c9700c64d8d32bd759569f6e00913ec001389c5  grub.default

core/grub/files/grub.default

@@ -0,0 +1,53 @@
+# GRUB boot loader configuration
+
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="KISS"
+GRUB_CMDLINE_LINUX_DEFAULT="loglevel=3 quiet"
+
+# Preload both GPT and MBR modules so that they are not missed
+GRUB_PRELOAD_MODULES="part_gpt part_msdos"
+
+# Uncomment to enable booting from LUKS encrypted devices
+#GRUB_ENABLE_CRYPTODISK=y
+
+# Set to 'countdown' or 'hidden' to change timeout behavior,
+# press ESC key to display menu.
+#GRUB_TIMEOUT_STYLE=menu
+
+# Uncomment to use basic console
+#GRUB_TERMINAL_INPUT=console
+
+# Uncomment to disable graphical terminal
+#GRUB_TERMINAL_OUTPUT=console
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+#GRUB_GFXMODE=auto
+
+# Uncomment to allow the kernel use the same resolution used by grub
+#GRUB_GFXPAYLOAD_LINUX=keep
+
+# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
+# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY=true
+
+# Uncomment and set to the desired menu colors.  Used by normal and wallpaper
+# modes only.  Entries specified as foreground/background.
+#GRUB_COLOR_NORMAL="light-blue/black"
+#GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
+
+# Uncomment one of them for the gfx desired, a image background or a gfxtheme
+#GRUB_BACKGROUND="/path/to/wallpaper"
+#GRUB_THEME="/path/to/gfxtheme"
+
+# Uncomment to get a beep at GRUB start
+#GRUB_INIT_TUNE="480 440 1"
+
+# Uncomment to make GRUB remember the last selection. This requires to
+# set 'GRUB_DEFAULT=saved' above.
+#GRUB_SAVEDEFAULT="true"

core/grub/sources

@@ -1,3 +1,4 @@
 ftp://ftp.gnu.org/gnu/grub/grub-2.02.tar.xz grub/
 patches/0008-Fix-packed-not-aligned-error-on-GCC-8.patch grub/
 patches/grub-2.02-relocation_fix-1.patch grub/
+files/grub.default

core/grub/version

@@ -1 +1 @@
-2.02 1
+2.02 2

core/libnl3/build

@@ -6,6 +6,7 @@ sed -i '/<linux\/if_bridge.h>/i#define _LINUX_IN6_H' lib/route/link/bridge.c
 
 ./configure \
     --prefix=/usr \
+    --sysconfdir=/etc \
     --disable-static
 
 make

core/libnl3/version

@@ -1 +1 @@
-3.4.0 1
+3.4.0 2

xorg/fontconfig/build

@@ -3,7 +3,8 @@
 ./configure \
     --prefix=/usr \
     --localstatedir=/var \
-    --sysconfdir=/etc
+    --sysconfdir=/etc \
+    --with-xmldir=/etc/fonts
 
 make
 make DESTDIR="$1" install

xorg/fontconfig/version

@@ -1 +1 @@
-2.13.91 2
+2.13.91 3