diff options
Diffstat (limited to 'sysutils/slurm-wlm/files')
17 files changed, 31 insertions, 655 deletions
diff --git a/sysutils/slurm-wlm/files/patch-configure b/sysutils/slurm-wlm/files/patch-configure deleted file mode 100644 index 51cf89bd4981..000000000000 --- a/sysutils/slurm-wlm/files/patch-configure +++ /dev/null @@ -1,242 +0,0 @@ ---- configure.orig 2023-11-21 22:33:29 UTC -+++ configure -@@ -5513,7 +5513,7 @@ _ACEOF - /* end confdefs.h. */ - $ac_c_conftest_c99_program - _ACEOF --for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -+for ac_arg in '' -std=gnu99 -qlanglvl=extc1x -qlanglvl=extc99 - do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -@@ -6659,7 +6659,7 @@ _ACEOF - /* end confdefs.h. */ - $ac_c_conftest_c99_program - _ACEOF --for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -+for ac_arg in '' -std=gnu99 -qlanglvl=extc1x -qlanglvl=extc99 - do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -@@ -7270,7 +7270,7 @@ _ACEOF - /* end confdefs.h. */ - $ac_cxx_conftest_cxx98_program - _ACEOF --for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA -+for ac_arg in '' -std=gnu++98 -qlanglvl=extended -AA - do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -@@ -12320,7 +12320,7 @@ printf %s "checking whether the $compiler linker ($LD) - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no -- link_all_deplibs=unknown -+ link_all_deplibs=no - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= -@@ -12622,7 +12622,7 @@ _LT_EOF - wlarc= - else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - fi - ;; - -@@ -12641,7 +12641,7 @@ _LT_EOF - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -12670,7 +12670,7 @@ _LT_EOF - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -12688,7 +12688,7 @@ _LT_EOF - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -13344,7 +13344,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver' - hardcode_libdir_flag_spec='$wl-rpath,$libdir' - export_dynamic_flag_spec='$wl-E' - else -@@ -14194,7 +14194,7 @@ freebsd* | dragonfly*) - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' - soname_spec='$libname$release$shared_ext$major' - need_version=no - need_lib_prefix=no -@@ -15345,7 +15345,7 @@ printf %s "checking whether stripping libraries is pos - old_striplib= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 - printf %s "checking whether stripping libraries is possible... " >&6; } --if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -15592,7 +15592,7 @@ module_expsym_cmds_CXX= - inherit_rpath_CXX=no - module_cmds_CXX= - module_expsym_cmds_CXX= --link_all_deplibs_CXX=unknown -+link_all_deplibs_CXX=no - old_archive_cmds_CXX=$old_archive_cmds - reload_flag_CXX=$reload_flag - reload_cmds_CXX=$reload_cmds -@@ -15806,7 +15806,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - # archiving commands below assume that GNU ld is being used. - if test yes = "$with_gnu_ld"; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - - hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' - export_dynamic_flag_spec_CXX='$wl--export-dynamic' -@@ -16502,7 +16502,7 @@ fi - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= -@@ -16510,7 +16510,7 @@ fi - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no -@@ -16542,7 +16542,7 @@ fi - ;; - *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - ;; - esac - -@@ -16553,7 +16553,7 @@ fi - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-version-script $wl$lib-ver' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' -@@ -16587,7 +16587,7 @@ fi - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script $wl$lib-ver' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - compiler_needs_object_CXX=yes -@@ -16655,7 +16655,7 @@ fi - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then -- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script,$lib-ver -o $lib' - export_dynamic_flag_spec_CXX='$wl-E' - whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' - fi -@@ -18186,7 +18186,7 @@ freebsd* | dragonfly*) - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' - soname_spec='$libname$release$shared_ext$major' - need_version=no - need_lib_prefix=no -@@ -21930,7 +21930,7 @@ case $host_os in - - case $host_os in - -- freebsd*) -+dragonfly* | freebsd*) - - # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) - # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -@@ -22897,24 +22897,19 @@ HDF5 support is being disabled (equivalent to --with-h - with_hdf5="no" - with_hdf5_fortran="no" - else -- HDF5_SHOW=$(eval $H5CC -show) -+ HDF5_SHOW=`$PKG_CONFIG --cflags hdf5 --libs hdf5` - -- HDF5_CC=$(eval $H5CC -show | head -n 1 | $AWK '{print $1}') -- if test "$HDF5_CC" = "ccache"; then -- HDF5_CC=$(eval $H5CC -show | head -n 1 | $AWK '{print $2}') -- fi -+ HDF5_CC=$CC - - -- HDF5_VERSION=$(eval $H5CC -showconfig | $GREP 'HDF5 Version:' \ -- | $AWK '{print $3}') -+ HDF5_VERSION=`$GREP 'HDF5 Version:' /usr/local/lib/libhdf5.settings \ -+ | $AWK '{print $3}'` - -- HDF5_tmp_flags=$(eval $H5CC -showconfig \ -- | $GREP 'FLAGS\|Extra libraries:' \ -- | $AWK -F: '{printf("%s "), $2}' ) -+ HDF5_tmp_flags=`$GREP 'FLAGS\|Extra libraries:' /usr/local/lib/libhdf5.settings \ -+ | $AWK -F: '{printf("%s "), $2}'` - -- HDF5_tmp_inst=$(eval $H5CC -showconfig \ -- | $GREP 'Installation point:' \ -- | $AWK '{print $NF}' ) -+ HDF5_tmp_inst=`$GREP 'Installation point:' /usr/local/lib/libhdf5.settings \ -+ | $AWK '{print $NF}'` - - HDF5_CPPFLAGS="-I${HDF5_tmp_inst}/include" - -@@ -23062,7 +23057,7 @@ printf "%s\n" "$H5FC" >&6; } - with_hdf5_fortran="yes" - - -- for arg in `$H5FC -show` -+ for arg in `$PKG_CONFIG --cflags hdf5_fortran --libs hdf5_fortran` - do - case "$arg" in #( - -I*) echo $HDF5_FFLAGS | $GREP -e "$arg" >/dev/null \ -@@ -23172,7 +23167,7 @@ fi - - if test "$ax_compare_version" = "true" ; then - --printf "%s\n" "#define H5_NO_DEPRECATED_SYMBOLS 1" >>confdefs.h -+# Remove on FreeBSD ports because we use 1.12 with 1.10 API - - else - printf "%s\n" "#define H5_USE_18_API 1" >>confdefs.h diff --git a/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example b/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example deleted file mode 100644 index ce9c31fd439b..000000000000 --- a/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example +++ /dev/null @@ -1,116 +0,0 @@ ---- etc/slurm.conf.example.orig 2023-11-21 22:33:29 UTC -+++ etc/slurm.conf.example -@@ -8,8 +8,9 @@ - # Put this file on all nodes of your cluster. - # See the slurm.conf man page for more information. - # --ClusterName=cluster --SlurmctldHost=linux0 -+ClusterName=Beastie -+# Short hostname of the head node -+SlurmctldHost=head - #SlurmctldHost= - # - #DisableRootJobs=NO -@@ -41,7 +42,7 @@ ProctrackType=proctrack/cgroup - #PrologFlags= - #PrologSlurmctld= - #PropagatePrioProcess=0 --#PropagateResourceLimits= -+PropagateResourceLimits=NONE - #PropagateResourceLimitsExcept= - #RebootProgram= - ReturnToService=1 -@@ -58,6 +59,8 @@ TaskPlugin=task/affinity - SwitchType=switch/none - #TaskEpilog= - TaskPlugin=task/affinity -+TaskPluginParam=cores -+# For debugging: TaskPluginParam=cores,verbose - #TaskProlog= - #TopologyPlugin=topology/tree - #TmpFS=/tmp -@@ -88,11 +91,12 @@ Waittime=0 - # - # - # SCHEDULING --#DefMemPerCPU=0 -+DefMemPerCPU=256 - #MaxMemPerCPU=0 - #SchedulerTimeSlice=30 - SchedulerType=sched/backfill - SelectType=select/cons_tres -+SelectTypeParameters=CR_Core_Memory - # - # - # JOB PRIORITY -@@ -115,9 +119,11 @@ SelectType=select/cons_tres - #AccountingStorageHost= - #AccountingStoragePass= - #AccountingStoragePort= --AccountingStorageType=accounting_storage/none -+#AccountingStorageType=accounting_storage/slurmdb -+#AccountingStorageLoc=/home/slurm/Accounting -+#AccountingStoreJobComment=YES - #AccountingStorageUser= --#AccountingStoreFlags= -+AccountingStoreFlags=job_comment - #JobCompHost= - #JobCompLoc= - #JobCompPass= -@@ -128,9 +134,9 @@ SlurmctldDebug=info - JobAcctGatherFrequency=30 - JobAcctGatherType=jobacct_gather/none - SlurmctldDebug=info --SlurmctldLogFile=/var/log/slurmctld.log -+SlurmctldLogFile=/var/log/slurm/slurmctld - SlurmdDebug=info --SlurmdLogFile=/var/log/slurmd.log -+SlurmdLogFile=/var/log/slurm/slurmd - #SlurmSchedLogFile= - #SlurmSchedLogLevel= - #DebugFlags= -@@ -148,6 +154,41 @@ SlurmdLogFile=/var/log/slurmd.log - #SuspendTime= - # - # -+ -+############################################################################ -+# Enable power saving if remote IPMI power-on is available on compute nodes. -+# If unavailable on some nodes, list them in SuspendExcNodes. -+# SlurmUser must be a member of operator and wheel and have a valid -+# login shell in order to execute shutdown on compute nodes. -+# If you prefer to control power manually, see the following scripts -+# from the SPCM port: -+ # -+# auto-ipmi-remote-power -+# cluster-power-saver -+# cluster-power-waster -+# cluster-ipmi-power-on -+############################################################################ -+ -+# SuspendProgram=/usr/local/etc/spcm/slurm-node-suspend -+# SuspendTime should be >= SuspendTimeout + ResumeTimeout. -+# SuspendTime=600 -+# SuspendTimeout=60 -+# -+# ResumeProgram=/usr/local/etc/spcm/slurm-node-resume -+# ResumeTimeout=300 -+# BatchStartTimeout=300 -+# -+# Exempt compute nodes that double as file servers or don't have IPMI -+# remote power-on enabled. -+# -+# SuspendExcNodes=compute-001 -+ -+# - # COMPUTE NODES --NodeName=linux[1-32] CPUs=1 State=UNKNOWN --PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP -+# Set RealMemory < avail memory in /var/run/dmesg.boot -+# Note that it may change slightly following freebsd-update -+NodeName=compute-[001-002] Sockets=2 CoresPerSocket=6 RealMemory=30000 State=UNKNOWN -+# NodeName=compute-256g-[001-002] Sockets=2 CoresPerSocket=6 RealMemory=250000 State=UNKNOWN -+# PartitionName=debug Nodes=ALL Default=NO MaxTime=INFINITE State=UP -+PartitionName=batch Nodes=compute-[001-002] Default=YES MaxTime=INFINITE State=UP -+# PartitionName=256g Nodes=compute-256g-[001-002] Default=NO MaxTime=INFINITE State=UP diff --git a/sysutils/slurm-wlm/files/patch-src_common_callerid.h b/sysutils/slurm-wlm/files/patch-src_common_callerid.h deleted file mode 100644 index e6ad8f5413d2..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_common_callerid.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/common/callerid.h.orig 2023-06-15 19:16:14 UTC -+++ src/common/callerid.h -@@ -43,6 +43,7 @@ - #ifdef __FreeBSD__ - #include <sys/socket.h> - #include <netinet/in.h> -+#include <netdb.h> - #endif - - typedef struct { diff --git a/sysutils/slurm-wlm/files/patch-src_common_conmgr.c b/sysutils/slurm-wlm/files/patch-src_common_conmgr.c deleted file mode 100644 index 4a536f2854cc..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_common_conmgr.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/conmgr.c.orig 2023-11-21 22:33:29 UTC -+++ src/common/conmgr.c -@@ -47,6 +47,8 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <sys/un.h> -+#include <sys/param.h> -+#include <sys/ucred.h> - #include <time.h> - #include <unistd.h> - diff --git a/sysutils/slurm-wlm/files/patch-src_common_slurm__protocol__socket.c b/sysutils/slurm-wlm/files/patch-src_common_slurm__protocol__socket.c deleted file mode 100644 index d5ae5ef84c32..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_common_slurm__protocol__socket.c +++ /dev/null @@ -1,43 +0,0 @@ ---- src/common/slurm_protocol_socket.c.orig 2024-05-21 17:19:51 UTC -+++ src/common/slurm_protocol_socket.c -@@ -491,6 +491,27 @@ extern int slurm_init_msg_engine(slurm_addr_t *addr, b - extern int slurm_init_msg_engine(slurm_addr_t *addr, bool quiet) - { - int rc; -+ -+ #if defined(__FreeBSD__) -+ /* -+ * FreeBSD requires the sa_len field to be set correctly in -+ * struct sockaddr_in / sockaddr_in6 before calling bind(). -+ * If it is unset, bind() may fail with EINVAL. -+ * -+ * This adjustment ensures the correct length is set based -+ * on the address family before bind() is called. -+ */ -+ if (addr->ss_family == AF_INET) { -+ ((struct sockaddr_in *)addr)->sin_len = sizeof(struct sockaddr_in); -+ } else if (addr->ss_family == AF_INET6) { -+ ((struct sockaddr_in6 *)addr)->sin6_len = sizeof(struct sockaddr_in6); -+ } -+ -+ /* Track the correct length for bind() */ -+ socklen_t bind_len = (addr->ss_family == AF_INET6) -+ ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in); -+ #endif -+ - int fd; - int log_lvl = LOG_LEVEL_ERROR; - const int one = 1; -@@ -511,7 +532,11 @@ extern int slurm_init_msg_engine(slurm_addr_t *addr, b - goto error; - } - -- rc = bind(fd, (struct sockaddr const *) addr, sizeof(*addr)); -+ #if defined(__FreeBSD__) -+ rc = bind(fd, (struct sockaddr const *) addr, bind_len); -+ #else -+ rc = bind(fd, (struct sockaddr const *) addr, sizeof(*addr)); -+ #endif - if (rc < 0) { - format_print(log_lvl, "Error binding slurm stream socket: %m"); - goto error; diff --git a/sysutils/slurm-wlm/files/patch-src_interfaces_cgroup.c b/sysutils/slurm-wlm/files/patch-src_interfaces_cgroup.c deleted file mode 100644 index 4b8616be9ee3..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_interfaces_cgroup.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/interfaces/cgroup.c.orig 2024-05-21 17:19:51 UTC -+++ src/interfaces/cgroup.c -@@ -421,6 +421,7 @@ extern char *autodetect_cgroup_version(void) - struct statfs fs; - int cgroup_ver = -1; - -+#ifndef __FreeBSD__ - if (statfs("/sys/fs/cgroup/", &fs) < 0) { - error("cgroup filesystem not mounted in /sys/fs/cgroup/"); - return NULL; -@@ -453,6 +454,7 @@ extern char *autodetect_cgroup_version(void) - error("Unknown filesystem type mounted on /sys/fs/cgroup"); - return NULL; - } -+#endif - - log_flag(CGROUP, "%s: using cgroup version %d", __func__, cgroup_ver); - diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_auth_slurm_net__aliases.c b/sysutils/slurm-wlm/files/patch-src_plugins_auth_slurm_net__aliases.c deleted file mode 100644 index 17f9e1d76fdd..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_plugins_auth_slurm_net__aliases.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/plugins/auth/slurm/net_aliases.c.orig 2023-12-13 21:49:39 UTC -+++ src/plugins/auth/slurm/net_aliases.c -@@ -40,6 +40,10 @@ - #include <netinet/in.h> - #include <sys/socket.h> - #include <sys/types.h> -+#if defined(__FreeBSD__) -+#include <netinet/in.h> -+#include <sys/socket.h> -+#endif - - #include "slurm/slurm.h" - #include "slurm/slurm_errno.h" diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_cli__filter_user__defaults_cli__filter__user__defaults.c b/sysutils/slurm-wlm/files/patch-src_plugins_cli__filter_user__defaults_cli__filter__user__defaults.c deleted file mode 100644 index 9d0c3a93d22d..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_plugins_cli__filter_user__defaults_cli__filter__user__defaults.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/plugins/cli_filter/user_defaults/cli_filter_user_defaults.c.orig 2023-03-28 20:19:41 UTC -+++ src/plugins/cli_filter/user_defaults/cli_filter_user_defaults.c -@@ -45,6 +45,7 @@ - #include <string.h> - #include <sys/types.h> - #include <unistd.h> -+#include <limits.h> - - #include "slurm/slurm_errno.h" - #include "src/common/slurm_xlator.h" diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_job__container_tmpfs_job__container__tmpfs.c b/sysutils/slurm-wlm/files/patch-src_plugins_job__container_tmpfs_job__container__tmpfs.c deleted file mode 100644 index bf60423ff176..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_plugins_job__container_tmpfs_job__container__tmpfs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/job_container/tmpfs/job_container_tmpfs.c.orig 2023-11-21 22:33:29 UTC -+++ src/plugins/job_container/tmpfs/job_container_tmpfs.c -@@ -612,7 +612,7 @@ static int _create_ns(uint32_t job_id, stepd_step_rec_ - goto exit1; - } - -- xstrfmtcat(proc_path, "/proc/%u/ns/mnt", cpid); -+ xstrfmtcat(proc_path, "/compat/linux/proc/%u/ns/mnt", cpid); - - /* - * Bind mount /proc/pid/ns/mnt to hold namespace active diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c b/sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c deleted file mode 100644 index 426c9ab710b7..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c +++ /dev/null @@ -1,85 +0,0 @@ ---- src/plugins/jobacct_gather/common/common_jag.c.orig 2023-11-21 22:33:29 UTC -+++ src/plugins/jobacct_gather/common/common_jag.c -@@ -233,7 +233,7 @@ static int _get_sys_interface_freq_line(uint32_t cpu, - } else { - /* frequency scaling not enabled */ - if (!cpunfo_frequency) { -- snprintf(freq_file, 14, "/proc/cpuinfo"); -+ snprintf(freq_file, 14, "/compat/linux/proc/cpuinfo"); - log_flag(JAG, "filename = %s (cpu scaling not enabled)", - freq_file); - if ((sys_fp = fopen(freq_file, "r")) != NULL) { -@@ -250,6 +250,11 @@ static int _get_sys_interface_freq_line(uint32_t cpu, - return 0; - } - -+/* -+ * Check for lightweight processes (POSIX threads) -+ * Should be rewritten for FreeBSD so it doesn't depend on /proc -+ */ -+ - static int _is_a_lwp(uint32_t pid) - { - char *filename = NULL; -@@ -259,8 +264,12 @@ static int _is_a_lwp(uint32_t pid) - char *tgids = NULL; - pid_t tgid = -1; - -- xstrfmtcat(filename, "/proc/%u/status", pid); -+ // Disable check for now, this will only skew process accounting -+ // slightly by including threads -+ return 0; - -+ xstrfmtcat(filename, "/compat/linux/proc/%u/status", pid); -+ - fd = open(filename, O_RDONLY); - if (fd < 0) { - xfree(filename); -@@ -503,7 +512,7 @@ void _set_smaps_file(char **proc_smaps_file, pid_t pid - static int use_smaps_rollup = -1; - - if (use_smaps_rollup == -1) { -- xstrfmtcat(*proc_smaps_file, "/proc/%d/smaps_rollup", pid); -+ xstrfmtcat(*proc_smaps_file, "/compat/linux/proc/%d/smaps_rollup", pid); - FILE *fd = fopen(*proc_smaps_file, "r"); - if (fd) { - fclose(fd); -@@ -514,9 +523,9 @@ void _set_smaps_file(char **proc_smaps_file, pid_t pid - } - - if (use_smaps_rollup) -- xstrfmtcat(*proc_smaps_file, "/proc/%d/smaps_rollup", pid); -+ xstrfmtcat(*proc_smaps_file, "/compat/linux/proc/%d/smaps_rollup", pid); - else -- xstrfmtcat(*proc_smaps_file, "/proc/%d/smaps", pid); -+ xstrfmtcat(*proc_smaps_file, "/compat/linux/proc/%d/smaps", pid); - } - - static void _handle_stats(pid_t pid, jag_callbacks_t *callbacks, int tres_count) -@@ -551,7 +560,7 @@ static void _handle_stats(pid_t pid, jag_callbacks_t * - disable_gpu_acct = 0; - } - -- xstrfmtcat(proc_file, "/proc/%u/stat", pid); -+ xstrfmtcat(proc_file, "/compat/linux/proc/%u/stat", pid); - if (!(stat_fp = fopen(proc_file, "r"))) - return; /* Assume the process went away */ - /* -@@ -598,7 +607,7 @@ static void _handle_stats(pid_t pid, jag_callbacks_t * - /* Remove shared data from rss */ - if (no_share_data) { - xfree(proc_file); -- xstrfmtcat(proc_file, "/proc/%u/statm", pid); -+ xstrfmtcat(proc_file, "/compat/linux/proc/%u/statm", pid); - if (!_remove_share_data(proc_file, prec)) - goto bail_out; - } -@@ -612,7 +621,7 @@ static void _handle_stats(pid_t pid, jag_callbacks_t * - } - - xfree(proc_file); -- xstrfmtcat(proc_file, "/proc/%u/io", pid); -+ xstrfmtcat(proc_file, "/compat/linux/proc/%u/io", pid); - if ((io_fp = fopen(proc_file, "r"))) { - fd2 = fileno(io_fp); - if (fcntl(fd2, F_SETFD, FD_CLOEXEC) == -1) diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_mpi_cray__shasta_mpi__cray__shasta.c b/sysutils/slurm-wlm/files/patch-src_plugins_mpi_cray__shasta_mpi__cray__shasta.c deleted file mode 100644 index 4ba25ef6da2c..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_plugins_mpi_cray__shasta_mpi__cray__shasta.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/plugins/mpi/cray_shasta/mpi_cray_shasta.c.orig 2023-03-28 20:19:41 UTC -+++ src/plugins/mpi/cray_shasta/mpi_cray_shasta.c -@@ -46,6 +46,7 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <unistd.h> -+#include <limits.h> - - #include "slurm/slurm_errno.h" - #include "src/common/slurm_xlator.h" diff --git a/sysutils/slurm-wlm/files/patch-src_scrun_anchor.c b/sysutils/slurm-wlm/files/patch-src_scrun_anchor.c deleted file mode 100644 index 2e2ab45af905..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_scrun_anchor.c +++ /dev/null @@ -1,27 +0,0 @@ ---- src/scrun/anchor.c.orig 2023-11-21 22:33:29 UTC -+++ src/scrun/anchor.c -@@ -43,7 +43,12 @@ - #include <stdio.h> - #include <stdlib.h> - #include <sys/param.h> -+#ifdef __FreeBSD__ -+#include <pthread_np.h> -+#include <sys/signal.h> -+#else - #include <sys/prctl.h> -+#endif - #include <sys/socket.h> - #include <sys/stat.h> - #include <sys/types.h> -@@ -1034,7 +1039,11 @@ static void _set_proctitle() - - setproctitle("%s", state.id); - xstrfmtcat(thread_name, "scrun:%s", state.id); -+#ifdef __FreeBSD__ -+ if (pthread_setname_np(pthread_self(), thread_name) < 0) { -+#else - if (prctl(PR_SET_NAME, thread_name, NULL, NULL, NULL) < 0) { -+#endif - fatal("Unable to set process name"); - } - xfree(thread_name); diff --git a/sysutils/slurm-wlm/files/patch-src_scrun_commands.c b/sysutils/slurm-wlm/files/patch-src_scrun_commands.c deleted file mode 100644 index 8d7fe43ec92b..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_scrun_commands.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/scrun/commands.c.orig 2023-11-21 22:33:29 UTC -+++ src/scrun/commands.c -@@ -39,6 +39,10 @@ - #include <signal.h> - #include <unistd.h> - -+#ifdef __FreeBSD__ -+#include <sys/signal.h> -+#endif -+ - #include "src/common/daemonize.h" - #include "src/common/fd.h" - #include "src/common/log.h" diff --git a/sysutils/slurm-wlm/files/patch-src_scrun_scrun.c b/sysutils/slurm-wlm/files/patch-src_scrun_scrun.c deleted file mode 100644 index 95511eeec11c..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_scrun_scrun.c +++ /dev/null @@ -1,24 +0,0 @@ ---- src/scrun/scrun.c.orig 2023-03-28 20:15:54 UTC -+++ src/scrun/scrun.c -@@ -45,6 +45,9 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <unistd.h> -+#ifdef __FreeBSD__ -+#include <sys/param.h> -+#endif - - #include "src/common/data.h" - #include "src/common/log.h" -@@ -186,7 +189,11 @@ static void _parse_create(int argc, char **argv) - } - - if (!state.bundle) { -+#ifdef __FreeBSD__ -+ char *dir = getcwd(NULL, PATH_MAX); -+#else - char *dir = get_current_dir_name(); -+#endif - state.bundle = xstrdup(dir); - free(dir); - } diff --git a/sysutils/slurm-wlm/files/patch-src_scrun_srun.c b/sysutils/slurm-wlm/files/patch-src_scrun_srun.c deleted file mode 100644 index 05de1170c73d..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_scrun_srun.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/scrun/srun.c.orig 2023-03-28 20:15:54 UTC -+++ src/scrun/srun.c -@@ -40,7 +40,9 @@ - - #include <fcntl.h> - #include <stdlib.h> -+#ifndef __FreeBSD__ - #include <sys/prctl.h> -+#endif - #include <sys/stat.h> - #include <sys/un.h> - #include <termios.h> diff --git a/sysutils/slurm-wlm/files/patch-src_slurmd_slurmd_slurmd.h b/sysutils/slurm-wlm/files/patch-src_slurmd_slurmd_slurmd.h deleted file mode 100644 index 3197178e7d54..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_slurmd_slurmd_slurmd.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/slurmd/slurmd/slurmd.h.orig 2023-12-13 21:49:39 UTC -+++ src/slurmd/slurmd/slurmd.h -@@ -43,6 +43,7 @@ - #include <limits.h> - #include <pthread.h> - #include <sys/types.h> -+#include <limits.h> - - #include "src/common/log.h" - #include "src/common/list.h" diff --git a/sysutils/slurm-wlm/files/pkg-message.in b/sysutils/slurm-wlm/files/pkg-message.in new file mode 100644 index 000000000000..22afb86bd96a --- /dev/null +++ b/sysutils/slurm-wlm/files/pkg-message.in @@ -0,0 +1,31 @@ +[ + { + type: install, + message: <<EOM +Slurm has been installed. + +Sample config: + %%ETCDIR%%/slurm.conf.sample + +Before starting services: + - Copy and edit the sample to %%ETCDIR%%/slurm.conf + - Create state dirs (already created in stage): /var/spool/slurmctld + - Ensure munge is running and configured. + +Services: + - slurmctld (controller) + - slurmd (node daemon) + +On FreeBSD, cgroups are typically not used. If slurmd/slurmctld complain +about cgroup initialization, set this in slurm.conf: + + ProctrackType=proctrack/linuxproc + TaskPlugin=task/none + CgroupPlugin=disabled + +Then restart slurmctld/slurmd. + +Docs: %%DOCSDIR%% +EOM + } +] |