From patchwork Mon Sep 21 12:51:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 520281 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id D59D31401CD for ; Mon, 21 Sep 2015 22:52:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 95B9487409; Mon, 21 Sep 2015 12:52:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wox8C5BUJbT1; Mon, 21 Sep 2015 12:51:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3D6E58745F; Mon, 21 Sep 2015 12:51:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 842401C16D5 for ; Mon, 21 Sep 2015 12:51:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7F2AD90947 for ; Mon, 21 Sep 2015 12:51:52 +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 jYehf55LD5cN for ; Mon, 21 Sep 2015 12:51:51 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id AC4DE91C4B for ; Mon, 21 Sep 2015 12:51:50 +0000 (UTC) Received: by wicgb1 with SMTP id gb1so113336828wic.1 for ; Mon, 21 Sep 2015 05:51:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XGS94yFmmi9lVfMmDwA87qx+E+XtKxWjzgrQIdQ9tIQ=; b=Ju4GHXs5Nm1XKmiZM5p0XbkvXUCQHCE6Y3+WjmBpslL1k5n0kJe0MgRpCOXrChm3GC 9T3/1UxgfJecg/R0qaH4KuX/2AwY9HMizOrC+GxxBlRmNjr/R7CCK7gEld3nOMTRjNpu hS3kfL64Y/QNS0haf9yWtvscDpFXT9HDckNdO5YSz7E0TYMv/zhkQXx9pSamTTflUNlr CuRx/LZZpwa8mqkkABenYezAW3aKjgBbz8ALVyrsVNWBWsVq+48lEuqg//XmZRknVhTU Hy1VUENWxJk1KBXBGhHIAyiC2GMxtrE6iuPmNFTsdoC4vxUaOoKYBdKb0NhFjOveZPfD lO+w== X-Gm-Message-State: ALoCoQnpUZ5et+ZErWbYquiLWbr972Z3dur7R/lsCj/2jZW/vlz0ief3DARIoBLy8s4p3VwOJzBA X-Received: by 10.180.211.116 with SMTP id nb20mr14054386wic.50.1442839909300; Mon, 21 Sep 2015 05:51:49 -0700 (PDT) Received: from t450s.lan (89-92-157-132.hfc.dyn.abo.bbox.fr. [89.92.157.132]) by smtp.googlemail.com with ESMTPSA id p10sm24009733wjx.7.2015.09.21.05.51.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Sep 2015 05:51:48 -0700 (PDT) From: Gary Bisson To: buildroot@busybox.net Date: Mon, 21 Sep 2015 14:51:39 +0200 Message-Id: <1442839899-18044-3-git-send-email-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1442839899-18044-1-git-send-email-gary.bisson@boundarydevices.com> References: <1442839899-18044-1-git-send-email-gary.bisson@boundarydevices.com> Cc: thomas.petazzoni@free-electrons.com Subject: [Buildroot] [PATCH 2/2] kobs-ng: remove obsolete package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" In favor of imx-kobs maintained by Freescale. Signed-off-by: Gary Bisson Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 8 ++++ package/Config.in | 1 - package/kobs-ng/0001-fix-mtd-defines.patch | 73 ------------------------------ package/kobs-ng/Config.in | 9 ---- package/kobs-ng/kobs-ng.hash | 2 - package/kobs-ng/kobs-ng.mk | 13 ------ 6 files changed, 8 insertions(+), 98 deletions(-) delete mode 100644 package/kobs-ng/0001-fix-mtd-defines.patch delete mode 100644 package/kobs-ng/Config.in delete mode 100644 package/kobs-ng/kobs-ng.hash delete mode 100644 package/kobs-ng/kobs-ng.mk diff --git a/Config.in.legacy b/Config.in.legacy index 18231fd..5305538 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -363,6 +363,14 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all examples. +config BR2_PACKAGE_KOBS_NG + bool "kobs-ng was replaced by imx-kobs" + select BR2_LEGACY + select BR2_PACKAGE_IMX_KOBS + help + The outdated kobs-ng has been replaced by the Freescale- + maintained imx-kobs package. + config BR2_PACKAGE_SAWMAN bool "sawman package removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 22aef52..5c4c3b4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -164,7 +164,6 @@ menu "Filesystem and flash utilities" source "package/genext2fs/Config.in" source "package/genpart/Config.in" source "package/genromfs/Config.in" - source "package/kobs-ng/Config.in" source "package/makedevs/Config.in" source "package/mmc-utils/Config.in" source "package/mtd/Config.in" diff --git a/package/kobs-ng/0001-fix-mtd-defines.patch b/package/kobs-ng/0001-fix-mtd-defines.patch deleted file mode 100644 index 3ffba71..0000000 --- a/package/kobs-ng/0001-fix-mtd-defines.patch +++ /dev/null @@ -1,73 +0,0 @@ -Newer kernel headers renamed mtd mode defines and no longer support -MEMSETOOBSEL. Allow code to work with both older and newer kernel -versions. - -Signed-off-by: Paul B. Henson -Signed-off-by: Sergey Alyoshin - -diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c ---- kobs-ng-3.0.35-4.0.0-orig/src/mtd.c 2012-12-17 22:37:40.000000000 -0800 -+++ kobs-ng-3.0.35-4.0.0/src/mtd.c 2013-07-28 19:39:59.000000000 -0700 -@@ -852,8 +852,11 @@ - mp = &md->part[i]; - - if (mp->fd != -1) { -+/* Newer kernels dropped MEMSETOOBSEL */ -+#ifdef MEMSETOOBSEL - (void)ioctl(mp->fd, MEMSETOOBSEL, - &mp->old_oobinfo); -+#endif - close(mp->fd); - } - -@@ -896,6 +899,8 @@ - continue; - } - -+/* Newer kernels dropped MEMSETOOBSEL */ -+#ifdef MEMSETOOBSEL - if (r == -ENOTTY) { - r = ioctl(mp->fd, MEMSETOOBSEL, &mp->old_oobinfo); - if (r != 0) { -@@ -904,6 +909,7 @@ - } - mp->oobinfochanged = 0; - } -+#endif - } else { - r = ioctl(mp->fd, MTDFILEMODE, (void *)MTD_MODE_RAW); - if (r != 0 && r != -ENOTTY) { -@@ -911,6 +917,8 @@ - continue; - } - -+/* Newer kernels dropped MEMSETOOBSEL */ -+#ifdef MEMSETOOBSEL - if (r == -ENOTTY) { - r = ioctl(mp->fd, MEMSETOOBSEL, &none_oobinfo); - if (r != 0) { -@@ -920,6 +928,7 @@ - mp->oobinfochanged = 1; - } else - mp->oobinfochanged = 2; -+#endif - } - - mp->ecc = ecc; -diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.h kobs-ng-3.0.35-4.0.0/src/mtd.h ---- kobs-ng-3.0.35-4.0.0-orig/src/mtd.h 2012-12-17 22:37:40.000000000 -0800 -+++ kobs-ng-3.0.35-4.0.0/src/mtd.h 2013-07-28 19:33:57.000000000 -0700 -@@ -31,6 +31,13 @@ - #include "BootControlBlocks.h" - #include "rom_nand_hamming_code_ecc.h" - -+// Newer kernel headers renamed define -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) -+# define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL -+# define MTD_MODE_RAW MTD_FILE_MODE_RAW -+#endif -+ - //------------------------------------------------------------------------------ - // Re-definitions of true and false, because the standard ones aren't good - // enough? diff --git a/package/kobs-ng/Config.in b/package/kobs-ng/Config.in deleted file mode 100644 index 1f6b2d1..0000000 --- a/package/kobs-ng/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_KOBS_NG - bool "kobs-ng" - depends on BR2_arm - help - The kobs-ng tool is used for writing images to NAND on i.MX - platforms. - - This utility is provided by Freescale as-is and doesn't have an - upstream. diff --git a/package/kobs-ng/kobs-ng.hash b/package/kobs-ng/kobs-ng.hash deleted file mode 100644 index 3e527da..0000000 --- a/package/kobs-ng/kobs-ng.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://repository.timesys.com/buildsources/k/kobs-ng/kobs-ng-3.0.35-4.0.0/kobs-ng-3.0.35-4.0.0.tar.gz.md5sum -md5 26104c577f59a6b81782a5bd16aadd82 kobs-ng-3.0.35-4.0.0.tar.gz diff --git a/package/kobs-ng/kobs-ng.mk b/package/kobs-ng/kobs-ng.mk deleted file mode 100644 index 13d1faf..0000000 --- a/package/kobs-ng/kobs-ng.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kobs-ng -# -################################################################################ - -# kobs-ng versions have never made much sense :( -KOBS_NG_VERSION = 3.0.35-4.0.0 -KOBS_NG_SITE = http://repository.timesys.com/buildsources/k/kobs-ng/kobs-ng-$(KOBS_NG_VERSION) -KOBS_NG_LICENSE = GPLv2+ -KOBS_NG_LICENSE_FILES = COPYING - -$(eval $(autotools-package))