diff options
Diffstat (limited to 'meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended')
3 files changed, 37 insertions, 37 deletions
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 35585d069..444279309 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb @@ -24,9 +24,9 @@ inherit autotools pkgconfig update-rc.d LCD_DRIVERS ?= "all,!irman,!svga${SERIALVFD}" SERIALVFD ?= "" -SERIALVFD_libc-musl = ",!serialVFD" -SERIALVFD_libc-musl_x86 = "" -SERIALVFD_libc-musl_x86-64 = "" +SERIALVFD:libc-musl = ",!serialVFD" +SERIALVFD:libc-musl:x86 = "" +SERIALVFD:libc-musl:x86-64 = "" LCD_DEFAULT_DRIVER ?= "curses" @@ -37,7 +37,7 @@ PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render," PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid" PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng" -LCD_DRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}" +LCD_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}" EXTRA_OECONF = "--enable-drivers='${LCD_DRIVERS}'" @@ -74,31 +74,31 @@ do_install () { PACKAGES =+ "lcdd lcdvc" -RRECOMMENDS_${PN} = "lcdd" +RRECOMMENDS:${PN} = "lcdd" -FILES_lcdd = "${sysconfdir}/LCDd.conf \ +FILES:lcdd = "${sysconfdir}/LCDd.conf \ ${sbindir}/LCDd \ ${sysconfdir}/init.d/lcdd" -CONFFILES_lcdd = "${sysconfdir}/LCDd.conf" -CONFFILES_${PN} = "${sysconfdir}/lcdproc.conf" -CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf" -FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc" +CONFFILES:lcdd = "${sysconfdir}/LCDd.conf" +CONFFILES:${PN} = "${sysconfdir}/lcdproc.conf" +CONFFILES:lcdvc = "${sysconfdir}/lcdvc.conf" +FILES:lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc" # Driver packages # USB / no USB trickery -RCONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780" -RCONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb" +RCONFLICTS:lcdd-driver-hd47780nousb = "lcdd-driver-hd44780" +RCONFLICTS:lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb" INITSCRIPT_PACKAGES = "lcdd lcdproc" -INITSCRIPT_NAME_lcdd = "lcdd" -INITSCRIPT_NAME_lcdproc = "lcdproc" -INITSCRIPT_PARAMS_lcdd = "defaults 70 21" -INITSCRIPT_PARAMS_lcdproc = "defaults 71 20" +INITSCRIPT_NAME:lcdd = "lcdd" +INITSCRIPT_NAME:lcdproc = "lcdproc" +INITSCRIPT_PARAMS:lcdd = "defaults 70 21" +INITSCRIPT_PARAMS:lcdproc = "defaults 71 20" -python populate_packages_prepend() { +python populate_packages:prepend() { plugindir = d.expand('${libdir}/lcdproc') do_split_packages(d, plugindir, '(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True) } diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch index e525047df..5cdad93e9 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch @@ -17,15 +17,15 @@ Content-Transfer-Encoding: 8bit python/mozbuild/mozbuild/configure/__init__.py / Line 310 onwards * major changes upstream on build are not to expect so upgrading should cause little trouble and changes can be tracked by [3] -* some solutions are workarounds/hacks so this patch will not be accepeted - upstream. This should not be a probelme for us: once mozjs >= 68 will arrive +* some solutions are workarounds/hacks so this patch will not be accepted + upstream. This should not be a problem for us: once mozjs >= 68 will arrive we have to go to rust/cargo based build anyway. [1] https://code.foxkit.us/adelie/packages/blob/f2b5773da19ab397fbe64fd32dacc383cfe4cd77/user/mozjs/python3.patch [2] https://github.com/mozilla/gecko-dev [3] https://github.com/mozilla/gecko-dev/tree/esr60 -Upstream-Status: Inaproppriate [Some Hacks] +Upstream-Status: Inappropriate [Some Hacks] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb index 7367c30a5..1747e6b29 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb @@ -20,11 +20,11 @@ SRC_URI = " \ file://0013-riscv-Disable-atomic-operations.patch \ file://0014-remove-JS_VOLATIME_ARM.patch \ " -SRC_URI_append_libc-musl = " \ +SRC_URI:append:libc-musl = " \ file://musl/0001-support-musl.patch \ file://musl/0002-js-Fix-build-with-musl.patch \ " -SRC_URI_append_mipsarchn32 = " \ +SRC_URI:append:mipsarchn32 = " \ file://mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch \ " SRC_URI[md5sum] = "69a0be9ce695e5dc4941ed0c78ef00c2" @@ -35,7 +35,7 @@ S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" inherit autotools pkgconfig perlnative python3native inherit features_check -CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" +CONFLICT_DISTRO_FEATURES:mipsarchn32 = "ld-is-gold" DEPENDS += " \ nspr zlib autoconf-2.13-native \ @@ -62,18 +62,18 @@ EXTRA_OECONF = " \ " # Without this, JS_Init() will fail for mips64. -EXTRA_OECONF_append_mipsarch = " --with-intl-api=build" -EXTRA_OECONF_append_powerpc = " --with-intl-api=build" +EXTRA_OECONF:append:mipsarch = " --with-intl-api=build" +EXTRA_OECONF:append:powerpc = " --with-intl-api=build" -EXTRA_OECONF_append_mipsarch = " --disable-ion" -EXTRA_OECONF_append_riscv64 = " --disable-ion" -EXTRA_OECONF_append_riscv32 = " --disable-ion" +EXTRA_OECONF:append:mipsarch = " --disable-ion" +EXTRA_OECONF:append:riscv64 = " --disable-ion" +EXTRA_OECONF:append:riscv32 = " --disable-ion" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--x-includes=no --x-libraries=no,virtual/libx11" -EXTRA_OEMAKE_task-compile += "BUILD_OPT=1 OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" -EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static" +EXTRA_OEMAKE:task-compile += "BUILD_OPT=1 OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" +EXTRA_OEMAKE:task-install += "STATIC_LIBRARY_NAME=js_static" export HOST_CC = "${BUILD_CC}" export HOST_CXX = "${BUILD_CXX}" @@ -110,12 +110,12 @@ do_configure() { touch ${B}/config.status } -do_compile_prepend() { +do_compile:prepend() { export SHELL="/bin/sh" export PYTHONPATH=`cat ${B}/PYTHONPATH` } -do_install_prepend() { +do_install:prepend() { export SHELL="/bin/sh" export PYTHONPATH=`cat ${B}/PYTHONPATH` } @@ -124,15 +124,15 @@ inherit multilib_script multilib_header MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js60-config" -do_install_append() { +do_install:append() { oe_multilib_header mozjs-60/js-config.h sed -e 's@${STAGING_DIR_HOST}@@g' \ -i ${D}${bindir}/js60-config } PACKAGES =+ "lib${BPN}" -FILES_lib${BPN} += "${libdir}/lib*.so" -FILES_${PN}-dev += "${bindir}/js60-config" +FILES:lib${BPN} += "${libdir}/lib*.so" +FILES:${PN}-dev += "${bindir}/js60-config" # Fails to build with thumb-1 (qemuarm) #| {standard input}: Assembler messages: @@ -141,7 +141,7 @@ FILES_${PN}-dev += "${bindir}/js60-config" #| {standard input}:2174: Error: unshifted register required -- `orr r1,r1,#(1<<20)' #| {standard input}:2176: Error: instruction not supported in Thumb16 mode -- `subs r2,r2,#0x300' #| {standard input}:2178: Error: instruction not supported in Thumb16 mode -- `subs r5,r2,#52' -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" DISABLE_STATIC = "" |