[OE-core] [PATCH 2/2] python3-referencing: drop ${PYTHON_PN}
python 2 is gone and we don't need the abstraction now, drop the remaining usage of this variable. Signed-off-by: Justin Bronder --- meta/recipes-devtools/python/python3-referencing_0.33.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-referencing_0.33.0.bb b/meta/recipes-devtools/python/python3-referencing_0.33.0.bb index 5b50932264..f675bbc67d 100644 --- a/meta/recipes-devtools/python/python3-referencing_0.33.0.bb +++ b/meta/recipes-devtools/python/python3-referencing_0.33.0.bb @@ -7,7 +7,7 @@ SRC_URI[sha256sum] = "c775fedf74bc0f9189c2a3be1c12fd03e8c23f4d371dce795df44e06c5 inherit pypi python_hatchling -DEPENDS += "${PYTHON_PN}-hatch-vcs-native" +DEPENDS += "python3-hatch-vcs-native" RDEPENDS:${PN} += "python3-rpds-py" -- 2.44.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#198145): https://lists.openembedded.org/g/openembedded-core/message/198145 Mute This Topic: https://lists.openembedded.org/mt/105470302/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/2] python3-jsonschema-specifications: drop ${PYTHON_PN}
python 2 is gone and we don't need the abstraction now, drop the remaining usage of this variable. Signed-off-by: Justin Bronder --- .../python/python3-jsonschema-specifications_2023.12.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-jsonschema-specifications_2023.12.1.bb b/meta/recipes-devtools/python/python3-jsonschema-specifications_2023.12.1.bb index eb63509fce..4ee0dd9b12 100644 --- a/meta/recipes-devtools/python/python3-jsonschema-specifications_2023.12.1.bb +++ b/meta/recipes-devtools/python/python3-jsonschema-specifications_2023.12.1.bb @@ -11,6 +11,6 @@ inherit pypi python_hatchling PYPI_PACKAGE = "jsonschema_specifications" -DEPENDS += "${PYTHON_PN}-hatch-vcs-native" +DEPENDS += "python3-hatch-vcs-native" BBCLASSEXTEND = "native nativesdk" -- 2.44.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#198144): https://lists.openembedded.org/g/openembedded-core/message/198144 Mute This Topic: https://lists.openembedded.org/mt/105470301/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 0/2] Clear remaining ${PYTHON_PN} uses
Removing a couple of remaining ${PYTHON_PN} uses that were missed in the prior scrubs. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#198143): https://lists.openembedded.org/g/openembedded-core/message/198143 Mute This Topic: https://lists.openembedded.org/mt/105470299/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] pulseaudio: conditionally depend on alsa-plugins-pulseaudio-conf
The alsa-plugins-pulseaudio-conf package is only enabled when DISTRO_FEATURES contains pulseaudio. Signed-off-by: Justin Bronder --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index a69dd32bd7f..821ce7d1df2 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -254,7 +254,7 @@ RDEPENDS:pulseaudio-server = " \ # If the server is installed, it's usually desirable to make ALSA applications # use PulseAudio. alsa-plugins-pulseaudio-conf will install the configuration # that makes the PulseAudio plugin the default ALSA device. -RDEPENDS:pulseaudio-server += "alsa-plugins-pulseaudio-conf" +RDEPENDS:pulseaudio-server += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'alsa-plugins-pulseaudio-conf', '', d)}" # pulseaudio-module-console-kit is built whenever dbus is enabled by PACKAGECONFIG # but consolekit depends on libx11 and is available only for DISTRO with x11 in DISTRO_FEATURES -- 2.35.3 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164931): https://lists.openembedded.org/g/openembedded-core/message/164931 Mute This Topic: https://lists.openembedded.org/mt/90743746/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] initramfs-framework: unmount automounts before switch_root
If mounts are left lingering, then after we switch_root, attempts to modify the block devices will result in an EBUSY with no way to unmount them. As we're about to switch_root anyways, there isn't much use to keep anything mounted unless it has the new rootfs. Signed-off-by: Justin Bronder --- .../initrdscripts/initramfs-framework/finish | 12 1 file changed, 12 insertions(+) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/finish b/meta/recipes-core/initrdscripts/initramfs-framework/finish index 717383ebac8..f08a9208675 100755 --- a/meta/recipes-core/initrdscripts/initramfs-framework/finish +++ b/meta/recipes-core/initrdscripts/initramfs-framework/finish @@ -12,6 +12,18 @@ finish_run() { fatal "ERROR: There's no '/dev' on rootfs." fi + # Unmount anything that was automounted by busybox via mdev-mount.sh. + # We're about to switch_root, and leaving anything mounted will prevent + # the next rootfs from modifying the block device. Ignore ROOT_DISK, + # if it was set by setup-live, because it'll be mounted over loopback + # to ROOTFS_DIR. + local dev + for dev in /run/media/*; do + if mountpoint -q "${dev}" && [ "${dev##*/}" != "${ROOT_DISK}" ]; then + umount -f "${dev}" || debug "Failed to unmount ${dev}" + fi + done + info "Switching root to '$ROOTFS_DIR'..." debug "Moving /dev, /proc and /sys onto rootfs..." -- 2.35.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161628): https://lists.openembedded.org/g/openembedded-core/message/161628 Mute This Topic: https://lists.openembedded.org/mt/89054790/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] Correct way to set DRIDRIVERS and GALLIUMDRIVERS from mesa bbappend
On 01/12/21 16:43 +, Mike Crowe via lists.openembedded.org wrote: > I'm building for a specific chip and therefore don't wish to waste time and > electricity building and disk space on the target installing unwanted mesa > drivers. However, mesa.inc contains: > > GALLIUMDRIVERS = "swrast" > GALLIUMDRIVERS:x86-x32 = "" > GALLIUMDRIVERS:append:x86:class-target = ",i915,iris,crocus" > GALLIUMDRIVERS:append:x86-64:class-target = ",i915,iris,crocus" > > and mesa_21.3.0.bb contains: > > DRIDRIVERS ??= "" > DRIDRIVERS:append:x86:class-target = ",r100,r200,nouveau,i965" > DRIDRIVERS:append:x86-64:class-target = ",r100,r200,nouveau,i965" > > I'm unable to find a way to override these values. Using (for example): You can use an anonymous python function which runs after parsing. https://www.yoctoproject.org/docs/current/mega-manual/mega-manual.html#anonymous-python-functions python __anonymous () { d.setVar("DRIDRIVERS", "i965") } -- Justin Bronder -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159057): https://lists.openembedded.org/g/openembedded-core/message/159057 Mute This Topic: https://lists.openembedded.org/mt/87432435/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] hidapi: add rdep on glibc-gconv-utf-16
My apologies, this should have been sent to openembedded-de...@lists.openembedded.org. On 30/08/21 10:59 -0400, Justin Bronder wrote: > libhidapi-libusb needs to convert from UTF-16LE to WCHAR_T in order to > read various libusb string descriptors. > > Signed-off-by: Justin Bronder > --- > meta-oe/recipes-support/hidapi/hidapi_git.bb | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta-oe/recipes-support/hidapi/hidapi_git.bb > b/meta-oe/recipes-support/hidapi/hidapi_git.bb > index 76f5dc762..e45445073 100644 > --- a/meta-oe/recipes-support/hidapi/hidapi_git.bb > +++ b/meta-oe/recipes-support/hidapi/hidapi_git.bb > @@ -7,6 +7,7 @@ LICENSE = "BSD-3-Clause | GPLv3" > LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077" > > DEPENDS = "libusb udev" > +RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" > > inherit autotools pkgconfig > > -- > 2.33.0 > > > > -- Justin Bronder -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155494): https://lists.openembedded.org/g/openembedded-core/message/155494 Mute This Topic: https://lists.openembedded.org/mt/85256427/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [meta-oe][PATCH v2] hidapi: add rdep on glibc-gconv-utf-16
libhidapi-libusb needs to convert from UTF-16LE to WCHAR_T in order to read various libusb string descriptors. Signed-off-by: Justin Bronder --- meta-oe/recipes-support/hidapi/hidapi_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-oe/recipes-support/hidapi/hidapi_git.bb index 76f5dc762..e45445073 100644 --- a/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-oe/recipes-support/hidapi/hidapi_git.bb @@ -7,6 +7,7 @@ LICENSE = "BSD-3-Clause | GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077" DEPENDS = "libusb udev" +RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" inherit autotools pkgconfig -- 2.33.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155490): https://lists.openembedded.org/g/openembedded-core/message/155490 Mute This Topic: https://lists.openembedded.org/mt/85252569/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [meta-oe][PATCH] hidapi: add rdep on glibc-gconv-utf-16
libhidapi-libusb needs to convert from UTF-16LE to WCHAR_T in order to read various libusb string descriptors. Signed-off-by: Justin Bronder --- meta-oe/recipes-support/hidapi/hidapi_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-oe/recipes-support/hidapi/hidapi_git.bb index 76f5dc762..54b794774 100644 --- a/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-oe/recipes-support/hidapi/hidapi_git.bb @@ -7,6 +7,7 @@ LICENSE = "BSD-3-Clause | GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077" DEPENDS = "libusb udev" +RDEPENDS_${PN} += "glibc-gconv-utf-16" inherit autotools pkgconfig -- 2.33.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155330): https://lists.openembedded.org/g/openembedded-core/message/155330 Mute This Topic: https://lists.openembedded.org/mt/85147825/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] populate_sdk_ext: copy BBMULTICONFIG files
As the generated local.conf includes BBMULTICONFIG, the referenced files in conf/multiconfig also need to be copied. Otherwise with BBMULTICONFIG="abc" for instance, building the esdk fails with: ERROR: ParseError at tmp/build-glibc/work/qemux86_64-oe-linux/core-image-ssh/1.0-r0/sdk-ext/image/tmp-renamed-sdk/layers/openembedded-core/meta/conf/bitbake.conf:767: Could not include required file conf/multiconfig/abc.conf Signed-off-by: Justin Bronder --- meta/classes/populate_sdk_ext.bbclass | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index fe840d9cfb..517b4e45ff 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -397,6 +397,14 @@ python copy_buildsystem () { f.write('require conf/locked-sigs.inc\n') f.write('require conf/unlocked-sigs.inc\n') +# Copy multiple configurations if they exist in the users config directory +if d.getVar('BBMULTICONFIG') is not None: +bb.utils.mkdirhier(os.path.join(baseoutpath, 'conf', 'multiconfig')) +for mc in d.getVar('BBMULTICONFIG').split(): +dest_stub = "/conf/multiconfig/%s.conf" % (mc,) +if os.path.exists(builddir + dest_stub): +shutil.copyfile(builddir + dest_stub, baseoutpath + dest_stub) + if os.path.exists(builddir + '/cache/bb_unihashes.dat'): bb.parse.siggen.save_unitaskhashes() bb.utils.mkdirhier(os.path.join(baseoutpath, 'cache')) @@ -556,6 +564,9 @@ python copy_buildsystem () { # sdk_ext_postinst() below) thus the checksum we take here would always # be different. manifest_file_list = ['conf/*'] +if d.getVar('BBMULTICONFIG') is not None: +manifest_file_list.append('conf/multiconfig/*') + esdk_manifest_excludes = (d.getVar('ESDK_MANIFEST_EXCLUDES') or '').split() esdk_manifest_excludes_list = [] for exclude_item in esdk_manifest_excludes: @@ -564,7 +575,7 @@ python copy_buildsystem () { with open(manifest_file, 'w') as f: for item in manifest_file_list: for fn in glob.glob(os.path.join(baseoutpath, item)): -if fn == manifest_file: +if fn == manifest_file or os.path.isdir(fn): continue if fn in esdk_manifest_excludes_list: continue -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#153154): https://lists.openembedded.org/g/openembedded-core/message/153154 Mute This Topic: https://lists.openembedded.org/mt/83694908/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] populate_sdk_ext: copy BBMULTICONFIG files
As the generated local.conf includes BBMULTICONFIG, the referenced files in conf/multiconfig also need to be copied. Otherwise with BBMULTICONFIG="abc" for instance, building the esdk fails with: ERROR: ParseError at tmp/build-glibc/work/qemux86_64-oe-linux/core-image-ssh/1.0-r0/sdk-ext/image/tmp-renamed-sdk/layers/openembedded-core/meta/conf/bitbake.conf:767: Could not include required file conf/multiconfig/abc.conf Signed-off-by: Justin Bronder --- meta/classes/populate_sdk_ext.bbclass | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index fe840d9cfb..71f601fa9b 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -397,6 +397,13 @@ python copy_buildsystem () { f.write('require conf/locked-sigs.inc\n') f.write('require conf/unlocked-sigs.inc\n') +# Copy multiple configurations if they exist +if d.getVar('BBMULTICONFIG') is not None: +bb.utils.mkdirhier(os.path.join(baseoutpath, 'conf', 'multiconfig')) +for mc in d.getVar('BBMULTICONFIG').split(): +dest_stub = "/conf/multiconfig/%s.conf" % (mc,) +shutil.copyfile(builddir + dest_stub, baseoutpath + dest_stub) + if os.path.exists(builddir + '/cache/bb_unihashes.dat'): bb.parse.siggen.save_unitaskhashes() bb.utils.mkdirhier(os.path.join(baseoutpath, 'cache')) @@ -556,6 +563,9 @@ python copy_buildsystem () { # sdk_ext_postinst() below) thus the checksum we take here would always # be different. manifest_file_list = ['conf/*'] +if d.getVar('BBMULTICONFIG') is not None: +manifest_file_list.append('conf/multiconfig/*') + esdk_manifest_excludes = (d.getVar('ESDK_MANIFEST_EXCLUDES') or '').split() esdk_manifest_excludes_list = [] for exclude_item in esdk_manifest_excludes: @@ -564,7 +574,7 @@ python copy_buildsystem () { with open(manifest_file, 'w') as f: for item in manifest_file_list: for fn in glob.glob(os.path.join(baseoutpath, item)): -if fn == manifest_file: +if fn == manifest_file or os.path.isdir(fn): continue if fn in esdk_manifest_excludes_list: continue -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#153036): https://lists.openembedded.org/g/openembedded-core/message/153036 Mute This Topic: https://lists.openembedded.org/mt/83589859/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] ccache: update to 3.4.1
On 02/03/18 19:14 -0800, Khem Raj wrote: > On 3/2/18 2:09 PM, Justin Bronder wrote: > > https://ccache.samba.org/releasenotes.html#_ccache_3_4_1 > > > > License-Update: copyright years and file paths updated > > > > Signed-off-by: Justin Bronder <jsbron...@cold-front.org> > > --- > > meta/recipes-devtools/ccache/ccache_3.3.5.bb | 12 > > meta/recipes-devtools/ccache/ccache_3.4.1.bb | 12 > > 2 files changed, 12 insertions(+), 12 deletions(-) > > delete mode 100644 meta/recipes-devtools/ccache/ccache_3.3.5.bb > > create mode 100644 meta/recipes-devtools/ccache/ccache_3.4.1.bb > > > > diff --git a/meta/recipes-devtools/ccache/ccache_3.3.5.bb > > b/meta/recipes-devtools/ccache/ccache_3.3.5.bb > > deleted file mode 100644 > > index 929f0f1276..00 > > --- a/meta/recipes-devtools/ccache/ccache_3.3.5.bb > > +++ /dev/null > > @@ -1,12 +0,0 @@ > > -require ccache.inc > > - > > -LICENSE = "GPLv3+" > > -LIC_FILES_CHKSUM = > > "file://LICENSE.txt;md5=dae379a85bb6e9d594773e0aa64876f6" > > - > > -SRC_URI[md5sum] = "eee58db7cce892febddb989308dc568f" > > -SRC_URI[sha256sum] = > > "190576a6e938760ec8113523e6fd380141117303e90766cc4802e770422b30c6" > > - > > -SRC_URI += " \ > > -file://0002-dev.mk.in-fix-file-name-too-long.patch \ > > - > > file://Revert-Create-man-page-in-the-make-install-from-git-.patch \ > > -" > > diff --git a/meta/recipes-devtools/ccache/ccache_3.4.1.bb > > b/meta/recipes-devtools/ccache/ccache_3.4.1.bb > > new file mode 100644 > > index 00..e3bf74e9c6 > > --- /dev/null > > +++ b/meta/recipes-devtools/ccache/ccache_3.4.1.bb > > @@ -0,0 +1,12 @@ > > +require ccache.inc > > + > > +LICENSE = "GPLv3+" > > +LIC_FILES_CHKSUM = > > "file://LICENSE.txt;md5=4fa0d99234a05c3a32d380379d5d064a" > > > it seems checksum changed. So please add a short description what > changed in license terms. Was the included License-Update tag not enough? It really is just an update to the years and dealing with some files moving around in the repo. > > Secondly, please use options to detect renames to git format-patch so we > can get better diffs for review > > you can make this default behaviour by adding > > [diff] > renames = copies > > to ~/.gitconfig Thanks, will do. -- Justin Bronder -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ccache: update to 3.4.1
On 02/03/18 17:06 -0500, Denys Dmytriyenko wrote: > On Fri, Mar 02, 2018 at 04:58:17PM -0500, Justin Bronder wrote: > > https://ccache.samba.org/releasenotes.html#_ccache_3_4_1 > > > > License-Update: copyright years and file paths updated > > > > Signed-off-by: Justin Bronder <jsbron...@cold-front.org> > > --- > > meta/recipes-devtools/ccache/ccache_3.3.4.bb | 12 > > meta/recipes-devtools/ccache/ccache_3.4.1.bb | 12 > > Please use -C/-M (--find-copies/--find-renames) flags to simplify review. Sorry, I will do so in the future. Note that I did just send a v2 fixing the patchtest failure prior to seeing this email. -- Justin Bronder -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] ccache: update to 3.4.1
https://ccache.samba.org/releasenotes.html#_ccache_3_4_1 License-Update: copyright years and file paths updated Signed-off-by: Justin Bronder <jsbron...@cold-front.org> --- meta/recipes-devtools/ccache/ccache_3.3.5.bb | 12 meta/recipes-devtools/ccache/ccache_3.4.1.bb | 12 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 meta/recipes-devtools/ccache/ccache_3.3.5.bb create mode 100644 meta/recipes-devtools/ccache/ccache_3.4.1.bb diff --git a/meta/recipes-devtools/ccache/ccache_3.3.5.bb b/meta/recipes-devtools/ccache/ccache_3.3.5.bb deleted file mode 100644 index 929f0f1276..00 --- a/meta/recipes-devtools/ccache/ccache_3.3.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ccache.inc - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=dae379a85bb6e9d594773e0aa64876f6" - -SRC_URI[md5sum] = "eee58db7cce892febddb989308dc568f" -SRC_URI[sha256sum] = "190576a6e938760ec8113523e6fd380141117303e90766cc4802e770422b30c6" - -SRC_URI += " \ -file://0002-dev.mk.in-fix-file-name-too-long.patch \ -file://Revert-Create-man-page-in-the-make-install-from-git-.patch \ -" diff --git a/meta/recipes-devtools/ccache/ccache_3.4.1.bb b/meta/recipes-devtools/ccache/ccache_3.4.1.bb new file mode 100644 index 00..e3bf74e9c6 --- /dev/null +++ b/meta/recipes-devtools/ccache/ccache_3.4.1.bb @@ -0,0 +1,12 @@ +require ccache.inc + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fa0d99234a05c3a32d380379d5d064a" + +SRC_URI[md5sum] = "39492aea565c3e6d5affa633672a93bd" +SRC_URI[sha256sum] = "8c2e260d4245e362552e47bec359941210a96419ac5adf582046ceb92489f7de" + +SRC_URI += " \ +file://0002-dev.mk.in-fix-file-name-too-long.patch \ +file://Revert-Create-man-page-in-the-make-install-from-git-.patch \ +" -- 2.13.6 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ccache: update to 3.4.1
https://ccache.samba.org/releasenotes.html#_ccache_3_4_1 License-Update: copyright years and file paths updated Signed-off-by: Justin Bronder <jsbron...@cold-front.org> --- meta/recipes-devtools/ccache/ccache_3.3.4.bb | 12 meta/recipes-devtools/ccache/ccache_3.4.1.bb | 12 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 meta/recipes-devtools/ccache/ccache_3.3.4.bb create mode 100644 meta/recipes-devtools/ccache/ccache_3.4.1.bb diff --git a/meta/recipes-devtools/ccache/ccache_3.3.4.bb b/meta/recipes-devtools/ccache/ccache_3.3.4.bb deleted file mode 100644 index 1e535b1923..00 --- a/meta/recipes-devtools/ccache/ccache_3.3.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ccache.inc - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7fe21f9470f2305e95e7d8a632255079" - -SRC_URI[md5sum] = "95ab3c56284129cc2a32460c23069516" -SRC_URI[sha256sum] = "24f15bf389e38c41548c9c259532187774ec0cb9686c3497bbb75504c8dc404f" - -SRC_URI += " \ -file://0002-dev.mk.in-fix-file-name-too-long.patch \ -file://Revert-Create-man-page-in-the-make-install-from-git-.patch \ -" diff --git a/meta/recipes-devtools/ccache/ccache_3.4.1.bb b/meta/recipes-devtools/ccache/ccache_3.4.1.bb new file mode 100644 index 00..e3bf74e9c6 --- /dev/null +++ b/meta/recipes-devtools/ccache/ccache_3.4.1.bb @@ -0,0 +1,12 @@ +require ccache.inc + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fa0d99234a05c3a32d380379d5d064a" + +SRC_URI[md5sum] = "39492aea565c3e6d5affa633672a93bd" +SRC_URI[sha256sum] = "8c2e260d4245e362552e47bec359941210a96419ac5adf582046ceb92489f7de" + +SRC_URI += " \ +file://0002-dev.mk.in-fix-file-name-too-long.patch \ +file://Revert-Create-man-page-in-the-make-install-from-git-.patch \ +" -- 2.13.6 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] kernel: module: module-base: depend on elfutils-native
On 20/02/18 12:06 -0500, Bruce Ashfield wrote: > On Tue, Feb 20, 2018 at 11:41 AM, Justin Bronder > <jsbron...@cold-front.org> wrote: > > libelf is required for CONFIG_STACK_VALIDATION which is required by > > CONFIG_UNWINDER_ORC (the default in 4.14+). > > As you'll see in the discussion about adding bison-native, we don't want to > add > these version specific dependencies globally. I was watching but didn't see a definitive conclusion in that thread yet. Ignoring out of tree modules, I suppose it is pretty trivial to just add the extra DEPENDS to the kernel recipe for a while until they're required by all supported kernel versions. However, for out of tree modules, it's a bit more of a burden to add it for every recipe. Is that the suggested way forward to deal with this or is there a better method? > > > > > We also need to update the module classes to pass HOSTCC and HOSTCPP > > This is already covered in my v3 "make-modules-script" changes. That does cover the patch to module-base.bbclass, but it's missing the addition to EXTRA_OEMAKE in module.bbclass which is still needed in order to be able to find elfutils-native if I add it to the DEPENDS of the module. > > Bruce > > > just like the kernel class already does. Otherwise the test for libelf > > in the kernel Makefile fails. > > --- > > meta/classes/kernel.bbclass | 2 +- > > meta/classes/module-base.bbclass | 1 + > > meta/classes/module.bbclass | 4 +++- > > 3 files changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > > index 5cdff581ef..d3a7e1e1cb 100644 > > --- a/meta/classes/kernel.bbclass > > +++ b/meta/classes/kernel.bbclass > > @@ -4,7 +4,7 @@ KERNEL_PACKAGE_NAME ??= "kernel" > > KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == > > "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }" > > > > PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == > > "kernel") else "" }" > > -DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc > > kmod-native bc-native lzop-native" > > +DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc > > kmod-native bc-native lzop-native elfutils-native" > > PACKAGE_WRITE_DEPS += "depmodwrapper-cross" > > > > do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot" > > diff --git a/meta/classes/module-base.bbclass > > b/meta/classes/module-base.bbclass > > index f851b85163..3b56e04534 100644 > > --- a/meta/classes/module-base.bbclass > > +++ b/meta/classes/module-base.bbclass > > @@ -23,5 +23,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" > > do_make_scripts() { > > unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS > > make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ > > + HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" > > HOSTCPP="${BUILD_CPP}" \ > >-C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} > > scripts > > } > > diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass > > index 78d1b21dbd..89dee2dae8 100644 > > --- a/meta/classes/module.bbclass > > +++ b/meta/classes/module.bbclass > > @@ -1,10 +1,12 @@ > > inherit module-base kernel-module-split pkgconfig > > > > +DEPENDS += "elfutils-native" > > + > > addtask make_scripts after do_prepare_recipe_sysroot before do_configure > > do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" > > do_make_scripts[depends] += "virtual/kernel:do_shared_workdir" > > > > -EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" > > +EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR} HOSTCC="${BUILD_CC} > > ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}"" > > > > MODULES_INSTALL_TARGET ?= "modules_install" > > MODULES_MODULE_SYMVERS_LOCATION ?= "" > > -- > > 2.13.6 > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > -- > "Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end" -- Justin Bronder -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel: module: module-base: depend on elfutils-native
libelf is required for CONFIG_STACK_VALIDATION which is required by CONFIG_UNWINDER_ORC (the default in 4.14+). We also need to update the module classes to pass HOSTCC and HOSTCPP just like the kernel class already does. Otherwise the test for libelf in the kernel Makefile fails. --- meta/classes/kernel.bbclass | 2 +- meta/classes/module-base.bbclass | 1 + meta/classes/module.bbclass | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 5cdff581ef..d3a7e1e1cb 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -4,7 +4,7 @@ KERNEL_PACKAGE_NAME ??= "kernel" KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }" PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }" -DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native" +DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native elfutils-native" PACKAGE_WRITE_DEPS += "depmodwrapper-cross" do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot" diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass index f851b85163..3b56e04534 100644 --- a/meta/classes/module-base.bbclass +++ b/meta/classes/module-base.bbclass @@ -23,5 +23,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" do_make_scripts() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ + HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" \ -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts } diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index 78d1b21dbd..89dee2dae8 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass @@ -1,10 +1,12 @@ inherit module-base kernel-module-split pkgconfig +DEPENDS += "elfutils-native" + addtask make_scripts after do_prepare_recipe_sysroot before do_configure do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" do_make_scripts[depends] += "virtual/kernel:do_shared_workdir" -EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" +EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR} HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}"" MODULES_INSTALL_TARGET ?= "modules_install" MODULES_MODULE_SYMVERS_LOCATION ?= "" -- 2.13.6 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rxvt-unicode: add missing pkgconfig
The configure script uses pkg-config in RXVT_CHECK_MODULES and falls back to disabling features that were enabled in EXTRA_OECONF if pkg-config isn't found. Signed-off-by: Justin Bronder <jsbron...@cold-front.org> --- meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index 4d5daa661c..b568f04580 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -12,7 +12,7 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 file://rxvt.desktop \ file://rxvt.png" -inherit autotools update-alternatives +inherit autotools pkgconfig update-alternatives PROVIDES = "virtual/x-terminal-emulator" ALTERNATIVE_${PN} = "x-terminal-emulator" -- 2.13.6 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel: add objtool to shared workdir
With CONFIG_UNWINDER_ORC (the default in 4.14), objtool is required for out-of-tree modules to be able to generate object files. For instance, meta-skeleton/hello-mod fails with: | make[3]: *** No rule to make target 'tools/objtool/objtool', needed by ... Signed-off-by: Justin Bronder <jsbron...@cold-front.org> --- meta/classes/kernel.bbclass | 7 +++ 1 file changed, 7 insertions(+) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 943938df0e..5cdff581ef 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -479,6 +479,13 @@ do_shared_workdir () { mkdir -p $kerneldir/arch/${ARCH}/include/generated/ cp -fR arch/${ARCH}/include/generated/* $kerneldir/arch/${ARCH}/include/generated/ fi + + # With CONFIG_UNWINDER_ORC (the default in 4.14), objtool is required for + # out-of-tree modules to be able to generate object files. + if [ -x tools/objtool/objtool ]; then + mkdir -p ${kerneldir}/tools/objtool + cp tools/objtool/objtool ${kerneldir}/tools/objtool/ + fi } # We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware -- 2.13.6 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel-yocto: check git config during checkout
Initialize the git config prior creating a git repository in a plain directory. Signed-off-by: Justin Bronder <jsbron...@cold-front.org> --- meta/classes/kernel-yocto.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 60979a218f..0eb631cfb1 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -247,6 +247,7 @@ do_kernel_checkout() { fi rm -f .gitignore git init + check_git_config git add . git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" git clean -d -f -- 2.13.6 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] kernel-yocto: create dummy git user if necessary
On 09/02/18 15:27 -0500, Bruce Ashfield wrote: > On Fri, Feb 9, 2018 at 2:53 PM, Justin Bronder <jsbron...@cold-front.org> > wrote: > > The user's global git configuration may not have the name and email set > > and git autodetection can fail. The initialization commit for a non-git > > kernel directory doesn't really need to be tied back to them anyways. > > Instead, create a user and email that's clearly tied back to > > kernel-yocto.bbclass. > > > > Signed-off-by: Justin Bronder <jsbron...@cold-front.org> > > --- > > meta/classes/kernel-yocto.bbclass | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/meta/classes/kernel-yocto.bbclass > > b/meta/classes/kernel-yocto.bbclass > > index 60979a218f..dbf01f86b6 100644 > > --- a/meta/classes/kernel-yocto.bbclass > > +++ b/meta/classes/kernel-yocto.bbclass > > @@ -247,6 +247,8 @@ do_kernel_checkout() { > > fi > > rm -f .gitignore > > git init > > + git config user.name 'Yocto Kernel Git Initializer' > > + git config user.email 'kernel-yocto.bbclass@invalid' > > > This is already handled in the utility classes via the > check_git_config routine and it is called in > kernel-yocto's do_patch routine. > > If it is needed earlier (as it appears it is), move that call to > do_kernel_checkout. Ah, didn't see that. Thanks. I'll send a new patch shortly. -- Justin Bronder -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel-yocto: create dummy git user if necessary
The user's global git configuration may not have the name and email set and git autodetection can fail. The initialization commit for a non-git kernel directory doesn't really need to be tied back to them anyways. Instead, create a user and email that's clearly tied back to kernel-yocto.bbclass. Signed-off-by: Justin Bronder <jsbron...@cold-front.org> --- meta/classes/kernel-yocto.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 60979a218f..dbf01f86b6 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -247,6 +247,8 @@ do_kernel_checkout() { fi rm -f .gitignore git init + git config user.name 'Yocto Kernel Git Initializer' + git config user.email 'kernel-yocto.bbclass@invalid' git add . git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" git clean -d -f -- 2.13.6 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core