package/contrib/mkinitcpio/hotfix.patch

   1 # --- T2-COPYRIGHT-BEGIN ---
   2 # t2/package/*/mkinitcpio/hotfix.patch
   3 # Copyright (C) 2025 The T2 SDE Project
   4 # SPDX-License-Identifier: GPL-2.0 or patched project license
   5 # --- T2-COPYRIGHT-END ---
   6
   7 --- mkinitcpio-v39.2/Makefile.vanilla   2025-01-07 20:35:08.973342194 -0500
   8 +++ mkinitcpio-v39.2/Makefile   2025-01-07 20:36:29.210009772 -0500
   9 @@ -68,12 +68,12 @@
  10         chmod 755 $(DESTDIR)/usr/bin/lsinitcpio $(DESTDIR)/usr/bin/mkinitcpio
  11
  12         install -m644 mkinitcpio.conf $(DESTDIR)/etc/mkinitcpio.conf
  13 -       install -m755 -t $(DESTDIR)/usr/lib/initcpio init shutdown functions
  14 -       install -m644 -t $(DESTDIR)/usr/lib/initcpio init_functions
  15 +       install -m755 init shutdown functions -t $(DESTDIR)/usr/lib/initcpio
  16 +       install -m644 init_functions -t $(DESTDIR)/usr/lib/initcpio
  17         install -m644 udev/01-memdisk.rules $(DESTDIR)/usr/lib/initcpio/udev/01-memdisk.rules
  18
  19         cp -at $(DESTDIR)/usr/lib/initcpio hooks install
  20 -       install -m644 -t $(DESTDIR)/usr/share/mkinitcpio mkinitcpio.d/*
  21 +       install -m644 mkinitcpio.d/* -t $(DESTDIR)/usr/share/mkinitcpio
  22
  23         install -m644 systemd/mkinitcpio-generate-shutdown-ramfs.service \
  24                 $(DESTDIR)/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service
  25 --- mkinitcpio-v39.2/Makefile.vanilla   2025-01-07 20:50:41.273352718 -0500
  26 +++ mkinitcpio-v39.2/Makefile   2025-01-07 20:51:00.450019605 -0500
  27 @@ -72,13 +72,13 @@
  28         install -m644 init_functions -t $(DESTDIR)/usr/lib/initcpio
  29         install -m644 udev/01-memdisk.rules $(DESTDIR)/usr/lib/initcpio/udev/01-memdisk.rules
  30
  31 -       cp -at $(DESTDIR)/usr/lib/initcpio hooks install
  32 +       cp -a hooks install -t $(DESTDIR)/usr/lib/initcpio
  33         install -m644 mkinitcpio.d/* -t $(DESTDIR)/usr/share/mkinitcpio
  34
  35         install -m644 systemd/mkinitcpio-generate-shutdown-ramfs.service \
  36                 $(DESTDIR)/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service
  37         for target in $(addprefix $(DESTDIR),$(SHUTDOWN_DIRS)); do \
  38 -               ln -s ../mkinitcpio-generate-shutdown-ramfs.service -t $$target || exit; \
  39 +               ln -sf ../mkinitcpio-generate-shutdown-ramfs.service -t $$target || exit; \
  40         done
  41         install -m644 tmpfiles/mkinitcpio.conf $(DESTDIR)/usr/lib/tmpfiles.d/mkinitcpio.conf
  42
  43 @@ -87,7 +87,7 @@
  44         install -m644 man/mkinitcpio.8 $(DESTDIR)/usr/share/man/man8/mkinitcpio.8
  45         install -m644 man/mkinitcpio.conf.5 $(DESTDIR)/usr/share/man/man5/mkinitcpio.conf.5
  46         install -m644 man/lsinitcpio.1 $(DESTDIR)/usr/share/man/man1/lsinitcpio.1
  47 -       ln -s mkinitcpio $(DESTDIR)/usr/share/bash-completion/completions/lsinitcpio
  48 +       ln -sf mkinitcpio $(DESTDIR)/usr/share/bash-completion/completions/lsinitcpio
  49
  50  install-hooks: prepare
  51         install -m644 libalpm/hooks/90-mkinitcpio-install.hook $(DESTDIR)/usr/share/libalpm/hooks/90-mkinitcpio-install.hook
  52 --- mkinitcpio-v39.2/mkinitcpio.vanilla 2025-01-08 17:51:54.407252309 -0500
  53 +++ mkinitcpio-v39.2/mkinitcpio 2025-01-08 17:51:58.683924615 -0500
  54 @@ -33,9 +33,6 @@
  55  _optskiphooks=() _optaddhooks=() _hooks=() _optpreset=() _tmpfiles=() _generated=()
  56  declare -A _runhooks _addedmodules _modpaths _autodetect_cache
  57
  58 -# export a sane PATH
  59 -export PATH='/usr/bin'
  60 -
  61  # Sanitize environment further
  62  # GREP_OPTIONS="--color=always" will break everything
  63  # CDPATH can affect cd and pushd