Sort includes, <scsi/scsi_all.h> before <dev/*>

For/OK guenther

diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index bac23a2..703a195 100644 (file)
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.37 2020/06/22 01:02:30 dlg Exp $
+#      $OpenBSD: Makefile,v 1.38 2023/11/20 17:43:51 kn Exp $
 
 LDSTATIC=${STATIC}
 PROG=  kdump
@@ -10,16 +10,16 @@ CLEANFILES+=ioctl.c kdump_subr.c
 
 ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
        CC="${CC}" \
-       /bin/sh ${.CURDIR}/mkioctls ${SYS_DIR}/sys/ioctl.h \
+       /bin/sh ${.CURDIR}/mkioctls \
            ${SYS_DIR}/dev/biovar.h \
            ${SYS_DIR}/dev/ipmi.h \
-           ${SYS_DIR}/dev/wscons/wsconsio.h \
-           ${SYS_DIR}/dev/vndioctl.h \
-           ${SYS_DIR}/dev/vscsivar.h \
            ${SYS_DIR}/dev/pci/drm/include/uapi/drm/i915_drm.h \
            ${SYS_DIR}/dev/pv/pvvar.h \
            ${SYS_DIR}/dev/usb/udlio.h \
            ${SYS_DIR}/dev/usb/usb.h \
+           ${SYS_DIR}/dev/vndioctl.h \
+           ${SYS_DIR}/dev/vscsivar.h \
+           ${SYS_DIR}/dev/wscons/wsconsio.h \
            ${SYS_DIR}/miscfs/fuse/fusefs.h \
            ${SYS_DIR}/net/bpf.h \
            ${SYS_DIR}/net/if_ppp.h \
@@ -31,8 +31,6 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
            ${SYS_DIR}/net/pipex.h \
            ${SYS_DIR}/net80211/ieee80211_ioctl.h \
            ${SYS_DIR}/netinet6/in6_var.h \
-           ${SYS_DIR}/sys/tty.h \
-           ${SYS_DIR}/sys/syslog.h \
            ${SYS_DIR}/sys/ataio.h \
            ${SYS_DIR}/sys/audioio.h \
            ${SYS_DIR}/sys/cdio.h \
@@ -40,6 +38,7 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
            ${SYS_DIR}/sys/dkio.h \
            ${SYS_DIR}/sys/filio.h \
            ${SYS_DIR}/sys/gpio.h \
+           ${SYS_DIR}/sys/ioctl.h \
            ${SYS_DIR}/sys/kcov.h \
            ${SYS_DIR}/sys/memrange.h \
            ${SYS_DIR}/sys/mtio.h \
@@ -47,6 +46,8 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
            ${SYS_DIR}/sys/radioio.h \
            ${SYS_DIR}/sys/scsiio.h \
            ${SYS_DIR}/sys/sockio.h \
+           ${SYS_DIR}/sys/syslog.h \
+           ${SYS_DIR}/sys/tty.h \
            ${SYS_DIR}/sys/videoio.h \
                > ioctl.c
 

diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index 5492894..502e2f0 100644 (file)
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#      $OpenBSD: mkioctls,v 1.43 2021/09/17 15:13:04 deraadt Exp $
+#      $OpenBSD: mkioctls,v 1.44 2023/11/20 17:43:51 kn Exp $
 
 #
 # Copyright (c) 1994
@@ -79,16 +79,16 @@ BEGIN {
        print "#include <sys/tty.h>"
        print "#include <sys/syslog.h>"
        print "#include <sys/videoio.h>"
+       print "#include <scsi/scsi_all.h>"
        print "#include <dev/biovar.h>"
        print "#include <dev/ipmi.h>"
-       print "#include <dev/wscons/wsconsio.h>"
-       print "#include <dev/vndioctl.h>"
-       print "#include <scsi/scsi_all.h>"
-       print "#include <dev/vscsivar.h>"
        print "#include <dev/pci/drm/include/uapi/drm/i915_drm.h>"
        print "#include <dev/pv/pvvar.h>"
        print "#include <dev/usb/udlio.h>"
        print "#include <dev/usb/usb.h>"
+       print "#include <dev/vndioctl.h>"
+       print "#include <dev/vscsivar.h>"
+       print "#include <dev/wscons/wsconsio.h>"
        print "#include <sys/ioctl.h>"
        print "#include \"kdump.h\""
        print ""