Skip to content

Commit

Permalink
Zapper: add S4_AP222 yocto kirkstone support [1/1]
Browse files Browse the repository at this point in the history 
PD#SWPL-165337

Problem:
add S4_AP222 yocto kirkstone support

Solution:
change feature name zapper-2k to zapper

Verify:
S4_AP222

Signed-off-by: Blance Tang <[email protected]>
Change-Id: I8656fc0a0b1e7079f718506fc8d076d9cbaa5cdb
  • Loading branch information
Blance Tang committed Apr 16, 2024
1 parent c4a6593 commit 7eb0b5b
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 25 deletions.
2 changes: 1 addition & 1 deletion recipes-common/procps/procps_%.bbappend
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/files/:"
SRC_URI:append = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', 'file://sysctl.conf', '', d)}"
SRC_URI:append = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', 'file://sysctl.conf', '', d)}"

4 changes: 2 additions & 2 deletions recipes-core/base_files/base-files_%.bbappend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if ${@bb.utils.contains('DISTRO_FEATURES', 'nand', 'true', 'false', d)}; then
EOF
fi

if ${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', 'true', 'false', d)}; then
if ${@bb.utils.contains('DISTRO_FEATURES', 'zapper', 'true', 'false', d)}; then
cat >> ${D}${sysconfdir}/fstab <<EOF
/dev/mtdblock6 /factory yaffs2 defaults 0 0
/dev/mtdblock7 /tee yaffs2 defaults 0 0
Expand Down Expand Up @@ -132,7 +132,7 @@ if ${@bb.utils.contains('DISTRO_FEATURES', 'nand', 'true', 'false', d)}; then
EOF
fi

if ${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', 'true', 'false', d)}; then
if ${@bb.utils.contains('DISTRO_FEATURES', 'zapper', 'true', 'false', d)}; then
cat >> ${D}${sysconfdir}/fstab <<EOF
/dev/mtdblock6 /factory yaffs2 defaults 0 0
/dev/mtdblock7 /tee yaffs2 defaults 0 0
Expand Down
2 changes: 1 addition & 1 deletion recipes-core/images/aml-package.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ do_aml_pack() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'AVB', 'true', 'false', d)}; then
cp -f ${STAGING_DIR_NATIVE}${bindir}/aml-swupdate/${SOC_FAMILY}/sw-description-nand-${ROOTFS_TYPE}-avb ${DEPLOY_DIR_IMAGE}/sw-description
cp -f ${STAGING_DIR_NATIVE}${bindir}/aml-swupdate/${SOC_FAMILY}/sw-package-filelist-nand-${ROOTFS_TYPE}-avb ${DEPLOY_DIR_IMAGE}/sw-package-filelist
elif ${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', 'true', 'false', d)}; then
elif ${@bb.utils.contains('DISTRO_FEATURES', 'zapper', 'true', 'false', d)}; then
cp -f ${STAGING_DIR_NATIVE}${bindir}/aml-swupdate/${SOC_FAMILY}/sw-description-nand-${ROOTFS_TYPE}-zapper-2k ${DEPLOY_DIR_IMAGE}/sw-description
cp -f ${STAGING_DIR_NATIVE}${bindir}/aml-swupdate/${SOC_FAMILY}/sw-package-filelist-nand-${ROOTFS_TYPE}-zapper-2k ${DEPLOY_DIR_IMAGE}/sw-package-filelist
else
Expand Down
4 changes: 2 additions & 2 deletions recipes-core/images/recovery-image.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IMAGE_INSTALL:remove:k5.15 = "\
"

IMAGE_INSTALL:remove = "\
${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', 'system-config', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zapper', 'system-config', '', d)} \
"

IMAGE_INSTALL:append:aarch64 = " \
Expand Down Expand Up @@ -135,7 +135,7 @@ delete_unused_items_from_fstab() {
fi
}

ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', 'remove_hwdb_for_zapper; ', '', d)}"
ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', 'remove_hwdb_for_zapper; ', '', d)}"
remove_hwdb_for_zapper() {
if [ -e ${IMAGE_ROOTFS}/lib/udev/hwdb.bin ];then
rm -rf ${IMAGE_ROOTFS}/lib/udev/hwdb.bin
Expand Down
2 changes: 1 addition & 1 deletion recipes-core/initrdscripts/initramfs-meson-boot_1.0.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ do_install() {
install -d ${D}/dev
mknod -m 622 ${D}/dev/console c 5 1

if ${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', 'true', 'false', d)}; then
if ${@bb.utils.contains('DISTRO_FEATURES', 'zapper', 'true', 'false', d)}; then
sed -i '/mkdir -p \/var\/run/a\\techo 100 > /proc/sys/vm/watermark_scale_factor' ${D}/init
sed -i '/mkdir -p \/var\/run/a\\n\techo 3072 > \/proc\/sys\/vm\/min_free_kbytes' ${D}/init
elif ${@bb.utils.contains('DISTRO_FEATURES', 'low-memory', 'true', 'false', d)}; then
Expand Down
2 changes: 1 addition & 1 deletion recipes-core/systemd/systemd_%.bbappend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SRC_URI:append = " file://0027-fix-udisk-can-not-unmount-properly.patch"
SRC_URI:append = " file://0028-custom-hwdb-module.patch"
SRC_URI:append = " file://0001-apply-the-state-to-rfkill-dev-even-when-the-state-fi.patch"

PACKAGECONFIG:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', 'hostnamed networkd nss-resolve resolved randomseed timesyncd', '', d)}"
PACKAGECONFIG:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', 'hostnamed networkd nss-resolve resolved randomseed timesyncd', '', d)}"

do_install:append() {
sed -i -e 's/ExecStart=/ExecStart=-/' ${D}/lib/systemd/system/systemd-modules-load.service
Expand Down
2 changes: 1 addition & 1 deletion recipes-core/udev/eudev_%.bbappend
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

SRC_URI:append = " \
${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', \
${@bb.utils.contains('DISTRO_FEATURES', 'zapper', \
'file://0001-custom-hwdb-module-for-zapper.patch', '', d)} \
"
6 changes: 3 additions & 3 deletions recipes-graphics/directfb/directfb_%.bbappend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ SRC_URI += "\

# If disable-debug-support, MODULEDIRNAME will be set to directfb-$BINARY_VERSION-pure in
# directfb configure which will not be installed to the final package, add a patch to sovle this problem
SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', ' file://0005-configure-change-MODULEDIRNAME-when-disable-debug-support.patch', '', d)}"
SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', ' file://0005-configure-change-MODULEDIRNAME-when-disable-debug-support.patch', '', d)}"

PACKAGECONFIG:remove = "linuxinput"

Expand All @@ -36,13 +36,13 @@ DISABLED_CONFIG = "--disable-network \

EXTRA_OECONF += "--with-gfxdrivers=amlgfx \
--with-inputdrivers=linuxinput,ps2mouse,serialmouse \
${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', '${DISABLED_CONFIG}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zapper', '${DISABLED_CONFIG}', '', d)} \
"

do_install:append() {
install -d ${D}/etc/
install -D -m 0644 ${WORKDIR}/directfbrc ${D}/etc/directfbrc
if ${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', 'true', 'false', d)}
if ${@bb.utils.contains('DISTRO_FEATURES', 'zapper', 'true', 'false', d)}
then
sed -i "s/1920x1080/1280x720/g" ${D}/etc/directfbrc
sed -i "s/#no-cursor/no-cursor/g" ${D}/etc/directfbrc
Expand Down
2 changes: 1 addition & 1 deletion recipes-graphics/drm/libdrm_%.bbappend
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
PACKAGECONFIG:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', ' libkms intel radeon amdgpu nouveau omap freedreno etnaviv', '', d)}"
PACKAGECONFIG:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', ' libkms intel radeon amdgpu nouveau omap freedreno etnaviv', '', d)}"
2 changes: 1 addition & 1 deletion recipes-graphics/wayland/meson-display_git.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/../meta-meson/license/AMLOGIC;md5=6c70138
DEPENDS += " libdrm libdrm-meson"
DEPENDS += "linux-uapi-headers"
RDEPENDS:${PN} += " libdrm-meson"
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', '', 'json-c', d)}"
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', '', 'json-c', d)}"
#do_configure[noexec] = "1"
inherit autotools pkgconfig

Expand Down
2 changes: 2 additions & 0 deletions recipes-kernel/linux/linux-meson_5.15.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/aml_dtoverlay:"

FILESEXTRAPATHS:prepend:bf201 := "${THISDIR}/5.15/bf201:"
FILESEXTRAPATHS:prepend:bg201 := "${THISDIR}/5.15/bg201:"
#FILESEXTRAPATHS:prepend:ap222-zapper := "${THISDIR}/5.15/bg201:"

KBRANCH = "amlogic-5.15-dev"
#SRC_URI = "git://${AML_GIT_ROOT}/kernel/common.git;protocol=${AML_GIT_PROTOCOL};branch=${KBRANCH};"
Expand All @@ -28,6 +29,7 @@ SRC_URI:append:t5m = " file://sc2.cfg"
SRC_URI:append:aq2432 = " file://defconfig"
SRC_URI:append:bf201 = " file://defconfig"
SRC_URI:append:bg201 = " file://defconfig"
#SRC_URI:append:ap222-zapper = " file://defconfig"
SRC_URI:append:t7 = " file://t7.cfg"
SRC_URI:append:g12b = " file://g12b.cfg"
SRC_URI:append:sm1 = " file://sm1.cfg"
Expand Down
10 changes: 9 additions & 1 deletion recipes-kernel/media_modules/media-modules_5.15.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,14 @@ MEDIA_CONFIGS:bg201 = " \
CONFIG_AMLOGIC_MEDIA_VDEC_H265=m \
CONFIG_AMLOGIC_MEDIA_GE2D=y \
"

MEDIA_CONFIGS:ap222-zapper = " \
CONFIG_AMLOGIC_MEDIA_VDEC_MPEG2_MULTI=m \
CONFIG_AMLOGIC_MEDIA_VDEC_H264_MULTI=m \
CONFIG_AMLOGIC_MEDIA_VDEC_H265=m \
CONFIG_AMLOGIC_MEDIA_GE2D=y \
"

MEDIA_CONFIGS:append_g12b = "\
CONFIG_AMLOGIC_MEDIA_VENC_COMMON=m \
CONFIG_AMLOGIC_MEDIA_VENC_H264=m \
Expand Down Expand Up @@ -198,7 +206,7 @@ MODULE_AUTOLOAD_ZAPPER_SKIP = "\
amvdec_ports \
"

KERNEL_MODULE_AUTOLOAD:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', '${MODULE_AUTOLOAD_ZAPPER_SKIP}', '', d)}"
KERNEL_MODULE_AUTOLOAD:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', '${MODULE_AUTOLOAD_ZAPPER_SKIP}', '', d)}"

KERNEL_MODULE_PROBECONF += "amvdec_ports amvdec_mh264"
module_conf_amvdec_ports = "options amvdec_ports multiplanar=1 vp9_need_prefix=1 av1_need_prefix=1"
Expand Down
2 changes: 1 addition & 1 deletion recipes-multimedia/aml-mediahal-sdk/aml-mediahal-sdk_git.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ do_install() {
install -d -m 0755 ${D}/usr/bin
install -D -m 0755 ${S}/example/AmTsPlayerExample/AmTsPlayerExample ${D}/usr/bin
install -D -m 0755 ${S}/example/EsVideoDecPlayer/EsVideoDecPlayer ${D}/usr/bin
if ${@bb.utils.contains('DISTRO_FEATURES','zapper-2k','false','true', d)}; then
if ${@bb.utils.contains('DISTRO_FEATURES','zapper','false','true', d)}; then
install -D -m 0644 ${S}/prebuilt/${ARM_TARGET}/libmediahal_videorender.so ${D}${libdir}
install -D -m 0755 ${S}/example/AmTsPlayerMultiExample/AmTsPlayerMultiExample ${D}/usr/bin
fi
Expand Down
4 changes: 2 additions & 2 deletions recipes-multimedia/arka/arka_git.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ do_install:append() {
install -m 0755 ${WORKDIR}/arka.init ${D}${sysconfdir}/init.d/arka
fi

if ${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', 'true', 'false', d)}; then
if ${@bb.utils.contains('DISTRO_FEATURES', 'zapper', 'true', 'false', d)}; then
install -d ${D}/usr/share/zoneinfo/Asia/
install -m 0755 ${WORKDIR}/Kolkata ${D}/usr/share/zoneinfo/Asia
fi
Expand All @@ -76,6 +76,6 @@ SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'arka-launcher'

FILES:${PN} += "${bindir} ${sysconfdir} /usr/share/fonts/ /usr/share/Arka/png /usr/share/Arka/jpg ${systemd_unitdir}/system/"
FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'use-egl', '${libdir}', '', d)}"
FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', '/usr/share/zoneinfo/Asia', '', d)}"
FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', '/usr/share/zoneinfo/Asia', '', d)}"
FILES:${PN}-dev = ""
INSANE_SKIP:${PN} = "installed-vs-shipped"
8 changes: 4 additions & 4 deletions recipes-multimedia/dtvkit/dtvkit-release-prebuilt.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ SUMMARY = "amlogic dtvkit prebuilt"
LICENSE = "CLOSED"
DEPENDS = "aml-mp-sdk "
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'dtvkit-src', ' android-rpcservice', '', d)} "
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', ' libtinyxml2', ' libxml2', d)} "
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', ' libtinyxml2', ' libxml2', d)} "
RDEPENDS:${PN} = "aml-mp-sdk aml-mediahal-sdk aml-subtitleserver aml-libdvr jsoncpp liblog libjpeg-turbo libpng zlib freetype sqlite3 freetype openssl "
RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', ' libtinyxml2', ' libxml2', d)} "
RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'disable-binderfs', '', ' libbinder', d)} "
RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', ' libtinyxml2', ' libxml2', d)} "
RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'disable-binderfs', '', ' libbinder', d)} "

inherit systemd
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'disable-binderfs', ' ', 'update-rc.d', d)}
Expand Down Expand Up @@ -72,7 +72,7 @@ do_install () {
fi
fi
install -d ${D}/${systemd_unitdir}/system
if ${@bb.utils.contains("DISTRO_FEATURES", "zapper-2k", "false", "true", d)}; then
if ${@bb.utils.contains("DISTRO_FEATURES", "zapper", "false", "true", d)}; then
install -m 0644 ${WORKDIR}/dtvkit.service ${D}/${systemd_unitdir}/system//dtvkit.service
fi

Expand Down
2 changes: 1 addition & 1 deletion recipes-multimedia/playscripts/playscripts.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ do_install() {
sed -i '$a\export XDG_RUNTIME_DIR=\/run' ${D}${sysconfdir}/profile.d/property_set.sh
fi

if ${@bb.utils.contains("DISTRO_FEATURES", "zapper-2k", "true", "false", d)}
if ${@bb.utils.contains("DISTRO_FEATURES", "zapper", "true", "false", d)}
then
cat << EOF >> ${D}${sysconfdir}/profile.d/property_set.sh
## adjust dmx filter number from 64 to 16 to reduce memory use
Expand Down
4 changes: 2 additions & 2 deletions recipes-support/curl/curl_%.bbappend
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PACKAGECONFIG:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', ' gnutls', '', d)}"
PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper-2k', ' openssl', '', d)}"
PACKAGECONFIG:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', ' gnutls', '', d)}"
PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'zapper', ' openssl', '', d)}"

0 comments on commit 7eb0b5b

Please sign in to comment.