- updated to 0.0.26

- fixed building with lvm 2.02.161

diff --git a/lvm2.02.149.patch b/lvm2.02.161.patch
similarity index 89%
rename from lvm2.02.149.patch
rename to lvm2.02.161.patch
index bf9cf4b90bfc1a8bb8e5890675c263ab5efdcc55..5f0b02f92db7652197ae54ab07929e84de04b8db 100644 (file)
--- a/lvm2.02.149.patch
+++ b/lvm2.02.161.patch
@@ -1,28 +1,117 @@
-commit 7301ae1c0f4bcb9c72dbf0c80b32890546564afb
-Author: Jan Rękorajski <baggins@pld-linux.org>
-Date:   Sat Apr 30 10:29:07 2016 +0200
-
-    Add support for LVM 2.02.149
-
-diff --git a/bin/generate_field_data b/bin/generate_field_data
-index 5edf3cb..a5fea16 100755
---- a/bin/generate_field_data
-+++ b/bin/generate_field_data
-@@ -50,6 +50,8 @@ TYPE_CONVERSION_MAP = {
-   "snapcount" => "Integer",
-   "vgmdafree" => "Integer",
-   "vgmdasize" => "Integer",
-+  "pvextvsn" => "Integer",
-+  "vgmissingpvcount" => "Integer",
-   # Weird one, can be "auto" or size32
-   "lvreadahead" => "String",
-   "lvmetadatasize" => "Integer",
-diff --git a/lib/lvm/attributes/2.02.149(2)/lvs.yaml b/lib/lvm/attributes/2.02.149(2)/lvs.yaml
-new file mode 100644
-index 0000000..f5b8b4e
---- /dev/null
-+++ b/lib/lvm/attributes/2.02.149(2)/lvs.yaml
-@@ -0,0 +1,276 @@
+diff -urN di-ruby-lvm-attrib-0.0.26.orig/extra-attributes/2.02.161(2)/lvsseg.yaml di-ruby-lvm-attrib-0.0.26/extra-attributes/2.02.161(2)/lvsseg.yaml
+--- di-ruby-lvm-attrib-0.0.26.orig/extra-attributes/2.02.161(2)/lvsseg.yaml    1970-01-01 01:00:00.000000000 +0100
++++ di-ruby-lvm-attrib-0.0.26/extra-attributes/2.02.161(2)/lvsseg.yaml 2016-07-17 17:19:48.000000000 +0200
+@@ -0,0 +1,106 @@
++# These are column to object attribute mappings
++# generated by ./bin/generate_field_data based on
++# lvm2/lib/report/columns.h
++---
++- :method: cache_mode
++  :column: cache_mode
++  :type_hint: String
++  :description: For cache pools
++- :method: cache_policy
++  :column: cache_policy
++  :type_hint: String
++  :description: The cache policy (cached segments only).
++- :method: cache_settings
++  :column: cache_settings
++  :type_hint: String
++  :description: Cache settings/parameters (cached segments only).
++- :method: chunk_size
++  :column: chunk_size
++  :type_hint: Integer
++  :description: For snapshots
++- :method: devices
++  :column: devices
++  :type_hint: String
++  :description: Underlying devices used with starting extent numbers.
++- :method: discards
++  :column: discards
++  :type_hint: String
++  :description: For thin pools
++- :method: lv_uuid
++  :column: lv_uuid
++  :type_hint: String
++  :description: For LogicalVolume to LogicalVolumeSegment relationship.
++- :method: metadata_devices
++  :column: metadata_devices
++  :type_hint: String
++  :description: Underlying metadata devices used with starting extent numbers.
++- :method: region_size
++  :column: region_size
++  :type_hint: Integer
++  :description: For mirrors
++- :method: le_ranges
++  :column: seg_le_ranges
++  :type_hint: String
++  :description: Ranges of Logical Extents of underlying devices in command line format.
++- :method: metadata_le_ranges
++  :column: seg_metadata_le_ranges
++  :type_hint: String
++  :description: Ranges of Logical Extents of underlying metadata devices in command
++    line format.
++- :method: monitor
++  :column: seg_monitor
++  :type_hint: String
++  :description: Dmeventd monitoring status of the segment.
++- :method: pe_ranges
++  :column: seg_pe_ranges
++  :type_hint: String
++  :description: Ranges of Physical Extents of underlying devices in command line format
++    (deprecated
++- :method: size
++  :column: seg_size
++  :type_hint: Integer
++  :description: Size of segment in current units.
++- :method: size_pe
++  :column: seg_size_pe
++  :type_hint: Integer
++  :description: Size of segment in physical extents.
++- :method: start
++  :column: seg_start
++  :type_hint: Integer
++  :description: Offset within the LV to the start of the segment in current units.
++- :method: start_pe
++  :column: seg_start_pe
++  :type_hint: Integer
++  :description: Offset within the LV to the start of the segment in physical extents.
++- :method: tags
++  :column: seg_tags
++  :type_hint: String
++  :description: Tags
++- :method: segtype
++  :column: segtype
++  :type_hint: String
++  :description: Type of LV segment.
++- :method: stripe_size
++  :column: stripe_size
++  :type_hint: Integer
++  :description: For stripes
++- :method: stripes
++  :column: stripes
++  :type_hint: Integer
++  :description: Number of stripes or mirror legs.
++- :method: thin_count
++  :column: thin_count
++  :type_hint: Integer
++  :description: For thin pools
++- :method: thin_id
++  :column: thin_id
++  :type_hint: Integer
++  :description: For thin volume
++- :method: transaction_id
++  :column: transaction_id
++  :type_hint: Integer
++  :description: For thin pools
++- :method: zero
++  :column: zero
++  :type_hint: String
++  :description: For thin pools and volumes
+diff -urN di-ruby-lvm-attrib-0.0.26.orig/extra-attributes/2.02.161(2)/lvs.yaml di-ruby-lvm-attrib-0.0.26/extra-attributes/2.02.161(2)/lvs.yaml
+--- di-ruby-lvm-attrib-0.0.26.orig/extra-attributes/2.02.161(2)/lvs.yaml       1970-01-01 01:00:00.000000000 +0100
++++ di-ruby-lvm-attrib-0.0.26/extra-attributes/2.02.161(2)/lvs.yaml    2016-07-17 17:19:48.000000000 +0200
+@@ -0,0 +1,256 @@
 +# These are column to object attribute mappings
 +# generated by ./bin/generate_field_data based on
 +# lvm2/lib/report/columns.h
@@ -35,10 +124,6 @@ index 0000000..f5b8b4e
 +  :column: convert_lv_uuid
 +  :type_hint: String
 +  :description: For lvconvert
-+- :method: copy_percent
-+  :column: copy_percent
-+  :type_hint: String
-+  :description: For RAID
 +- :method: data_lv
 +  :column: data_lv
 +  :type_hint: String
@@ -47,10 +132,6 @@ index 0000000..f5b8b4e
 +  :column: data_lv_uuid
 +  :type_hint: String
 +  :description: For thin and cache pools
-+- :method: data_percent
-+  :column: data_percent
-+  :type_hint: String
-+  :description: For snapshot and thin pools and volumes
 +- :method: active
 +  :column: lv_active
 +  :type_hint: String
@@ -223,10 +304,6 @@ index 0000000..f5b8b4e
 +  :column: metadata_lv_uuid
 +  :type_hint: String
 +  :description: For thin and cache pools
-+- :method: metadata_percent
-+  :column: metadata_percent
-+  :type_hint: String
-+  :description: For thin pools
 +- :method: mirror_log
 +  :column: mirror_log
 +  :type_hint: String
@@ -246,7 +323,7 @@ index 0000000..f5b8b4e
 +- :method: origin
 +  :column: origin
 +  :type_hint: String
-+  :description: For snapshots
++  :description: For snapshots and thins
 +- :method: origin_size
 +  :column: origin_size
 +  :type_hint: Integer
@@ -254,7 +331,7 @@ index 0000000..f5b8b4e
 +- :method: origin_uuid
 +  :column: origin_uuid
 +  :type_hint: String
-+  :description: For snapshots
++  :description: For snapshots and thins
 +- :method: pool_lv
 +  :column: pool_lv
 +  :type_hint: String
@@ -287,136 +364,34 @@ index 0000000..f5b8b4e
 +  :column: seg_count
 +  :type_hint: Integer
 +  :description: Number of segments in LV.
-+- :method: snap_percent
-+  :column: snap_percent
-+  :type_hint: String
-+  :description: For snapshots
-+- :method: sync_percent
-+  :column: sync_percent
-+  :type_hint: String
-+  :description: For RAID
 +- :method: vg_uuid
 +  :column: vg_uuid
 +  :type_hint: String
 +  :description: For VolumeGroup to LogicalVolume relationship.
-diff --git a/lib/lvm/attributes/2.02.149(2)/lvsseg.yaml b/lib/lvm/attributes/2.02.149(2)/lvsseg.yaml
-new file mode 100644
-index 0000000..af1563a
---- /dev/null
-+++ b/lib/lvm/attributes/2.02.149(2)/lvsseg.yaml
-@@ -0,0 +1,106 @@
+diff -urN di-ruby-lvm-attrib-0.0.26.orig/extra-attributes/2.02.161(2)/pvsseg.yaml di-ruby-lvm-attrib-0.0.26/extra-attributes/2.02.161(2)/pvsseg.yaml
+--- di-ruby-lvm-attrib-0.0.26.orig/extra-attributes/2.02.161(2)/pvsseg.yaml    1970-01-01 01:00:00.000000000 +0100
++++ di-ruby-lvm-attrib-0.0.26/extra-attributes/2.02.161(2)/pvsseg.yaml 2016-07-17 17:19:48.000000000 +0200
+@@ -0,0 +1,16 @@
 +# These are column to object attribute mappings
 +# generated by ./bin/generate_field_data based on
 +# lvm2/lib/report/columns.h
 +---
-+- :method: cache_mode
-+  :column: cache_mode
-+  :type_hint: String
-+  :description: For cache pools
-+- :method: cache_policy
-+  :column: cache_policy
-+  :type_hint: String
-+  :description: The cache policy (cached segments only).
-+- :method: cache_settings
-+  :column: cache_settings
-+  :type_hint: String
-+  :description: Cache settings/parameters (cached segments only).
-+- :method: chunk_size
-+  :column: chunk_size
-+  :type_hint: Integer
-+  :description: For snapshots
-+- :method: devices
-+  :column: devices
-+  :type_hint: String
-+  :description: Underlying devices used with starting extent numbers.
-+- :method: discards
-+  :column: discards
-+  :type_hint: String
-+  :description: For thin pools
-+- :method: lv_uuid
-+  :column: lv_uuid
-+  :type_hint: String
-+  :description: For LogicalVolume to LogicalVolumeSegment relationship.
-+- :method: metadata_devices
-+  :column: metadata_devices
-+  :type_hint: String
-+  :description: Underlying metadata devices used with starting extent numbers.
-+- :method: region_size
-+  :column: region_size
-+  :type_hint: Integer
-+  :description: For mirrors
-+- :method: le_ranges
-+  :column: seg_le_ranges
-+  :type_hint: String
-+  :description: Ranges of Logical Extents of underlying devices in command line format.
-+- :method: metadata_le_ranges
-+  :column: seg_metadata_le_ranges
-+  :type_hint: String
-+  :description: Ranges of Logical Extents of underlying metadata devices in command
-+    line format.
-+- :method: monitor
-+  :column: seg_monitor
-+  :type_hint: String
-+  :description: Dmeventd monitoring status of the segment.
-+- :method: pe_ranges
-+  :column: seg_pe_ranges
++- :method: pv_uuid
++  :column: pv_uuid
 +  :type_hint: String
-+  :description: Ranges of Physical Extents of underlying devices in command line format
-+    (deprecated
++  :description: For PhysicalVolume to PhysicalVolumeSegment relationship.
 +- :method: size
-+  :column: seg_size
-+  :type_hint: Integer
-+  :description: Size of segment in current units.
-+- :method: size_pe
-+  :column: seg_size_pe
++  :column: pvseg_size
 +  :type_hint: Integer
-+  :description: Size of segment in physical extents.
++  :description: Number of extents in segment.
 +- :method: start
-+  :column: seg_start
-+  :type_hint: Integer
-+  :description: Offset within the LV to the start of the segment in current units.
-+- :method: start_pe
-+  :column: seg_start_pe
-+  :type_hint: Integer
-+  :description: Offset within the LV to the start of the segment in physical extents.
-+- :method: tags
-+  :column: seg_tags
-+  :type_hint: String
-+  :description: Tags
-+- :method: segtype
-+  :column: segtype
-+  :type_hint: String
-+  :description: Type of LV segment.
-+- :method: stripe_size
-+  :column: stripe_size
-+  :type_hint: Integer
-+  :description: For stripes
-+- :method: stripes
-+  :column: stripes
-+  :type_hint: Integer
-+  :description: Number of stripes or mirror legs.
-+- :method: thin_count
-+  :column: thin_count
-+  :type_hint: Integer
-+  :description: For thin pools
-+- :method: thin_id
-+  :column: thin_id
-+  :type_hint: Integer
-+  :description: For thin volume
-+- :method: transaction_id
-+  :column: transaction_id
++  :column: pvseg_start
 +  :type_hint: Integer
-+  :description: For thin pools
-+- :method: zero
-+  :column: zero
-+  :type_hint: String
-+  :description: For thin pools
-diff --git a/lib/lvm/attributes/2.02.149(2)/pvs.yaml b/lib/lvm/attributes/2.02.149(2)/pvs.yaml
-new file mode 100644
-index 0000000..f27922f
---- /dev/null
-+++ b/lib/lvm/attributes/2.02.149(2)/pvs.yaml
-@@ -0,0 +1,109 @@
++  :description: Physical Extent number of start of segment.
+diff -urN di-ruby-lvm-attrib-0.0.26.orig/extra-attributes/2.02.161(2)/pvs.yaml di-ruby-lvm-attrib-0.0.26/extra-attributes/2.02.161(2)/pvs.yaml
+--- di-ruby-lvm-attrib-0.0.26.orig/extra-attributes/2.02.161(2)/pvs.yaml       1970-01-01 01:00:00.000000000 +0100
++++ di-ruby-lvm-attrib-0.0.26/extra-attributes/2.02.161(2)/pvs.yaml    2016-07-17 17:19:48.000000000 +0200
+@@ -0,0 +1,113 @@
 +# These are column to object attribute mappings
 +# generated by ./bin/generate_field_data based on
 +# lvm2/lib/report/columns.h
@@ -446,6 +421,10 @@ index 0000000..f27922f
 +  :type_hint: Integer
 +  :description: Offset to the start of PV Bootloader Area on the underlying device
 +    in current units.
++- :method: duplicate
++  :column: pv_duplicate
++  :type_hint: String
++  :description: Set if PV is an unchosen duplicate.
 +- :method: exported
 +  :column: pv_exported
 +  :type_hint: String
@@ -526,33 +505,9 @@ index 0000000..f27922f
 +  :column: vg_uuid
 +  :type_hint: String
 +  :description: For VolumeGroup to PhysicalVolume relationship.
-diff --git a/lib/lvm/attributes/2.02.149(2)/pvsseg.yaml b/lib/lvm/attributes/2.02.149(2)/pvsseg.yaml
-new file mode 100644
-index 0000000..5ae89c6
---- /dev/null
-+++ b/lib/lvm/attributes/2.02.149(2)/pvsseg.yaml
-@@ -0,0 +1,16 @@
-+# These are column to object attribute mappings
-+# generated by ./bin/generate_field_data based on
-+# lvm2/lib/report/columns.h
-+---
-+- :method: pv_uuid
-+  :column: pv_uuid
-+  :type_hint: String
-+  :description: For PhysicalVolume to PhysicalVolumeSegment relationship.
-+- :method: size
-+  :column: pvseg_size
-+  :type_hint: Integer
-+  :description: Number of extents in segment.
-+- :method: start
-+  :column: pvseg_start
-+  :type_hint: Integer
-+  :description: Physical Extent number of start of segment.
-diff --git a/lib/lvm/attributes/2.02.149(2)/vgs.yaml b/lib/lvm/attributes/2.02.149(2)/vgs.yaml
-new file mode 100644
-index 0000000..4f019f9
---- /dev/null
-+++ b/lib/lvm/attributes/2.02.149(2)/vgs.yaml
+diff -urN di-ruby-lvm-attrib-0.0.26.orig/extra-attributes/2.02.161(2)/vgs.yaml di-ruby-lvm-attrib-0.0.26/extra-attributes/2.02.161(2)/vgs.yaml
+--- di-ruby-lvm-attrib-0.0.26.orig/extra-attributes/2.02.161(2)/vgs.yaml       1970-01-01 01:00:00.000000000 +0100
++++ di-ruby-lvm-attrib-0.0.26/extra-attributes/2.02.161(2)/vgs.yaml    2016-07-17 17:19:48.000000000 +0200
 @@ -0,0 +1,136 @@
 +# These are column to object attribute mappings
 +# generated by ./bin/generate_field_data based on

diff --git a/ruby-di-ruby-lvm-attrib.spec b/ruby-di-ruby-lvm-attrib.spec
index 97e2150aec784096118c8d73ecbca257507fe298..835837f5ef45743c9d2b7cfae22c7fa99f9b0f63 100644 (file)
--- a/ruby-di-ruby-lvm-attrib.spec
+++ b/ruby-di-ruby-lvm-attrib.spec
@@ -1,13 +1,13 @@
 %define        pkgname di-ruby-lvm-attrib
 Summary:       A list of attributes for LVM objects
 Name:          ruby-%{pkgname}
-Version:       0.0.25
+Version:       0.0.26
 Release:       1
 License:       GPL v2+ or Ruby
 Group:         Development/Languages
 Source0:       http://rubygems.org/downloads/%{pkgname}-%{version}.gem
-# Source0-md5: f689331aca1d5975345c8ab6bcf3d8b8
-Patch0:                lvm2.02.149.patch
+# Source0-md5: a5d0b61b989468f53f20976e39ac13df
+Patch0:                lvm2.02.161.patch
 URL:           https://github.com/gregsymons/di-ruby-lvm-attrib
 BuildRequires: device-mapper-devel
 BuildRequires: rpm-rubyprov