Fix build of pba image

- propagate Version increase
- add define to disable S3 sleep support in pba build

images/buildroot/packages/sedutil/sedutil.mk

@@ -3,7 +3,7 @@
 # sedutil
 #
 ################################################################################
-SEDUTIL_VERSION = 1.15.1
+SEDUTIL_VERSION = 1.15.6
 SEDUTIL_SOURCE = sedutil-$(SEDUTIL_VERSION).tar.gz
 SEDUTIL_SITE = http://www.foosoftware.org/download
 SEDUTIL_INSTALL_STAGING = NO
@@ -17,9 +17,11 @@ define SEDUTIL_POST_EXTRACT_ACTIONS
 sed -i '/^CLEANFILES/d' $(BUILD_DIR)/sedutil-$(SEDUTIL_VERSION)/Makefile.am
 sed -i '/^BUILT_SOURCES/d' $(BUILD_DIR)/sedutil-$(SEDUTIL_VERSION)/Makefile.am
 sed -i '/^linux\/Version/,3 d' $(BUILD_DIR)/sedutil-$(SEDUTIL_VERSION)/Makefile.am
+sed -i 's/^AM_CXXFLAGS.*/\0 -DPBA_BUILD/' $(BUILD_DIR)/sedutil-$(SEDUTIL_VERSION)/Makefile.am
 sed -i '/^BUILT_SOURCES/d' $(BUILD_DIR)/sedutil-$(SEDUTIL_VERSION)/Makefile.in
 sed -i '/^CLEANFILES/d' $(BUILD_DIR)/sedutil-$(SEDUTIL_VERSION)/Makefile.in
 sed -i '/^linux\/Version/,3 d' $(BUILD_DIR)/sedutil-$(SEDUTIL_VERSION)/Makefile.in
+sed -i 's/^AM_CXXFLAGS.*/\0 -DPBA_BUILD/' $(BUILD_DIR)/sedutil-$(SEDUTIL_VERSION)/Makefile.in
 endef
 SEDUTIL_POST_EXTRACT_HOOKS += SEDUTIL_POST_EXTRACT_ACTIONS
-$(eval $(autotools-package))
+$(eval $(autotools-package))

linux/DtaDevLinuxDrive.cpp

@@ -19,15 +19,21 @@ along with sedutil.  If not, see <http://www.gnu.org/licenses/>.
  * C:E********************************************************************** */
 #include "os.h"
 #include <sys/ioctl.h>
-#include <linux/sed-opal.h>
 #include "DtaDevLinuxDrive.h"
+#ifndef PBA_BUILD
+#include <linux/sed-opal.h>
+#endif
 
 using namespace std;
 
 uint8_t DtaDevLinuxDrive::prepareForS3Sleep(uint8_t lockingrange, const char *userid, const std::shared_ptr<SecureByteVector> &hash)
 {
     LOG(D1) << "Entering DtaDevLinuxDrive::prepareForS3Sleep";
 
+#ifdef PBA_BUILD
+    LOG(E) << "prepareForS3Sleep not supported in PBA build";
+    return -1;
+#else
     opal_lock_unlock opal_ioctl_data={};
     opal_ioctl_data.l_state = OPAL_RW;
     opal_ioctl_data.session.opal_key.lr = lockingrange;
@@ -57,4 +63,5 @@ uint8_t DtaDevLinuxDrive::prepareForS3Sleep(uint8_t lockingrange, const char *us
     if (err < 0)
         return errno;
     return 0;
+#endif
 }