diff options
| -rw-r--r-- | package/dm/dm.mk | 5 | ||||
| -rw-r--r-- | package/dmraid/dmraid.mk | 4 | ||||
| -rw-r--r-- | package/dmraid/dmraid.patch | 20 |
3 files changed, 25 insertions, 4 deletions
diff --git a/package/dm/dm.mk b/package/dm/dm.mk index 731edec7d..b3fb5c9f7 100644 --- a/package/dm/dm.mk +++ b/package/dm/dm.mk @@ -24,7 +24,7 @@ # USA DM_BASEVER=1.02 -DM_PATCH=10 +DM_PATCH=12 DM_VERSION=$(DM_BASEVER).$(DM_PATCH) DM_SOURCE:=device-mapper.$(DM_VERSION).tgz DM_SITE:=ftp://sources.redhat.com/pub/dm @@ -40,6 +40,7 @@ $(DL_DIR)/$(DM_SOURCE): $(DM_DIR)/.unpacked: $(DL_DIR)/$(DM_SOURCE) $(DM_CAT) $(DL_DIR)/$(DM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(DM_DIR) package/dm/ \*.patch touch $(DM_DIR)/.unpacked $(DM_DIR)/.configured: $(DM_DIR)/.unpacked @@ -67,7 +68,7 @@ $(DM_DIR)/$(DM_BINARY): dm-build $(DM_DIR)/$(DM_LIBRARY): dm-build $(DM_STAGING_BINARY) $(DM_STAGING_LIBRARY): $(DM_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) -C $(DM_DIR) DESTDIR=$(STAGING_DIR) + $(MAKE) CC=$(TARGET_CC) DESTDIR=$(STAGING_DIR) -C $(DM_DIR) $(MAKE) -C $(DM_DIR) install prefix=$(STAGING_DIR) # Install dmsetup from staging to target diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 4c02c0b71..0c151a11d 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -4,7 +4,7 @@ # ############################################################# -DMRAID_VERSION=1.0.0.rc11 +DMRAID_VERSION=1.0.0.rc13 DMRAID_SOURCE:=dmraid-$(DMRAID_VERSION).tar.bz2 DMRAID_SITE:=http://people.redhat.com/~heinzm/sw/dmraid/src DMRAID_DIR:=$(BUILD_DIR)/dmraid/$(DMRAID_VERSION) @@ -46,7 +46,7 @@ $(DMRAID_TARGET_BINARY): $(DMRAID_DIR)/tools/$(DMRAID_BINARY) $(INSTALL) -m 0755 $? $@ $(INSTALL) -m 0755 package/dmraid/dmraid.init $(TARGET_DIR)/etc/init.d/dmraid -dmraid: uclibc dm $(DMRAID_TARGET_BINARY) +dmraid: uclibc dm zlib $(DMRAID_TARGET_BINARY) dmraid-clean: rm $(DMRAID_TARGET_BINARY) diff --git a/package/dmraid/dmraid.patch b/package/dmraid/dmraid.patch new file mode 100644 index 000000000..fabd7c902 --- /dev/null +++ b/package/dmraid/dmraid.patch @@ -0,0 +1,20 @@ +--- 1.0.0.rc10/lib/device/scan.c.orig 2006-04-20 18:20:24.000000000 -0600 ++++ 1.0.0.rc10/lib/device/scan.c 2006-04-20 18:21:00.000000000 -0600 +@@ -66,7 +66,7 @@ + static char *ret = NULL, *sysfs_mp; + + if (!(sysfs_mp = find_sysfs_mp(lc))) +- LOG_ERR(lc, NULL, "finding sysfs mount point"); ++ { log_notice(lc, "finding sysfs mount point"); return NULL; } + + if ((ret = dbg_malloc(strlen(sysfs_mp) + strlen(path) + 1))) + sprintf(ret, "%s%s", sysfs_mp, path); +@@ -308,7 +308,7 @@ + } else { + sysfs = 0; + path = (char*) _PATH_DEV; +- log_print(lc, "carrying on with %s", path); ++ log_notice(lc, "carrying on with %s", path); + } + + if (!(d = opendir(path))) { |