Skip to content

Commit

Permalink
turns out there was a script to convert overrides
Browse files Browse the repository at this point in the history
it was just not a separate script from the variable renames
  • Loading branch information
sfoster1 committed Oct 17, 2023
1 parent 78f710b commit db7c4b0
Show file tree
Hide file tree
Showing 44 changed files with 166 additions and 166 deletions.
6 changes: 3 additions & 3 deletions layers/meta-opentrons/classes/pipenv_app_bundle.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
inherit distutils3-base

DEPENDS += "python3 python3-native python3-pip-native python3-micropipenv-native "
RDEPENDS_${PN} += " python3 python3-modules"
RDEPENDS:${PN} += " python3 python3-modules"

# directory for version file output
SYSROOT_DIRS += "/opentrons_versions"
Expand Down Expand Up @@ -132,7 +132,7 @@ do_rewrite_requirements[vardeps] += " PIPENV_APP_BUNDLE_USE_GLOBAL PIPENV_APP_BU

addtask do_rewrite_requirements after do_configure before do_compile

do_configure_prepend () {
do_configure:prepend () {
cd ${PIPENV_APP_BUNDLE_PROJECT_ROOT}
bbplain "Running micropipenv in ${PIPENV_APP_BUNDLE_PROJECT_ROOT}"
if [[ "${PIPENV_APP_BUNDLE_STRIP_HASHES}" = "no" ]] ; then
Expand Down Expand Up @@ -202,4 +202,4 @@ do_install () {
}


FILES_${PN} = "${PIPENV_APP_BUNDLE_DIR} opentrons_versions"
FILES:${PN} = "${PIPENV_APP_BUNDLE_DIR} opentrons_versions"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
do_install_append() {
do_install:append() {
# remove /unit_test dir
rm -rf ${D}/unit_tests
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
SRC_URI_append = " \
SRC_URI:append = " \
file://wrapup-ot3.sh \
"

FILESEXTRAPATHS_append := ":${THISDIR}/files"
do_deploy_append () {
FILESEXTRAPATHS:append := ":${THISDIR}/files"
do_deploy:append () {
install -m 644 -T ${WORKDIR}/wrapup-ot3.sh ${DEPLOYDIR}/wrapup.sh
}

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-distro-boot:"
FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-distro-boot:"

SRC_URI_append = " file://boot.cmd.in"
SRC_URI:append = " file://boot.cmd.in"

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-toradex:"
FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-toradex:"

SRC_URI_append = " \
SRC_URI:append = " \
file://0001-verdin_imx8mm-remove-default-setup-args.patch \
"
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"

SRC_URI += "file://system-connections-location.conf \
file://disable-uap0.conf \
"

FILES_${PN} += "/etc/NetworkManager/conf.d/system-connections-location.conf \
FILES:${PN} += "/etc/NetworkManager/conf.d/system-connections-location.conf \
/etc/NetworkManager/conf.d/disable-uap0.conf \
"

do_install_append() {
do_install:append() {
install -d ${D}/var/lib/NetworkManager/system-connections
install -d ${D}/etc/NetworkManager/conf.d
install -m 644 ${WORKDIR}/system-connections-location.conf ${D}/etc/NetworkManager/conf.d/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"

SRC_URI += " \
file://custom-fstab \
"

do_install_append(){
do_install:append(){
# create userfs dir
install -d ${D}/userfs
install -d ${D}/data
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"

SRC_URI += "file://opentrons-dropbear.default"

do_install_append() {
do_install:append() {
# create a symlink to store rsa host keys in read-write /var/lib/dropbear dir.
install -d ${D}/var/lib/dropbear
rm -rf ${D}/${sysconfdir}/dropbear
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ SRC_URI += "file://OEToolchainConfig.cmake \
file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \
"

LICENSE_append = " & BSD-1-Clause & MIT & BSD-2-Clause"
LIC_FILES_CHKSUM_append = " \
LICENSE:append = " & BSD-1-Clause & MIT & BSD-2-Clause"
LIC_FILES_CHKSUM:append = " \
file://Utilities/cmjsoncpp/LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b \
file://Utilities/cmlibarchive/COPYING;md5=d499814247adaee08d88080841cb5665 \
file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \
Expand Down
16 changes: 8 additions & 8 deletions layers/meta-opentrons/recipes-devtools/cmake/cmake_3.22.3.bb
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ inherit cmake bash-completion

DEPENDS += "curl expat zlib libarchive xz ncurses bzip2"

SRC_URI_append_class-nativesdk = " \
SRC_URI:append:class-nativesdk = " \
file://OEToolchainConfig.cmake \
file://SDKToolchainConfig.cmake.template \
file://cmake-setup.py \
file://environment.d-cmake.sh \
file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \
"

LICENSE_append = " & BSD-1-Clause & MIT"
LIC_FILES_CHKSUM_append = " \
LICENSE:append = " & BSD-1-Clause & MIT"
LIC_FILES_CHKSUM:append = " \
file://Utilities/cmjsoncpp/LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b \
file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \
file://Utilities/cmlibuv/LICENSE;md5=a68902a430e32200263d182d44924d47 \
Expand Down Expand Up @@ -45,7 +45,7 @@ EXTRA_OECMAKE=" \
-DKWSYS_LFS_WORKS=1 \
"

do_install_append_class-nativesdk() {
do_install:append:class-nativesdk() {
mkdir -p ${D}${datadir}/cmake
install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/

Expand All @@ -58,11 +58,11 @@ do_install_append_class-nativesdk() {
install -m 0755 ${WORKDIR}/cmake-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/
}

FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}"
FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}"

FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal ${datadir}/emacs ${datadir}/vim"
FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"
FILES_${PN}-dev = ""
FILES:${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal ${datadir}/emacs ${datadir}/vim"
FILES:${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"
FILES:${PN}-dev = ""

BBCLASSEXTEND = "nativesdk"

6 changes: 3 additions & 3 deletions layers/meta-opentrons/recipes-devtools/meson/meson_0.55.3.bb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
SRC_URI[sha256sum] = "6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5"
SRC_URI[md5sum] ="99777acd77838c8669e1421fda8e31c5"

SRC_URI_append_class-native = " \
SRC_URI:append:class-native = " \
file://0001-Make-CPU-family-warnings-fatal.patch \
file://0002-Support-building-allarch-recipes-again.patch \
"
Expand All @@ -29,8 +29,8 @@ UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"

inherit setuptools3

RDEPENDS_${PN} = "ninja python3-modules python3-pkg-resources"
RDEPENDS:${PN} = "ninja python3-modules python3-pkg-resources"

FILES_${PN} += "${datadir}/polkit-1"
FILES:${PN} += "${datadir}/polkit-1"

BBCLASSEXTEND = "native"
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ do_install() {
install -D -p -m 0755 ${B}/oe-npm-cache ${D}${bindir}/oe-npm-cache
}

RDEPENDS_${PN} = "nodejs-native"
RDEPENDS:${PN} = "nodejs-native"
40 changes: 20 additions & 20 deletions layers/meta-opentrons/recipes-devtools/nodejs/nodejs_16.14.2.bb
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=6ba5b21ac7a505195ca69344d3d7a94a"

DEPENDS = "openssl"
DEPENDS_append_class-target = " qemu-native"
DEPENDS_append_class-native = " c-ares-native"
DEPENDS:append:class-target = " qemu-native"
DEPENDS:append:class-native = " c-ares-native"

inherit pkgconfig python3native qemu

COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*"
COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*"
COMPATIBLE_MACHINE:mips64 = "(!.*mips64).*"

COMPATIBLE_HOST_riscv64 = "null"
COMPATIBLE_HOST_riscv32 = "null"
COMPATIBLE_HOST_powerpc = "null"
COMPATIBLE_HOST:riscv64 = "null"
COMPATIBLE_HOST:riscv32 = "null"
COMPATIBLE_HOST:powerpc = "null"

SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
Expand All @@ -28,13 +28,13 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-liftoff-Correct-function-signatures.patch \
file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \
"
SRC_URI_append_class-target = " \
SRC_URI:append:class-target = " \
file://0002-Using-native-binaries.patch \
"
SRC_URI_append_toolchain-clang_x86 = " \
SRC_URI:append:toolchain-clang:x86 = " \
file://libatomic.patch \
"
SRC_URI_append_toolchain-clang_powerpc64le = " \
SRC_URI:append:toolchain-clang:powerpc64le = " \
file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
"
SRC_URI[sha256sum] = "e922e215cc68eb5f94d33e8a0b61e2c863b7731cc8600ab955d3822da90ff8d1"
Expand All @@ -54,13 +54,13 @@ def map_nodejs_arch(a, d):
elif re.match('powerpc$', a): return 'ppc'
return a

ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \
ARCHFLAGS:arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \
${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \
bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \
bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \
'--with-arm-fpu=vfp', d), d), d)}"
ARCHFLAGS_append_mips = " --v8-lite-mode"
ARCHFLAGS_append_mipsel = " --v8-lite-mode"
ARCHFLAGS:append:mips = " --v8-lite-mode"
ARCHFLAGS:append:mipsel = " --v8-lite-mode"
ARCHFLAGS ?= ""

PACKAGECONFIG ??= "ares brotli icu zlib"
Expand Down Expand Up @@ -133,7 +133,7 @@ python do_create_v8_qemu_wrapper () {
do_create_v8_qemu_wrapper[dirs] = "${B}"
addtask create_v8_qemu_wrapper after do_configure before do_compile

LDFLAGS_append_x86 = " -latomic"
LDFLAGS:append:x86 = " -latomic"

# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi
do_configure () {
Expand Down Expand Up @@ -169,7 +169,7 @@ BINARIES = " \
torque \
"

do_install_append_class-native() {
do_install:append:class-native() {
# use node from PATH instead of absolute path to sysroot
# node-v0.10.25/tools/install.py is using:
# shebang = os.path.join(node_prefix, 'bin/node')
Expand All @@ -194,16 +194,16 @@ do_install_append_class-native() {
install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot
}

do_install_append_class-target() {
do_install:append:class-target() {
sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
}

PACKAGES =+ "${PN}-npm"
FILES_${PN}-npm = "${nonarch_libdir}/node_modules ${bindir}/npm ${bindir}/npx"
RDEPENDS_${PN}-npm = "bash python3-core python3-shell python3-datetime \
FILES:${PN}-npm = "${nonarch_libdir}/node_modules ${bindir}/npm ${bindir}/npx"
RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \
python3-misc python3-multiprocessing"

PACKAGES =+ "${PN}-systemtap"
FILES_${PN}-systemtap = "${datadir}/systemtap"
FILES:${PN}-systemtap = "${datadir}/systemtap"

BBCLASSEXTEND = "native"
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \
file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e"
DEPENDS = "zeromq"

FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:"
FILESEXTRAPATHS:prepend := "${THISDIR}/python-pyzmq:"

SRC_URI += "file://club-rpath-out.patch"
SRC_URI[md5sum] = "2833bd5397e4069f63ad1f9f291f1f70"
SRC_URI[sha256sum] = "13a5638ab24d628a6ade8f794195e1a1acd573496c3b85af2f1183603b7bf5e0"

inherit pypi pkgconfig setuptools3

RDEPENDS_${PN} += "${PYTHON_PN}-multiprocessing"
RDEPENDS:${PN} += "${PYTHON_PN}-multiprocessing"

FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug"
FILES:${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug"

do_compile_prepend() {
do_compile:prepend() {
echo [global] > ${S}/setup.cfg
echo zmq_prefix = ${STAGING_DIR_HOST} >> ${S}/setup.cfg
echo have_sys_un_h = True >> ${S}/setup.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
require recipes-devtools/python/python-setuptools.inc
SRC_URI[md5sum] = "e2c6c3d64b38efe2e81bcd502cf54dcc"
SRC_URI[sha256sum] = "4334fc63121aafb1cc98fd5ae5dd47ea8ad4a38ad638b47af03a686deb14ef5b"
SRC_URI_remove_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch"
SRC_URI:remove:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch"
inherit setuptools3


do_install_append() {
do_install:append() {
mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"

SRC_URI_append += "\
SRC_URI:append += "\
file://pip.conf \
file://user-packages.pth \
"

do_install_append() {
do_install:append() {
# install pip config file to set the package install dir to a read/write part of the rootfs
install -d ${D}/${sysconfdir}
install -m 644 ${WORKDIR}/pip.conf ${D}/${sysconfdir}/pip.conf
Expand All @@ -15,7 +15,7 @@ do_install_append() {
install -m 644 ${WORKDIR}/user-packages.pth ${D}/${libdir}/python3.8/site-packages/
}

FILES_${PN} += "\
FILES:${PN} += "\
${sysconfdir}/pip.conf \
${libdir}/user-packages.pth \
"
Loading

0 comments on commit db7c4b0

Please sign in to comment.