[parted] - Drop hfs_esp patch. Idea didn't work.

Brian C. Lane bcl at fedoraproject.org
Thu Feb 27 21:47:14 UTC 2014


commit 191b34d33b9f0d582cb4d30c3927a3560d0374b7
Author: Brian C. Lane <bcl at redhat.com>
Date:   Thu Feb 27 13:23:51 2014 -0800

    - Drop hfs_esp patch. Idea didn't work.

 ...bparted-Add-hfs_esp-partition-flag-to-GPT.patch |  286 --------------------
 ...0067-libparted-Recognize-btrfs-filesystem.patch |   16 +-
 ...ts-Add-btrfs-and-xfs-to-the-fs-probe-test.patch |    6 +-
 ...parted-Flush-parent-device-on-open-962611.patch |    6 +-
 ...ict-gpt-header-munge-to-little-endian-sys.patch |    7 +-
 parted.spec                                        |   14 +-
 6 files changed, 26 insertions(+), 309 deletions(-)
---
diff --git a/0068-libparted-Recognize-btrfs-filesystem.patch b/0067-libparted-Recognize-btrfs-filesystem.patch
similarity index 93%
rename from 0068-libparted-Recognize-btrfs-filesystem.patch
rename to 0067-libparted-Recognize-btrfs-filesystem.patch
index 5c9fbd2..1c849db 100644
--- a/0068-libparted-Recognize-btrfs-filesystem.patch
+++ b/0067-libparted-Recognize-btrfs-filesystem.patch
@@ -1,7 +1,7 @@
-From 7e43d97d8cbad8fbb51a818362293d6c2ab82304 Mon Sep 17 00:00:00 2001
+From d1667924c6b9de17b335864293aecd43b4701a3c Mon Sep 17 00:00:00 2001
 From: "Brian C. Lane" <bcl at redhat.com>
 Date: Tue, 27 Aug 2013 17:27:07 -0700
-Subject: [PATCH 68/69] libparted: Recognize btrfs filesystem
+Subject: [PATCH 67/70] libparted: Recognize btrfs filesystem
 
 Add support for showing 'btrfs' in  the 'file system' column. Also
 allows the used to enter btrfs as the fs type. It doesn't really do
@@ -22,7 +22,7 @@ anything -- just sets the partition type to linux.
  create mode 100644 libparted/fs/btrfs/btrfs.c
 
 diff --git a/NEWS b/NEWS
-index 026e897..df259d6 100644
+index 541ea1c..3292fa9 100644
 --- a/NEWS
 +++ b/NEWS
 @@ -25,6 +25,9 @@ GNU parted NEWS                                    -*- outline -*-
@@ -32,11 +32,11 @@ index 026e897..df259d6 100644
 +  Added support for recognizing btrfs filesystem. This simply displays
 +  btrfs in the 'file system' column of the parted output.
 +
-   Added new GPT partition type flag, hfs_esp, that sets the GUID to
-   47CB5633-7E3E-408B-B7B8-2D915B7B21B1 so that you can distinguish
-   between OSX's native HFS+ partition and one used Linux on UEFI. The
+   Added new partition type flag, esp, to set the type to 0xEF on MS-DOS.
+   Also aliased to boot on GPT to set the UEFI ESP GUID.
+ 
 diff --git a/doc/parted.texi b/doc/parted.texi
-index ee5b3f7..03522e7 100644
+index a5effd5..ea2c771 100644
 --- a/doc/parted.texi
 +++ b/doc/parted.texi
 @@ -575,6 +575,7 @@ partition table.
@@ -180,5 +180,5 @@ index 9923bfa..3afbf8e 100644
  
  static void _done() __attribute__ ((destructor));
 -- 
-1.8.3.1
+1.8.5.3
 
diff --git a/0069-tests-Add-btrfs-and-xfs-to-the-fs-probe-test.patch b/0068-tests-Add-btrfs-and-xfs-to-the-fs-probe-test.patch
similarity index 82%
rename from 0069-tests-Add-btrfs-and-xfs-to-the-fs-probe-test.patch
rename to 0068-tests-Add-btrfs-and-xfs-to-the-fs-probe-test.patch
index 7aa5449..c225284 100644
--- a/0069-tests-Add-btrfs-and-xfs-to-the-fs-probe-test.patch
+++ b/0068-tests-Add-btrfs-and-xfs-to-the-fs-probe-test.patch
@@ -1,7 +1,7 @@
-From 17027da1eda39d20b2d6dca0a59ac4afc5409318 Mon Sep 17 00:00:00 2001
+From 39cc999710703bb5577e4ef276ca3926cb00af92 Mon Sep 17 00:00:00 2001
 From: "Brian C. Lane" <bcl at redhat.com>
 Date: Wed, 28 Aug 2013 08:47:26 -0700
-Subject: [PATCH 69/69] tests: Add btrfs and xfs to the fs probe test
+Subject: [PATCH 68/70] tests: Add btrfs and xfs to the fs probe test
 
 * tests/tests/t1700-probe-fs.sh: Add btrfs and xfs
 ---
@@ -22,5 +22,5 @@ index 7ce53d0..0418e73 100755
    ( mkfs.$type -V ) >/dev/null 2>&1 \
        || { warn_ "$ME: no $type support"; continue; }
 -- 
-1.8.3.1
+1.8.5.3
 
diff --git a/0070-libparted-Flush-parent-device-on-open-962611.patch b/0069-libparted-Flush-parent-device-on-open-962611.patch
similarity index 87%
rename from 0070-libparted-Flush-parent-device-on-open-962611.patch
rename to 0069-libparted-Flush-parent-device-on-open-962611.patch
index 416b7b4..dee1451 100644
--- a/0070-libparted-Flush-parent-device-on-open-962611.patch
+++ b/0069-libparted-Flush-parent-device-on-open-962611.patch
@@ -1,7 +1,7 @@
-From 115c74f3df2cb10e1f75d711175e8cbb301db594 Mon Sep 17 00:00:00 2001
+From eee862e3c183946a2e71f7606e98eca67ab363e9 Mon Sep 17 00:00:00 2001
 From: "Brian C. Lane" <bcl at redhat.com>
 Date: Wed, 4 Sep 2013 11:45:44 -0700
-Subject: [PATCH] libparted: Flush parent device on open (#962611)
+Subject: [PATCH 69/70] libparted: Flush parent device on open (#962611)
 
 Parted probes for filesystems using geometry offsets into the parent
 device, not the partition device itself. This means it may get stale
@@ -31,5 +31,5 @@ index 375be83..492f828 100644
          return 1;
  }
 -- 
-1.8.3.1
+1.8.5.3
 
diff --git a/0071-tests-Restrict-gpt-header-munge-to-little-endian-sys.patch b/0070-tests-Restrict-gpt-header-munge-to-little-endian-sys.patch
similarity index 91%
rename from 0071-tests-Restrict-gpt-header-munge-to-little-endian-sys.patch
rename to 0070-tests-Restrict-gpt-header-munge-to-little-endian-sys.patch
index 563c441..4dfa15f 100644
--- a/0071-tests-Restrict-gpt-header-munge-to-little-endian-sys.patch
+++ b/0070-tests-Restrict-gpt-header-munge-to-little-endian-sys.patch
@@ -1,7 +1,8 @@
-From 990ca85d9986c9041801ecca04aed1a0f13867a2 Mon Sep 17 00:00:00 2001
+From 54e59b08f70cb5b3419ef02137e0b42da0fab617 Mon Sep 17 00:00:00 2001
 From: "Brian C. Lane" <bcl at redhat.com>
 Date: Wed, 11 Sep 2013 09:09:42 -0700
-Subject: [PATCH] tests: Restrict gpt-header-munge to little-endian systems
+Subject: [PATCH 70/70] tests: Restrict gpt-header-munge to little-endian
+ systems
 
 gpt-header-munge uses perl to manipulate the gpt header for the test. It
 only works on 64 bit little-endian systems so restrict it to x86_64
@@ -47,5 +48,5 @@ index 58625a2..a87e753 100644
  
  ns=100         # Initial number of sectors.
 -- 
-1.8.3.1
+1.8.5.3
 
diff --git a/parted.spec b/parted.spec
index 99e6515..348928a 100644
--- a/parted.spec
+++ b/parted.spec
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 3.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -86,11 +86,10 @@ Patch0063: 0063-libparted-don-t-canonicalize-dev-md-paths-872361.patch
 Patch0064: 0064-tests-rewrite-t6001-to-use-dev-mapper.patch
 Patch0065: 0065-libparted-Add-Intel-Rapid-Start-Technology-partition.patch
 Patch0066: 0066-libparted-Add-UEFI-System-Partition-flag.patch
-Patch0067: 0067-libparted-Add-hfs_esp-partition-flag-to-GPT.patch
-Patch0068: 0068-libparted-Recognize-btrfs-filesystem.patch
-Patch0069: 0069-tests-Add-btrfs-and-xfs-to-the-fs-probe-test.patch
-Patch0070: 0070-libparted-Flush-parent-device-on-open-962611.patch
-Patch0071: 0071-tests-Restrict-gpt-header-munge-to-little-endian-sys.patch
+Patch0068: 0067-libparted-Recognize-btrfs-filesystem.patch
+Patch0069: 0068-tests-Add-btrfs-and-xfs-to-the-fs-probe-test.patch
+Patch0070: 0069-libparted-Flush-parent-device-on-open-962611.patch
+Patch0071: 0070-tests-Restrict-gpt-header-munge-to-little-endian-sys.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -227,6 +226,9 @@ fi
 
 
 %changelog
+* Thu Feb 27 2014 Brian C. Lane <bcl at redhat.com> 3.1-17
+- Drop hfs_esp patch. Idea didn't work.
+
 * Wed Sep 11 2013 Brian C. Lane <bcl at redhat.com> 3.1-16
 - tests: Restrict gpt header munge to little-endian systems
 - Add perl Digest::CRC as a build requirement so more tests will run


More information about the scm-commits mailing list