Index: util-linux-2.42-rc1/lib/Makemodule.am
===================================================================
--- util-linux-2.42-rc1.orig/lib/Makemodule.am
+++ util-linux-2.42-rc1/lib/Makemodule.am
@@ -31,14 +31,13 @@ libcommon_la_SOURCES = \
 	lib/mbsalign.c \
 	lib/mbsedit.c\
 	lib/md5.c \
-	lib/netaddrq.c \
-	lib/netlink.c \
 	lib/pidutils.c \
 	lib/pidfd-utils.c \
 	lib/pwdutils.c \
 	lib/randutils.c \
 	lib/sha1.c \
 	lib/sha256.c \
+	lib/shells.c \
 	lib/signames.c \
 	lib/strutils.c \
 	lib/strv.c \
@@ -50,7 +49,8 @@ libcommon_la_SOURCES = \
 if LINUX
 libcommon_la_SOURCES += \
 	lib/linux_version.c \
-	lib/shells.c \
+	lib/netaddrq.c \
+	lib/netlink.c \
 	lib/loopdev.c
 endif
 
Index: util-linux-2.42-rc1/libblkid/src/cache.c
===================================================================
--- util-linux-2.42-rc1.orig/libblkid/src/cache.c
+++ util-linux-2.42-rc1/libblkid/src/cache.c
@@ -188,12 +188,14 @@ void blkid_gc_cache(blkid_cache cache)
 			DBG(CACHE, ul_debugobj(cache, "freeing non-existing %s", dev->bid_name));
 			blkid_free_dev(dev);
 			cache->bic_flags |= BLKID_BIC_FL_CHANGED;
+#ifdef __linux__
 		} else if (is_loopdev(dev->bid_name)
 					&& !loopdev_has_backing_file(dev->bid_name)) {
 			/* remove empty loop device from cache */
 			DBG(CACHE, ul_debugobj(cache, "freeing empty loop device %s", dev->bid_name));
 			blkid_free_dev(dev);
 			cache->bic_flags |= BLKID_BIC_FL_CHANGED;
+#endif
 		} else {
 			DBG(CACHE, ul_debug("Device %s exists", dev->bid_name));
 		}
Index: util-linux-2.42-rc1/term-utils/agetty.c
===================================================================
--- util-linux-2.42-rc1.orig/term-utils/agetty.c
+++ util-linux-2.42-rc1/term-utils/agetty.c
@@ -365,7 +365,9 @@ int main(int argc, char **argv)
 	};
 	struct issue issue = {
 		.mem = NULL,
+#ifdef AGETTY_RELOAD
 		.nl.fd = -1
+#endif
 	};
 	char *login_argv[LOGIN_ARGV_MAX + 1];
 	int login_argc = 0;
@@ -1639,10 +1641,12 @@ static int wait_for_term_input(struct is
 			FD_SET(inotify_fd, &rfds);
 			nfds = max(nfds, inotify_fd);
 		}
+#ifdef AGETTY_RELOAD
 		if (ie->nl.fd >= 0) {
 			FD_SET(ie->nl.fd, &rfds);
 			nfds = max(nfds, ie->nl.fd);
 		}
+#endif
 
 		/* If waiting fails, just fall through, presumably reading input will fail */
 		if (select(nfds + 1, &rfds, NULL, NULL, NULL) < 0)
@@ -1653,6 +1657,7 @@ static int wait_for_term_input(struct is
 
 		}
 
+#ifdef AGETTY_RELOAD
 		if (ie->nl.fd >= 0 && FD_ISSET(ie->nl.fd, &rfds)) {
 			int rc;
 
@@ -1670,6 +1675,7 @@ static int wait_for_term_input(struct is
 		} else if (inotify_fd >= 0 && FD_ISSET(inotify_fd, &rfds)) {
 			while (read(inotify_fd, buffer, sizeof (buffer)) > 0);
 		}
+#endif
 
 		return 0;
 	}
@@ -1976,7 +1982,12 @@ done:
  */
 static void show_issue(struct options *op)
 {
-	struct issue ie = { .output = NULL, .nl.fd = -1 };
+	struct issue ie = {
+		.output = NULL,
+#ifdef AGETTY_RELOAD
+		.nl.fd = -1
+#endif
+	};
 	struct termios tp;
 
 	memset(&tp, 0, sizeof(struct termios));
@@ -2589,6 +2600,7 @@ static void log_warn(const char *fmt, ..
 	va_end(ap);
 }
 
+#ifdef AGETTY_RELOAD
 static void print_iface_best(struct issue *ie,
 			     const char *ifname,
 			     uint8_t ifa_family)
@@ -2754,6 +2766,7 @@ static void dump_iface_all(struct issue
 	if (!first)
 		fputs("\n", ie->output);
 }
+#endif
 
 /*
  * parses \x{argument}, if not argument specified then returns NULL, the @fd