Skip to content

Commit b99001b

Browse files
Divya-563Divya-563
committed
Merge branch 'main' into R4
2 parents 0cb396f + c721ada commit b99001b

File tree

19 files changed

+228
-38
lines changed

19 files changed

+228
-38
lines changed

‎board/metrological/busybox/enable-adduser.fragment‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CONFIG_FEATURE_ADDUSER_TO_GROUP=y

‎board/metrological/kernel/disable-module-compression.fragment‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Disable module compression
2+
CONFIG_MODULE_COMPRESS_NONE=y
3+
CONFIG_MODULE_COMPRESS_GZIP=n
4+
CONFIG_MODULE_COMPRESS_XZ=n
5+
CONFIG_MODULE_COMPRESS_ZSTD=n

‎board/metrological/uclibc-ng/uclib-ng-enable-client-backtrace.fragment‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
UCLIBC_HAS_BACKTRACE=y

‎board/raspberrypi/rpi34-linux-5.15.config‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ CONFIG_BT_HCIBTUSB=m
9595
CONFIG_BT_HCIBTSDIO=m
9696
CONFIG_BT_HCIUART=m
9797
CONFIG_BT_HCIUART_H4=y
98+
CONFIG_CFG80211=m
99+
CONFIG_MAC80211=m
98100
CONFIG_UEVENT_HELPER=y
99101
CONFIG_DEVTMPFS=y
100102
CONFIG_DEVTMPFS_MOUNT=y
@@ -120,6 +122,8 @@ CONFIG_USB_NET_SMSC95XX=y
120122
# CONFIG_WLAN_VENDOR_ADMTEK is not set
121123
# CONFIG_WLAN_VENDOR_ATH is not set
122124
# CONFIG_WLAN_VENDOR_ATMEL is not set
125+
CONFIG_BRCMFMAC=m
126+
CONFIG_BRCMFMAC_USB=y
123127
# CONFIG_WLAN_VENDOR_CISCO is not set
124128
# CONFIG_WLAN_VENDOR_INTEL is not set
125129
# CONFIG_WLAN_VENDOR_INTERSIL is not set
@@ -387,8 +391,6 @@ CONFIG_PWM=y
387391
CONFIG_PWM_BCM2835=y
388392
CONFIG_EXT4_FS=y
389393
CONFIG_EXT4_FS_POSIX_ACL=y
390-
CONFIG_FILE_LOCKING=y
391-
CONFIG_MANDATORY_FILE_LOCKING=y
392394
CONFIG_MSDOS_FS=y
393395
CONFIG_VFAT_FS=y
394396
CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
@@ -404,7 +406,6 @@ CONFIG_NLS_ASCII=y
404406
CONFIG_NLS_ISO8859_1=y
405407
CONFIG_NLS_UTF8=y
406408
CONFIG_LSM=""
407-
CONFIG_CRYPTO_RSA=y
408409
CONFIG_CRYPTO_ECDH=y
409410
CONFIG_CRYPTO_CTR=y
410411
CONFIG_CRYPTO_CTS=y

‎package/amazon-ignition/amazon-ignition.mk‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
AMAZON_IGNITION_VERSION = 92c39937e6ddc69bc67bbb1fdb715515c0a7c6e5
7+
AMAZON_IGNITION_VERSION = 4fcef097a49f2316d8a92fbf609f4d396b2a29a
88
AMAZON_IGNITION_SITE_METHOD = git
99
AMAZON_IGNITION_SITE = [email protected]:Metrological/amazon.git
1010
AMAZON_IGNITION_DEPENDENCIES = jpeg libpng wpeframework amazon-backend libcurl
@@ -131,32 +131,31 @@ define AMAZON_IGNITION_INSTALL_GENERIC
131131
endef
132132

133133
define AMAZON_IGNITION_INSTALL_IGNITION
134-
@$(call MESSAGE,"Installing ignition to: $(call qstrip,$(1))")
135-
@$(INSTALL) -v -d -m 0755 $(call qstrip,$(1))/$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)
134+
@$(call MESSAGE,"Installing ignition to: $(call qstrip,$(TARGET_DIR))")
135+
@$(INSTALL) -v -d -m 0755 $(call qstrip,$(TARGET_DIR))/$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)
136136

137-
$(INSTALL) -d $(1)/usr/lib
138-
$(INSTALL) -m 755 ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/lib/*.so $(1)/usr/lib
137+
rsync -av --exclude lib/ ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/ $(call qstrip,$(TARGET_DIR))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)
139138

140-
rsync -av --exclude lib/ ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/ $(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)
141-
$(INSTALL) -d $(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib
139+
$(INSTALL) -d $(call qstrip,$(TARGET_DIR))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib
140+
$(INSTALL) -m 755 ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/lib/*.so $(call qstrip,$(TARGET_DIR))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib
142141

143-
ln -sf "../../../lib/libignition.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libignition.so"
144-
ln -sf "../../../lib/libprime-video-device-layer.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libprime-video-device-layer.so"
145-
ln -sf "../../../lib/libamazon_playready.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_playready.so"
146-
ln -sf "../../../lib/libamazon_player_mediapipeline.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player_mediapipeline.so"
147-
ln -sf "../../../lib/libamazon_player.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player.so"
148-
149-
ln -sf "../../../lib/libamazon-backend.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon-backend.so"
142+
$(INSTALL) -d $(TARGET_DIR)/usr/lib
143+
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libignition.so" "$(TARGET_DIR)/usr/lib/libignition.so"
144+
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player.so" "$(TARGET_DIR)/usr/lib/libamazon_player.so"
145+
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_playready.so" "$(TARGET_DIR)/usr/lib/libamazon_playready.so"
146+
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player_mediapipeline.so" "$(TARGET_DIR)/usr/lib/libamazon_player_mediapipeline.so"
147+
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libprime-video-device-layer.so" "$(TARGET_DIR)/usr/lib/libprime-video-device-layer.so"
150148
endef
151149

152150
define AMAZON_IGNITION_INSTALL_IGNITION_DEV
153-
@$(call MESSAGE,"Installing ignition headers to: ${STAGING_DIR}/usr/include/ignition")
154-
@$(call AMAZON_IGNITION_INSTALL_IGNITION, ${STAGING_DIR})
151+
@$(call MESSAGE,"Installing ignition headers to: ${STAGING_DIR}/usr/include/ignition")
155152

156153
@$(INSTALL) -v -d -m 0755 ${STAGING_DIR}/usr/include/ignition
157154

158155
@$(call MESSAGE,"Installing ignition header [ ${AMAZON_IGNITION_DEVICE_LAYER_DIR}/../interface/ ] to: ${STAGING_DIR}/usr/include/ignition")
159156
cd "${AMAZON_IGNITION_DEVICE_LAYER_DIR}/../interface/include" && find -name "*.h" -type f -exec cp --parents {} ${STAGING_DIR}/usr/include/ignition/ \;
157+
$(INSTALL) -d ${STAGING_DIR}/usr/lib
158+
$(INSTALL) -m 755 ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/lib/*.so ${STAGING_DIR}/usr/lib
160159
endef
161160

162161
ifeq ($(BR2_PACKAGE_AMAZON_IGNITION_BUILD_TESTS),y)
@@ -205,8 +204,7 @@ else #BR2_PACKAGE_AMAZON_IGNITION_BUILD_TESTS
205204
endef
206205

207206
define AMAZON_IGNITION_INSTALL_TARGET_CMDS
208-
@$(call AMAZON_IGNITION_INSTALL_IGNITION_DEV)
209-
@$(call AMAZON_IGNITION_INSTALL_IGNITION, ${TARGET_DIR})
207+
@$(call AMAZON_IGNITION_INSTALL_IGNITION)
210208
endef
211209

212210
endif # BR2_PACKAGE_AMAZON_IGNITION_BUILD_TESTS

‎package/cobalt/Config.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ config BR2_PACKAGE_COBALT_IMAGE_AS_LIB
1414
This option allows to create cobalt.so,
1515
default is cobalt bin
1616

17+
config BR2_PACKAGE_COBALT_USE_WPEFRAMEWORK_DATA_PATH
18+
bool "Use Thunder defined Data path"
19+
default n
20+
help
21+
This option allows to set thunder define data path
22+
for cobalt data installation
23+
1724
choice BR2_PACKAGE_COBALT_BUILD_TYPE
1825
prompt "Build type"
1926
default BR2_PACKAGE_COBALT_BUILD_TYPE_GOLD

‎package/cobalt/cobalt.mk‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,23 @@ else
5656
export COBALT_EXECUTABLE_TYPE = executable
5757
endif
5858

59+
ifeq ($(BR2_PACKAGE_COBALT_USE_WPEFRAMEWORK_DATA_PATH), y)
60+
export COBALT_DATA_PATH = "$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/Cobalt"
61+
COBALT_DATA_INSTALL_PATH = $(TARGET_DIR)/$(COBALT_DATA_PATH)
62+
COBALT_DATA_SRC_PATH = content/data/*
63+
else
64+
COBALT_DATA_INSTALL_PATH = $(TARGET_DIR)/usr/share/
65+
COBALT_DATA_SRC_PATH = content
66+
endif
67+
5968
define COBALT_BUILD_CMDS
6069
$(@D)/src/cobalt/build/gyp_cobalt -C $(COBALT_BUILD_TYPE) $(COBALT_PLATFORM)
6170
$(HOST_DIR)/usr/bin/ninja -C $(@D)/src/out/$(COBALT_PLATFORM)_$(COBALT_BUILD_TYPE) cobalt_deploy
6271
endef
6372

6473
define COBALT_INSTALL_TARGET_CMDS
65-
cp -a $(@D)/src/out/$(COBALT_PLATFORM)_$(COBALT_BUILD_TYPE)/content $(TARGET_DIR)/usr/share
74+
mkdir -p $(COBALT_DATA_INSTALL_PATH)
75+
cp -a $(@D)/src/out/$(COBALT_PLATFORM)_$(COBALT_BUILD_TYPE)/$(COBALT_DATA_SRC_PATH) $(COBALT_DATA_INSTALL_PATH)
6676
endef
6777

6878

‎package/makedevs/makedevs.c‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -440,15 +440,19 @@ void bb_show_usage(void)
440440
int bb_recursive(const char *fpath, const struct stat *sb,
441441
int tflag, struct FTW *ftwbuf){
442442

443-
if (chown(fpath, recursive_uid, recursive_gid) == -1) {
443+
errno = 0;
444+
if (lchown(fpath, recursive_uid, recursive_gid) == -1) {
444445
bb_perror_msg("chown failed for %s", fpath);
445446
return -1;
446447
}
447-
if (recursive_mode != -1) {
448-
if (chmod(fpath, recursive_mode) < 0) {
449-
bb_perror_msg("chmod failed for %s", fpath);
450-
return -1;
451-
}
448+
449+
/* chmod() is optional, also skip if dangling symlink */
450+
if (recursive_mode == -1 || ((tflag == FTW_SL) && (access(fpath, F_OK) != 0)))
451+
return 0;
452+
453+
if (chmod(fpath, recursive_mode) < 0) {
454+
bb_perror_msg("chmod failed for ---> %s", fpath);
455+
return -1;
452456
}
453457

454458
return 0;
@@ -628,7 +632,7 @@ int main(int argc, char **argv)
628632
if (mknod(full_name_inc, mode, rdev) < 0) {
629633
bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc);
630634
ret = EXIT_FAILURE;
631-
} else if (chown(full_name_inc, uid, gid) < 0) {
635+
} else if (lchown(full_name_inc, uid, gid) < 0) {
632636
bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc);
633637
ret = EXIT_FAILURE;
634638
} else if (chmod(full_name_inc, mode) < 0) {

‎package/wpe/wpeframework-amazon/Config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ config BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER
3232

3333
config BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP
3434
string "group"
35+
default BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER
3536
help
3637
The group that amazon prime user should use (root is not allowed)
3738

‎package/wpe/wpeframework-amazon/wpeframework-amazon.mk‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,21 @@ endif
2929

3030
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_INSTALL_PATH_OVERRIDE),"")
3131
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_INSTALL_PATH=${BR2_PACKAGE_WPEFRAMEWORK_AMAZON_INSTALL_PATH_OVERRIDE}
32+
WPEFRAMEWORK_AMAZON_DATA_PATH = ${BR2_PACKAGE_WPEFRAMEWORK_AMAZON_INSTALL_PATH_OVERRIDE}
3233
else
3334
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_INSTALL_PATH=${BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH}
35+
WPEFRAMEWORK_AMAZON_DATA_PATH = ${BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH}
3436
endif
3537

3638
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER),"")
3739
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_NAME=$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER)
40+
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP),"")
41+
WPEFRAMEWORK_AMAZON_USER_GROUP=amazon
42+
else
43+
WPEFRAMEWORK_AMAZON_USER_GROUP=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP)")
44+
endif
45+
WPEFRAMEWORK_AMAZON_USER=$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER)") -1 $(WPEFRAMEWORK_AMAZON_USER_GROUP) -1 * - - $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_PLATFORM_VIDEO_DEVICE_GROUP)"),$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_GROUP)"),$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_GROUP)") amazon
46+
WPEFRAMEWORK_AMAZON_PERMISSION=$(subst ",,$(WPEFRAMEWORK_AMAZON_DATA_PATH)") r 0550 root $(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP)") - - - - -
3847
endif
3948

4049
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP),"")
@@ -57,4 +66,12 @@ ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_DEBUG),y)
5766
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DCMAKE_BUILD_TYPE=Debug
5867
endif
5968

69+
define WPEFRAMEWORK_AMAZON_USERS
70+
${WPEFRAMEWORK_AMAZON_USER}
71+
endef
72+
73+
define WPEFRAMEWORK_AMAZON_PERMISSIONS
74+
${WPEFRAMEWORK_AMAZON_PERMISSION}
75+
endef
76+
6077
$(eval $(cmake-package))

0 commit comments

Comments
 (0)