Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / syslinux
Commits: c0dbb98b by nl6720 at 2024-09-30T14:49:53+03:00 Move syslinux.cfg to /usr/share/syslinux/ Avoid placing packaged files in /boot/ and instead use `syslinux-install_update` to copy the syslinux.cfg file there. Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/syslinux/-/issues/2 - - - - - 3 changed files: - PKGBUILD - syslinux-install_update - syslinux.install Changes: ===================================== PKGBUILD ===================================== @@ -46,7 +46,7 @@ source=(git+https://repo.or.cz/syslinux.git#commit=$_commit ) sha256sums=('68114f20d8cd35803053d8633d2ada641b264978d6fcf46ee132ad9447a727bd' 'b9692be0cce43811c1b04053072ac50dd7b39bbc2ba7bcbe0e4387668af8df08' - '5f86b5813465c48ba7bd178389aacb5149ff0b5f2467ab1772a4f862c5b15d41' + '6b7a1dae92052226d4958f28f8302b8bf7725ce75895986105d4799234efcbbe' 'd1fe9084ce2526619f94b8a07b89fb0194e874beef9f202f8b974879d77f2e1a' '8610959df6c01568ff478ca1eb4aac301f3ba1f5bd4739daaec072865e8be2d7' '5b017ba5eae77caa09fa5af6ecfa0df1e7e22776b2b13c8744c6cb7ecd7ad0e9' @@ -112,6 +112,6 @@ package() { install -d "$pkgdir"/usr/lib/syslinux/bios mv "$pkgdir"/usr/lib/syslinux/{*.bin,*.c32,*.0,memdisk} "$pkgdir"/usr/lib/syslinux/bios - install -D -m0644 ../syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg + install -D -m0644 ../syslinux.cfg "$pkgdir"/usr/share/syslinux/syslinux.cfg install -D -m0755 ../syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update } ===================================== syslinux-install_update ===================================== @@ -37,6 +37,7 @@ EXTLINUX="/usr/bin/extlinux" bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE" pciids_file="/usr/share/hwdata/pci.ids" +cfg_file="/usr/share/syslinux/syslinux.cfg" ## Helper functions ## # Taken from libui-sh @@ -324,6 +325,9 @@ install_modules() { } _install() { + [[ ! -d "$bios_bootpath" ]] && install -d -- "$bios_bootpath" + [[ ! -e "${bios_bootpath}/syslinux.cfg" ]] && install -m0644 -- "$cfg_file" "${bios_bootpath}/syslinux.cfg" + install_modules if device_is_raid "$bootpart" ; then ===================================== syslinux.install ===================================== @@ -25,6 +25,11 @@ post_install() { } post_upgrade() { + # Move /boot/syslinux/syslinux.cfg back now that it is not packaged anymore. + if [ ! -f /boot/syslinux/syslinux.cfg -a -f /boot/syslinux/syslinux.cfg.pacsave ]; then + mv /boot/syslinux/syslinux.cfg.pacsave /boot/syslinux/syslinux.cfg + fi + ## auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists /usr/bin/syslinux-install_update -s View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/syslinux/-/commit/c0dbb98be0b7065eddbb5d35947ebfa0caf1fdee -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/syslinux/-/commit/c0dbb98be0b7065eddbb5d35947ebfa0caf1fdee You're receiving this email because of your account on gitlab.archlinux.org.
