mirror of
				https://git.proxmox.com/git/mirror_zfs.git
				synced 2025-10-26 18:05:04 +03:00 
			
		
		
		
	config/zfs-build.m4: sort vendors
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: omni <omni+vagant@hack.org> Closes #16164
This commit is contained in:
		
							parent
							
								
									a043b60f1e
								
							
						
					
					
						commit
						d0d7c0d8f9
					
				| @ -512,32 +512,33 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ | |||||||
| 		[with_vendor=$withval], | 		[with_vendor=$withval], | ||||||
| 		[with_vendor=check]) | 		[with_vendor=check]) | ||||||
| 	AS_IF([test "x$with_vendor" = "xcheck"],[ | 	AS_IF([test "x$with_vendor" = "xcheck"],[ | ||||||
| 		if test -f /etc/toss-release ; then | 		if test -f /etc/alpine-release ; then | ||||||
| 			VENDOR=toss ; | 			VENDOR=alpine ; | ||||||
| 		elif test -f /etc/fedora-release ; then |  | ||||||
| 			VENDOR=fedora ; |  | ||||||
| 		elif test -f /etc/redhat-release ; then |  | ||||||
| 			VENDOR=redhat ; |  | ||||||
| 		elif test -f /etc/gentoo-release ; then |  | ||||||
| 			VENDOR=gentoo ; |  | ||||||
| 		elif test -f /etc/arch-release ; then | 		elif test -f /etc/arch-release ; then | ||||||
| 			VENDOR=arch ; | 			VENDOR=arch ; | ||||||
|  | 		elif test -f /etc/fedora-release ; then | ||||||
|  | 			VENDOR=fedora ; | ||||||
|  | 		elif test -f /bin/freebsd-version ; then | ||||||
|  | 			VENDOR=freebsd ; | ||||||
|  | 		elif test -f /etc/gentoo-release ; then | ||||||
|  | 			VENDOR=gentoo ; | ||||||
|  | 		elif test -f /etc/lunar.release ; then | ||||||
|  | 			VENDOR=lunar ; | ||||||
|  | 		elif test -f /etc/openEuler-release ; then | ||||||
|  | 			VENDOR=openeuler ; | ||||||
| 		elif test -f /etc/SuSE-release ; then | 		elif test -f /etc/SuSE-release ; then | ||||||
| 			VENDOR=sles ; | 			VENDOR=sles ; | ||||||
| 		elif test -f /etc/slackware-version ; then | 		elif test -f /etc/slackware-version ; then | ||||||
| 			VENDOR=slackware ; | 			VENDOR=slackware ; | ||||||
| 		elif test -f /etc/lunar.release ; then | 		elif test -f /etc/toss-release ; then | ||||||
| 			VENDOR=lunar ; | 			VENDOR=toss ; | ||||||
| 		elif test -f /etc/lsb-release ; then | 		elif test -f /etc/lsb-release ; then | ||||||
| 			VENDOR=ubuntu ; | 			VENDOR=ubuntu ; | ||||||
|  | 		# put debian and redhat last as derivatives may have also their file | ||||||
| 		elif test -f /etc/debian_version ; then | 		elif test -f /etc/debian_version ; then | ||||||
| 			VENDOR=debian ; | 			VENDOR=debian ; | ||||||
| 		elif test -f /etc/alpine-release ; then | 		elif test -f /etc/redhat-release ; then | ||||||
| 			VENDOR=alpine ; | 			VENDOR=redhat ; | ||||||
| 		elif test -f /bin/freebsd-version ; then |  | ||||||
| 			VENDOR=freebsd ; |  | ||||||
| 		elif test -f /etc/openEuler-release ; then |  | ||||||
| 			VENDOR=openeuler ; |  | ||||||
| 		else | 		else | ||||||
| 			VENDOR= ; | 			VENDOR= ; | ||||||
| 		fi], | 		fi], | ||||||
| @ -550,20 +551,15 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ | |||||||
| 
 | 
 | ||||||
| 	AC_MSG_CHECKING([default package type]) | 	AC_MSG_CHECKING([default package type]) | ||||||
| 	case "$VENDOR" in | 	case "$VENDOR" in | ||||||
| 		toss)       DEFAULT_PACKAGE=rpm  ;; | 		alpine|arch|gentoo|lunar|slackware) | ||||||
| 		redhat)     DEFAULT_PACKAGE=rpm  ;; | 			DEFAULT_PACKAGE=tgz  ;; | ||||||
| 		fedora)     DEFAULT_PACKAGE=rpm  ;; | 		debian|ubuntu) | ||||||
| 		gentoo)     DEFAULT_PACKAGE=tgz  ;; | 			DEFAULT_PACKAGE=deb  ;; | ||||||
| 		alpine)     DEFAULT_PACKAGE=tgz  ;; | 		freebsd) | ||||||
| 		arch)       DEFAULT_PACKAGE=tgz  ;; | 			DEFAULT_PACKAGE=pkg  ;; | ||||||
| 		sles)       DEFAULT_PACKAGE=rpm  ;; | 		*) | ||||||
| 		slackware)  DEFAULT_PACKAGE=tgz  ;; | 		# fedora|openeuler|redhat|sles|toss | ||||||
| 		lunar)      DEFAULT_PACKAGE=tgz  ;; | 			DEFAULT_PACKAGE=rpm  ;; | ||||||
| 		ubuntu)     DEFAULT_PACKAGE=deb  ;; |  | ||||||
| 		debian)     DEFAULT_PACKAGE=deb  ;; |  | ||||||
| 		freebsd)    DEFAULT_PACKAGE=pkg  ;; |  | ||||||
| 		openeuler)  DEFAULT_PACKAGE=rpm  ;; |  | ||||||
| 		*)          DEFAULT_PACKAGE=rpm  ;; |  | ||||||
| 	esac | 	esac | ||||||
| 	AC_MSG_RESULT([$DEFAULT_PACKAGE]) | 	AC_MSG_RESULT([$DEFAULT_PACKAGE]) | ||||||
| 	AC_SUBST(DEFAULT_PACKAGE) | 	AC_SUBST(DEFAULT_PACKAGE) | ||||||
| @ -578,7 +574,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ | |||||||
| 
 | 
 | ||||||
| 	AC_MSG_CHECKING([default shell]) | 	AC_MSG_CHECKING([default shell]) | ||||||
| 	case "$VENDOR" in | 	case "$VENDOR" in | ||||||
| 		gentoo|alpine)	DEFAULT_INIT_SHELL=/sbin/openrc-run | 		alpine|gentoo)	DEFAULT_INIT_SHELL=/sbin/openrc-run | ||||||
| 				IS_SYSV_RC=false	;; | 				IS_SYSV_RC=false	;; | ||||||
| 		*)		DEFAULT_INIT_SHELL=/bin/sh | 		*)		DEFAULT_INIT_SHELL=/bin/sh | ||||||
| 				IS_SYSV_RC=true		;; | 				IS_SYSV_RC=true		;; | ||||||
| @ -598,17 +594,19 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ | |||||||
| 
 | 
 | ||||||
| 	AC_MSG_CHECKING([default init config directory]) | 	AC_MSG_CHECKING([default init config directory]) | ||||||
| 	case "$VENDOR" in | 	case "$VENDOR" in | ||||||
| 		alpine)     initconfdir=/etc/conf.d    ;; | 		alpine|gentoo) | ||||||
| 		gentoo)     initconfdir=/etc/conf.d    ;; | 			initconfdir=/etc/conf.d | ||||||
| 		toss)       initconfdir=/etc/sysconfig ;; | 			;; | ||||||
| 		redhat)     initconfdir=/etc/sysconfig ;; | 		fedora|openeuler|redhat|sles|toss) | ||||||
| 		fedora)     initconfdir=/etc/sysconfig ;; | 			initconfdir=/etc/sysconfig | ||||||
| 		sles)       initconfdir=/etc/sysconfig ;; | 			;; | ||||||
| 		openeuler)  initconfdir=/etc/sysconfig ;; | 		freebsd) | ||||||
| 		ubuntu)     initconfdir=/etc/default   ;; | 			initconfdir=$sysconfdir/rc.conf.d | ||||||
| 		debian)     initconfdir=/etc/default   ;; | 			;; | ||||||
| 		freebsd)    initconfdir=$sysconfdir/rc.conf.d;; | 		*) | ||||||
| 		*)          initconfdir=/etc/default   ;; | 		# debian|ubuntu | ||||||
|  | 			initconfdir=/etc/default | ||||||
|  | 			;; | ||||||
| 	esac | 	esac | ||||||
| 	AC_MSG_RESULT([$initconfdir]) | 	AC_MSG_RESULT([$initconfdir]) | ||||||
| 	AC_SUBST(initconfdir) | 	AC_SUBST(initconfdir) | ||||||
| @ -625,11 +623,15 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ | |||||||
| 
 | 
 | ||||||
| 	AC_MSG_CHECKING([default bash completion directory]) | 	AC_MSG_CHECKING([default bash completion directory]) | ||||||
| 	case "$VENDOR" in | 	case "$VENDOR" in | ||||||
| 		ubuntu)     bashcompletiondir=/usr/share/bash-completion/completions   ;; | 		debian|gentoo|ubuntu) | ||||||
| 		debian)     bashcompletiondir=/usr/share/bash-completion/completions   ;; | 			bashcompletiondir=/usr/share/bash-completion/completions | ||||||
| 		freebsd)    bashcompletiondir=$sysconfdir/bash_completion.d;; | 			;; | ||||||
| 		gentoo)     bashcompletiondir=/usr/share/bash-completion/completions   ;; | 		freebsd) | ||||||
| 		*)          bashcompletiondir=/etc/bash_completion.d   ;; | 			bashcompletiondir=$sysconfdir/bash_completion.d | ||||||
|  | 			;; | ||||||
|  | 		*) | ||||||
|  | 			bashcompletiondir=/etc/bash_completion.d | ||||||
|  | 			;; | ||||||
| 	esac | 	esac | ||||||
| 	AC_MSG_RESULT([$bashcompletiondir]) | 	AC_MSG_RESULT([$bashcompletiondir]) | ||||||
| 	AC_SUBST(bashcompletiondir) | 	AC_SUBST(bashcompletiondir) | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 omni
						omni