pjones pushed to fwupdate (master). "Update to 0.4 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Jun 2 18:42:39 UTC 2015
From dbe42798fde1f9c8e2761a30d36443de04a87eed Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Tue, 2 Jun 2015 14:42:15 -0400
Subject: Update to 0.4
- Set DESTDIR so it's more consistently respected
- Always use upper case for Boot#### names.
- Create abbreviated device paths for our BootNext entry.
- Make subdir Makefiles get the version right.
- Fix ucs2len() to handle max=-1 correctly.
- Compare the right blobs when we're searching old boot entries.
- Fix .efi generation on non-x86 platforms.
- Use a relative path for fwupdate.efi when launched from shim.
- Show fewer debugging messages.
- Set BootNext when we find an old Boot#### variable as well.
- Add fwup_get_fw_type().
Signed-off-by: Peter Jones <pjones at redhat.com>
diff --git a/0001-Always-use-upper-case-for-Boot-names.patch b/0001-Always-use-upper-case-for-Boot-names.patch
deleted file mode 100644
index 733221b..0000000
--- a/0001-Always-use-upper-case-for-Boot-names.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c25da8d5fa5cbfc2c0c51530d3065434f41a3925 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones at redhat.com>
-Date: Mon, 1 Jun 2015 11:35:54 -0400
-Subject: [PATCH 1/4] Always use upper case for Boot#### names.
-
-UEFI requires upper case names...
-
-Signed-off-by: Peter Jones <pjones at redhat.com>
----
- linux/libfwup.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux/libfwup.c b/linux/libfwup.c
-index d0cac8d..4a8bd2a 100644
---- a/linux/libfwup.c
-+++ b/linux/libfwup.c
-@@ -687,7 +687,7 @@ do_next:
- if (boot_next >= 0x10000)
- goto out;
-
-- sprintf(boot_next_name, "Boot%04x", boot_next);
-+ sprintf(boot_next_name, "Boot%04X", boot_next);
- rc = efi_set_variable(*guid, boot_next_name, opt, opt_size,
- EFI_VARIABLE_NON_VOLATILE |
- EFI_VARIABLE_BOOTSERVICE_ACCESS |
---
-2.4.2
-
diff --git a/0002-Create-abbreviated-device-paths-for-our-BootNext-ent.patch b/0002-Create-abbreviated-device-paths-for-our-BootNext-ent.patch
deleted file mode 100644
index e74f20c..0000000
--- a/0002-Create-abbreviated-device-paths-for-our-BootNext-ent.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2f515df557a8dbe2d6a0a628279e200c1e255f7f Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones at redhat.com>
-Date: Mon, 1 Jun 2015 12:01:11 -0400
-Subject: [PATCH 2/4] Create abbreviated device paths for our BootNext entry.
-
-Signed-off-by: Peter Jones <pjones at redhat.com>
----
- linux/libfwup.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/linux/libfwup.c b/linux/libfwup.c
-index 4a8bd2a..59cc865 100644
---- a/linux/libfwup.c
-+++ b/linux/libfwup.c
-@@ -546,7 +546,8 @@ set_up_boot_next(void)
- ? fwup_fs_path
- : shim_fs_path,
- EFIBOOT_OPTIONS_IGNORE_FS_ERROR|
-- EFIBOOT_OPTIONS_IGNORE_PMBR_ERR);
-+ EFIBOOT_OPTIONS_IGNORE_PMBR_ERR|
-+ EFIBOOT_ABBREV_HD);
- if (sz < 0)
- return -1;
-
-@@ -567,7 +568,8 @@ set_up_boot_next(void)
- ? fwup_fs_path
- : shim_fs_path,
- EFIBOOT_OPTIONS_IGNORE_FS_ERROR|
-- EFIBOOT_OPTIONS_IGNORE_PMBR_ERR);
-+ EFIBOOT_OPTIONS_IGNORE_PMBR_ERR|
-+ EFIBOOT_ABBREV_HD);
- if (sz != dp_size)
- return -1;
-
---
-2.4.2
-
diff --git a/0003-Make-subdir-Makefiles-get-the-version-right.patch b/0003-Make-subdir-Makefiles-get-the-version-right.patch
deleted file mode 100644
index 76febae..0000000
--- a/0003-Make-subdir-Makefiles-get-the-version-right.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From fdfafcc0a3b80ed7e2a71523b57e073d85ceb6a6 Mon Sep 17 00:00:00 2001
-From: root <root at pjones3.install.bos.redhat.com>
-Date: Mon, 1 Jun 2015 13:20:14 -0400
-Subject: [PATCH 3/4] Make subdir Makefiles get the version right.
-
-Signed-off-by: root <root at pjones3.install.bos.redhat.com>
----
- Make.version | 1 +
- Makefile | 2 +-
- efi/Makefile | 1 +
- linux/Makefile | 1 +
- 4 files changed, 4 insertions(+), 1 deletion(-)
- create mode 100644 Make.version
-
-diff --git a/Make.version b/Make.version
-new file mode 100644
-index 0000000..8bc4d73
---- /dev/null
-+++ b/Make.version
-@@ -0,0 +1 @@
-+VERSION = 0.3
-diff --git a/Makefile b/Makefile
-index 1a2b6f0..c72af0a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,5 @@
- TOPDIR=$(shell pwd)
--VERSION = 0.3
-+include $(TOPDIR)/Make.version
- SUBDIRS = efi linux docs
-
- all clean install :
-diff --git a/efi/Makefile b/efi/Makefile
-index f3c7892..b222367 100644
---- a/efi/Makefile
-+++ b/efi/Makefile
-@@ -1,4 +1,5 @@
- TOPDIR ?= $(shell pwd)/..
-+include $(TOPDIR)/Make.version
- include $(TOPDIR)/Make.defaults
-
-
-diff --git a/linux/Makefile b/linux/Makefile
-index 2f09c1c..9abad32 100644
---- a/linux/Makefile
-+++ b/linux/Makefile
-@@ -1,4 +1,5 @@
- TOPDIR ?= $(shell pwd)/..
-+include $(TOPDIR)/Make.version
- include $(TOPDIR)/Make.defaults
-
- LIB_LIBS= pthread
---
-2.4.2
-
diff --git a/0004-Fix-ucs2len-to-handle-max-1-correctly.patch b/0004-Fix-ucs2len-to-handle-max-1-correctly.patch
deleted file mode 100644
index 2f5cb29..0000000
--- a/0004-Fix-ucs2len-to-handle-max-1-correctly.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 79b416af540c67d4f0f742abac102c05f5f49c39 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones at redhat.com>
-Date: Mon, 1 Jun 2015 14:35:02 -0400
-Subject: [PATCH 4/4] Fix ucs2len() to handle max=-1 correctly.
-
-Signed-off-by: Peter Jones <pjones at redhat.com>
----
- linux/ucs2.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux/ucs2.h b/linux/ucs2.h
-index 67d22e1..082032b 100644
---- a/linux/ucs2.h
-+++ b/linux/ucs2.h
-@@ -102,7 +102,7 @@ __attribute__((__unused__))
- ucs2len(uint16_t *s, ssize_t limit)
- {
- ssize_t i;
-- for (i = 0; i < limit && s[i] != L'\0'; i++)
-+ for (i = 0; i < (limit > 0 ? limit : i + 1) && s[i] != L'\0'; i++)
- ;
- return i;
- }
---
-2.4.2
-
diff --git a/fwupdate.spec b/fwupdate.spec
index 4f369f2..9fdbe92 100644
--- a/fwupdate.spec
+++ b/fwupdate.spec
@@ -2,8 +2,8 @@
%global efibootmgr_version 0.12-1
Name: fwupdate
-Version: 0.3
-Release: 4%{?dist}
+Version: 0.4
+Release: 1%{?dist}
Summary: Tools to manage UEFI firmware updates
License: GPLv2+
URL: https://github.com/rhinstaller/fwupdate
@@ -28,10 +28,6 @@ ExclusiveArch: x86_64 %{ix86} aarch64
%global efidir %(eval grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')
Source0: https://github.com/rhinstaller/fwupdate/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
-Patch0001: 0001-Always-use-upper-case-for-Boot-names.patch
-Patch0002: 0002-Create-abbreviated-device-paths-for-our-BootNext-ent.patch
-Patch0003: 0003-Make-subdir-Makefiles-get-the-version-right.patch
-Patch0004: 0004-Fix-ucs2len-to-handle-max-1-correctly.patch
%description
fwupdate provides a simple command line interface to the UEFI firmware updates.
@@ -98,6 +94,20 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so.*
%changelog
+* Tue Jun 02 2015 Peter Jones <pjones at redhat.com> - 0.4-1
+- Update to 0.4
+- Set DESTDIR so it's more consistently respected
+- Always use upper case for Boot#### names.
+- Create abbreviated device paths for our BootNext entry.
+- Make subdir Makefiles get the version right.
+- Fix ucs2len() to handle max=-1 correctly.
+- Compare the right blobs when we're searching old boot entries.
+- Fix .efi generation on non-x86 platforms.
+- Use a relative path for fwupdate.efi when launched from shim.
+- Show fewer debugging messages.
+- Set BootNext when we find an old Boot#### variable as well.
+- Add fwup_get_fw_type().
+
* Mon Jun 01 2015 Peter Jones <pjones at redhat.com> - 0.3-4
- Make abbreviated device paths work in the BootNext entry.
- Fix a ucs2 parsing bug.
diff --git a/sources b/sources
index 8b2cc11..27ead81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d25763244096041af2c2c7daac69da18 fwupdate-0.3.tar.bz2
+c8695f4b0739bc0de3f9eacc2462f6c8 fwupdate-0.4.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/fwupdate.git/commit/?h=master&id=dbe42798fde1f9c8e2761a30d36443de04a87eed
More information about the scm-commits
mailing list