Skip to content

Commit c345490

Browse files
author
Santhosh Ramani
committed
Bump amazon-ignition and amazon-backend
Add a patch to disable Root user check Select the right Ruby platform as amp-thunder
1 parent 83d3dc3 commit c345490

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

package/amazon-backend/amazon-backend.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
AMAZON_BACKEND_VERSION = b41d654dafb0bbe6d4d715d6faea626365ad11b3
7+
AMAZON_BACKEND_VERSION = 23ddafb2838a48daaa2865060663da2e6a9c3268
88
AMAZON_BACKEND_SITE = [email protected]:Metrological/amazon-backend.git
99
AMAZON_BACKEND_SITE_METHOD = git
1010
AMAZON_BACKEND_DEPENDENCIES = wpeframework wpeframework-clientlibraries
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--- a/thunder/amp-thunder/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp 2021-02-08 19:26:57.000000000 +0530
2+
+++ b/thunder/amp-thunder/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp 2021-06-09 14:19:45.824472091 +0530
3+
@@ -159,10 +159,11 @@ extern "C"
4+
* as ROOT on linux systems. This fails the initialisation of Bindings
5+
* if the user id of the calling process is 0.
6+
*/
7+
+#if 0 //Disable the ROOT userid check
8+
uid_t userId = getuid();
9+
core::Log::write( core::Log::kInfo, "Initialising Bindings with User Id: %d\n", userId );
10+
AMP_VALIDATE( userId != 0, ::error::kError_InvalidUserPermissions );
11+
-
12+
+#endif
13+
if ( !posixBindings )
14+
{
15+
posixBindings = new hawaii::bindings::PosixBindings();

package/amazon-ignition/amazon-ignition.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
AMAZON_IGNITION_VERSION = 5e0e61cffb4cc65e4fc68e51a84a411a9875b5dd
88
AMAZON_IGNITION_SITE_METHOD = git
99
AMAZON_IGNITION_SITE = [email protected]:Metrological/amazon.git
10-
AMAZON_IGNITION_DEPENDENCIES = jpeg libpng wpeframework amazon-backend
10+
AMAZON_IGNITION_DEPENDENCIES = jpeg libpng wpeframework amazon-backend libcurl
1111
# AMAZON_IGNITION_DEPENDENCIES = zlib jpeg libcurl libpng icu wpeframework amazon amazon-backend
1212
AMAZON_IGNITION_SUPPORTS_IN_SOURCE_BUILD = NO
1313
AMAZON_IGNITION_INSTALL_STAGING = YES
@@ -16,7 +16,7 @@ AMAZON_IGNITION_INSTALL_TARGET = YES
1616
AMAZON_IGNITION_SUBDIR = ignition
1717

1818
AMAZON_IGNITION_DEVICE_LAYER_DIR = "$(@D)/thunder/linux-device-layer/implementation/"
19-
AMAZON_IGNITION_RUBY_PLATFORM_ROOT = "$(@D)/thunder/amp-posix"
19+
AMAZON_IGNITION_RUBY_PLATFORM_ROOT = "$(@D)/thunder/amp-thunder"
2020
AMAZON_IGNITION_BUILD_DIR = "$(AMAZON_IGNITION_SRCDIR)/buildroot-build"
2121
AMAZON_IGNITION_BINARY_INSTALL_DIR = "$(@D)/binary-install"
2222
AMAZON_IGNITION_TEST_INSTALL_BASE_DIR = "$(AMAZON_IGNITION_BINARY_INSTALL_DIR)/test-install"
@@ -40,7 +40,6 @@ ifeq ($(BR2_PACKAGE_AMAZON_IGNITION),y)
4040
AMAZON_IGNITION_CONF_OPTS += \
4141
-DDEVICE_LAYER_DIR=${AMAZON_IGNITION_DEVICE_LAYER_DIR} \
4242
-DIGNITION_PLATFORM_LINK_LIBRARIES="-pthread" \
43-
-DDISABLE_SAFE_BUILD_ROOT_CHECK=OFF \
4443
-DUSE_MEDIA_PIPELINE_BACKEND=OFF \
4544
-DBUILD_AS_SHARED_LIBRARY=ON \
4645
-DBUILD_CURL_7_72_0=ON \

0 commit comments

Comments
 (0)