The attached patch to make.d/util-linux.rul adds the ability to apply source code patches from the patches/ directory. Right now, there are no patches there, so this patch should have no effect on current builds.
I've been looking at util-linux source RPMS and there are dozens of patches "out there" for util-linux, some of them related to its interaction with LVM. It's likely we'll need some of those. I'm pretty certain I need to patch the util-linux configure script so it can find 'our' e2fsprogs libraries and include files.
Index: make.d/util-linux.rul =================================================================== RCS file: /cvsroot/systemimager/systemimager/make.d/util-linux.rul,v retrieving revision 1.6 diff -u -r1.6 util-linux.rul --- make.d/util-linux.rul 12 May 2005 15:04:34 -0000 1.6 +++ make.d/util-linux.rul 13 May 2005 01:56:32 -0000 @@ -10,13 +10,15 @@ UTIL_LINUX_TARBALL := util-linux-$(UTIL_LINUX_VERSION).tar.bz2 UTIL_LINUX_URL := http://mirror.mcs.anl.gov/kernel/linux/utils/util-linux/$(UTIL_LINUX_TARBALL) MKSWAP_BINARY := $(SRC_DIR)/$(UTIL_LINUX_DIR)/disk-utils/mkswap +UTIL_LINUX_PATCHES := $(shell ls $(PATCH_DIR)/util-linux.*.patch 2>/dev/null | sort) ALL_SOURCE += $(SRC_DIR)/$(UTIL_LINUX_TARBALL) PHONY += util-linux util-linux: $(MKSWAP_BINARY) $(MKSWAP_BINARY): $(SRC_DIR)/$(UTIL_LINUX_TARBALL) - [ -d $(SRC_DIR)/$(UTIL_LINUX_DIR) ] || ( cd $(SRC_DIR) && tar -xvjf $(UTIL_LINUX_TARBALL) ) + [ -d $(SRC_DIR)/$(UTIL_LINUX_DIR) ] || ( cd $(SRC_DIR) && tar -xvjf $(UTIL_LINUX_TARBALL) \ + && (cd $(UTIL_LINUX_DIR) && (cat $(UTIL_LINUX_PATCHES) < /dev/null | patch -p1)) ) ( cd $(SRC_DIR)/$(UTIL_LINUX_DIR) && ./configure ) $(MAKE) -C $(SRC_DIR)/$(UTIL_LINUX_DIR)
