From patchwork Tue Feb 4 10:06:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 316514 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id D8DAA2C009A for ; Tue, 4 Feb 2014 21:06:18 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 15ECA93BD3; Tue, 4 Feb 2014 10:06:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gAvbg4QAjCWI; Tue, 4 Feb 2014 10:06:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id AD5EC88175; Tue, 4 Feb 2014 10:06:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 68D0C1BF9DB for ; Tue, 4 Feb 2014 10:06:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 635A48C02C for ; Tue, 4 Feb 2014 10:06:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mcuglQHO62VS for ; Tue, 4 Feb 2014 10:06:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id 010178C00D for ; Tue, 4 Feb 2014 10:06:12 +0000 (UTC) Received: by mail-wg0-f50.google.com with SMTP id l18so12652572wgh.29 for ; Tue, 04 Feb 2014 02:06:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v8sDXZH3OtrSOBYMAR5vBQuNMe508FdbEtMHqOswfHs=; b=knkzmweFRaEYjPig2u5FF2qhoqF9o5C4YCp3rA0wD25semf7VOEQpQIN1B6wqZna3d sgrq2hh6NUthzcqMGS+tWkGX5bywZI4JGOXUM92/D6UF6p3Av8aqyfNFktOXHAUibLhp 55qbbVlIFpX4heUqiZPV/dGYuwwJr019oXEpHi/jRpL2Dl/qsHs7oc7iX/zAqqZTHmPb bTY2WSj9GSO2tpGazoZsgZmGBOkL53Wmb2JrGb6qCAzMdxPjG3Xt84Q74yhsOix4qIbP h26dR263u94i8hik4gOUDNuUVbomwzXyWOhmpOus+BQbOF+CWNzEVvVnqGxk8ww58Bpf yivg== X-Received: by 10.180.205.239 with SMTP id lj15mr12044470wic.22.1391508370965; Tue, 04 Feb 2014 02:06:10 -0800 (PST) Received: from localhost ([74.125.61.14]) by mx.google.com with ESMTPSA id ff7sm318367wic.10.2014.02.04.02.06.09 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Feb 2014 02:06:10 -0800 (PST) From: Maxime Hadjinlian To: buildroot@busybox.net Date: Tue, 4 Feb 2014 11:06:04 +0100 Message-Id: <1391508365-30961-2-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1391508365-30961-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1391508365-30961-1-git-send-email-maxime.hadjinlian@gmail.com> Cc: Antony Vennard Subject: [Buildroot] [PATCH 2/3] dmraid: bump version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net dmraid rc15 does not support later Intel Software RAID (isw) chipsets correctly. Updating dmraid to a later edition fixes this issue. Also cleanup and remove now useless patch. Signed-off-by: Maxime Hadjinlian Cc: Antony Vennard --- package/dmraid/dmraid-fix-make-remove.patch | 22 ---------------------- package/dmraid/dmraid.mk | 4 ++-- package/dmraid/dmraid.patch | 20 -------------------- package/dmraid/dmraid_library-linking-fix.patch | 15 --------------- 4 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 package/dmraid/dmraid-fix-make-remove.patch delete mode 100644 package/dmraid/dmraid.patch delete mode 100644 package/dmraid/dmraid_library-linking-fix.patch diff --git a/package/dmraid/dmraid-fix-make-remove.patch b/package/dmraid/dmraid-fix-make-remove.patch deleted file mode 100644 index 0d6ae75..0000000 --- a/package/dmraid/dmraid-fix-make-remove.patch +++ /dev/null @@ -1,22 +0,0 @@ -[PATCH]: dmraid: fix make remove for header files - -prefix/include/dmraid is not empty, so we need rm -rf - -Signed-off-by: Peter Korsgaard ---- - 1.0.0.rc15/include/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: dmraid/1.0.0.rc15/include/Makefile.in -=================================================================== ---- dmraid.orig/1.0.0.rc15/include/Makefile.in -+++ dmraid/1.0.0.rc15/include/Makefile.in -@@ -24,7 +24,7 @@ install: install_dmraid_headers - - remove_dmraid_headers: - @echo "Removing $(HEADERS) from $(includedir)/dmraid" -- rm -f $(includedir)/dmraid -+ rm -rf $(includedir)/dmraid - - remove: remove_dmraid_headers - diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 067df0b..089e33a 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -4,10 +4,10 @@ # ################################################################################ -DMRAID_VERSION = 1.0.0.rc15 +DMRAID_VERSION = 1.0.0.rc16-3 DMRAID_SOURCE = dmraid-$(DMRAID_VERSION).tar.bz2 DMRAID_SITE = http://people.redhat.com/~heinzm/sw/dmraid/src -DMRAID_SUBDIR = $(DMRAID_VERSION) +DMRAID_SUBDIR = $(DMRAID_VERSION)/dmraid # lib and tools race with parallel make DMRAID_MAKE = $(MAKE1) DMRAID_INSTALL_STAGING = YES diff --git a/package/dmraid/dmraid.patch b/package/dmraid/dmraid.patch deleted file mode 100644 index fbe2894..0000000 --- a/package/dmraid/dmraid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/1.0.0.rc15/lib/device/scan.c.orig 2008-06-20 09:32:05.000000000 -0500 -+++ b/1.0.0.rc15/lib/device/scan.c 2008-12-01 17:15:25.000000000 -0600 -@@ -69,7 +69,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); -@@ -315,7 +315,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))) { diff --git a/package/dmraid/dmraid_library-linking-fix.patch b/package/dmraid/dmraid_library-linking-fix.patch deleted file mode 100644 index a1c33c7..0000000 --- a/package/dmraid/dmraid_library-linking-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Why on earth are we trying to link against the libdir in DESTDIR? - -Signed-Off-By: Nigel Kukard -diff -ur dmraid_vanilla/1.0.0.rc15/tools/Makefile.in dmraid_library-linking-fix/1.0.0.rc15/tools/Makefile.in ---- dmraid_vanilla/1.0.0.rc15/tools/Makefile.in 2008-09-17 13:24:00.000000000 +0000 -+++ dmraid_library-linking-fix/1.0.0.rc15/tools/Makefile.in 2009-06-01 10:50:52.000000000 +0000 -@@ -56,7 +56,7 @@ - - dmraid: $(OBJECTS) $(top_srcdir)/lib/libdmraid.a - $(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib \ -- -L$(DESTDIR)$(libdir) $(DMRAIDLIBS) $(LIBS) -+ $(DMRAIDLIBS) $(LIBS) - - install_dmraid_tools: $(TARGETS) - @echo "Installing $(TARGETS) in $(sbindir)"; \