Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

enable usrmerge #13

Closed
wants to merge 2 commits into from
Closed

enable usrmerge #13

wants to merge 2 commits into from

Conversation

@avalluri
Copy link
Contributor

@avalluri avalluri commented Feb 10, 2017

Just a test build to test usrmerge oe-core chagnes, do not merge.

@avalluri avalluri force-pushed the usrmerge branch 5 times, most recently from 65d5a7b to dd1e0d3 Compare February 13, 2017 09:54
@mythi
Copy link
Contributor

mythi commented Feb 22, 2017

@avalluri baf1c31 and d7f6292 are needed for refkit so I'd propose this PR is rebased and modified to keep those two so that we can prepare for the usrmerge DISTRO_FEATURE.

@avalluri
Copy link
Contributor Author

avalluri commented Feb 22, 2017

@mythi baf1c31 can be dropped as per my new proposed oe-core change (avalluri/openembedded-core@69193ed) where these links are prepared in image.bbclass.

@okartau
Copy link
Contributor

okartau commented Feb 23, 2017

test this please

@avalluri avalluri force-pushed the usrmerge branch 2 times, most recently from ef9f8a9 to 4204437 Compare March 1, 2017 09:59
@avalluri
Copy link
Contributor Author

avalluri commented Mar 1, 2017

test this please

@avalluri avalluri force-pushed the usrmerge branch 3 times, most recently from 637307e to fdf4ddf Compare March 29, 2017 13:12
@mythi
Copy link
Contributor

mythi commented Mar 31, 2017

test this please

@skuusela
Copy link
Contributor

skuusela commented Mar 31, 2017 •
edited
Loading

I manually tested the image generated by this PR earlier this week and there is a kernel panic with it. You can also see it in the Jenkins build artifacts in test_serial.XXXX.log

@avalluri
Copy link
Contributor Author

avalluri commented Mar 31, 2017

@skuusela thanks, i will check that.

@avalluri
Copy link
Contributor Author

avalluri commented Mar 31, 2017

Yep, i can guess the reason for kernel panic, we should re-introduce baf1c31 , which creates the base links in initramfs image. @skuusela Thanks again for your efforts

@mythi mythi removed the test-build label Apr 4, 2017
@mythi mythi changed the title test merged /usr chagnes enable usrmerge Apr 4, 2017
@mythi
Copy link
Contributor

mythi commented Apr 13, 2017

@avalluri did you have a change to check the gobject-instrospection-data with Jussi?

@avalluri
Copy link
Contributor Author

avalluri commented Apr 13, 2017

Jussi couldn't get time to check this issue, as he was busy with other tasks. I did couple of failed attempts to alter corss.bbclass without DISTRO_FEATURES check.

pohly added a commit to pohly/intel-iot-refkit that referenced this pull request Apr 26, 2017
@pohly
Merge pull request intel#13 from nagineni/iotivity-node-version
5e8cdcb 
iotivity-node: rename the recipe to explicitly indicate version.
@avalluri
Copy link
Contributor Author

avalluri commented May 5, 2017

@mikko, submitted the patch to oe-core to fix the gobject-introspection-data failure in usrmerge case: https://patchwork.openembedded.org/patch/139629/

@refkit-ci
Copy link

refkit-ci commented May 26, 2017

Can one of the admins verify this patch?

avalluri added 2 commits June 6, 2017 13:51
@avalluri
refkit-distro: bitbake configuration changes to support usrmerge
f2996a9 
Flatpack based refkit application framework demands merging of root
folders(/bin, /sbin, /lib*) to their /usr counterparts. This requires the
changes to default bitbake configuration to point all base_{lib,bin,sbin}dir
variables to /usr.

Upstream patches put on hold:
  http://lists.openembedded.org/pipermail/openembedded-core/2017-February/133169.html
  http://lists.openembedded.org/pipermail/openembedded-core/2017-February/133170.html

Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
@avalluri
refkit-image, refkit-initramfs: Create symlinks needed for usrmerge
28d5f0a 
Prepare the root symlinks required for runtime at the time of rootfs creation.
The assumption is that in usrmerged distro, no package installs files in
/bin,/sbin and /lib* folders.

Upstream Patches:
  http://lists.openembedded.org/pipermail/openembedded-core/2017-February/133166.html

Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
@mythi
Copy link
Contributor

mythi commented Jun 16, 2017

part of #188

@mythi mythi closed this Jun 16, 2017
refkit-ci pushed a commit that referenced this pull request Aug 11, 2017
Refkit CI: pull in the latest changes
d4d5ad8 
* bitbake 2d0203f...923d556 (15):
  > main: Handle BB_SERVER_TIMEOUT = -1 for no server timeout
  > process: Fix disconnect when BB_SERVER_TIMEOUT
  > main: Remove unneeded float()
  > Revert "tinfoil: fix duplication of log messages"
  > daemonize: Always print any remaning UI events at exit
  > cooker: Ensure all tasks are shown in task dependency tree
  > daemonize: clean up code
  > daemonize: Ensure child process exits safely
  > process: Add some extra server startup logs
  > process: Reorder server command processing and handle EOFError
  > wget: fix FusionForge workaround
  > toaster: move to new bitbake xmlrpc default
  > toaster: enable remote HTTP API for status aggregation
  > runqueue: Tweak debug message to make it more readable/diffable
  > fetch2: fix checkstatus fallback to MIRRORS

* meta-clang 625f4ef...771e486 (51):
  > clang/llvm: Update to latest on release_50
  > packagegroup-core-standalone-sdk-target: Fix a typo in packagename
  > clang/llvm/libcxx/libunwind: Update to latest on release_50
  > openmp: Provide libgomp
  > clang: Add -DLLVM_ENABLE_ASSERTIONS=OFF and -DLLVM_ENABLE_EXPENSIVE_CHECKS=OFF
  > clang/llvm: Update to latest on release_50
  > clang/llvm: Update to latest on release_50
  > clang/llvm: Get ghostscript ICE fixes
  > compiler-rt: Use final version string in install paths
  > llvm-libunwind: Delete
  > libcxx: Merge libcxxabi needs into libcxx
  > llvm: Update to latest release_5.0
  > recipes: Use ninja generator on top of cmake
  > clang: Update to latest on release_50
  > clang: Enable libffi support
  > libcxxabi: Delete arm EHABI workaound
  > clang: Default to PIE when GCCPIE is set
  > clang/llvm: Update to latest
  > clang,llvm,lld,libunwind: Update to 5.0 rc1
  > nonclangable: Remove klibc and klibc-static-utils
  > nonclangable: Add klibc to list
  > openmp: Add recipe
  > lld: update to latest on 5.0 branch
  > nonclangable: Dont error on Wimplicit-fallthrough in mdadm
  > nonclangable.conf: Add pixman
  > clang/llvm/lld: Updade to latest on release_50 branch
  > compiler-rt: Fix build on x86_64
  > clang.bbclass: Add -pie -fPIE to SECURITY_PIE_CFLAGS explicitly
  > lldb: Fix build QA errors
  > lldb: Fix package QA errors
  > libcxx: Do not include xlocale.h
  > compiler-rt: Fix build on aarch64
  > lldb: Switch to 5.0 branch
  > Switch to release_50 branch
  > clang: Add missing FILE
  > clang: Fix name of .so file
  > clang: Allow user to add extra build target on class_target
  > llvm-config: Fix implementation of --libs flag
  > lld_git: Only apply -stdlib flag to clang toolchain
  > clang.inc: Update SRCREVs to latest trunk
  > llvm/clang: Update all components to latest on 5.0/trunk
  > clang: Update to latest master
  > clang.bbclass: Add -Qunused-arguments to clang arguments
  > clang/llvm: Update to latest master
  > clang/llvm: Update to tip of master
  > clang/llvm: Move to upcoming 5.0.0 ( trunk ) release
  > systemd: Define nm,ar,ranlib from llvm when using clang
  > clang: Handle return the clang arch for arm correctly
  > clang: Fix get_clang_arch() to address OE target arch combos
  > clang: Change LLVM_TARGETS_TO_BUILD to build everything by default
  > clang/llvm: Upgrade to 4.0.1 release

* meta-intel fe6f23e...e87c179 (16):
  > Revert "iwlwifi_git.bb: run make_scripts earlier"
  > iwlwifi: Fix install_append for usrmerge
  > dpdk: Link examples with BFD linker
  > dpdk: Fix build with examples
  > qat16: Fix build when ld-is-gold is set in DISTRO_FEATURES
  > libyami: Rename the file to be checked with LIC_FILES_CHKSUM
  > disable_skylake_sound: Temp disable config for core2-32
  > linux-intel: Add linux-intel to files search path
  > linux-intel: Update SRCREV for 4.9.35
  > dpdk: upgrade to version 17.05
  > linux-intel: refactor and remove iwlwifi modules for out of tree enablement
  > intel-common-pkgarch: Add out of tree modules
  > iwlwifi_git.bb: run make_scripts earlier
  > iwlwifi: Clean-up and use module_install
  > iwlwifi: include iwlwifi OOT driver in meta-intel layer.
  > intel-microcode: Upgrade recipe version

* meta-intel-realsense 53e93ed...7468b0c (2):
  > glfw: Simplify package install stage
  > Merge pull request #13 from ipuustin/glfw-x11

* meta-security 89683b4...a80d07e (2):
  > xmlsec1: add new recipe
  > apparmor: Rework such that the utilities are functional by default

* meta-yocto 76dd79e...0966bf5 (2):
  > maintainers.inc: assign newly added recipes
  > poky-world-exclude.inc: remove recipes from meta-qt4

* openembedded-core a2ab288...df7f522 (50):
  > libinput: Upgrade 1.7.3 -> 1.8.1
  > checkpkg_exceptions: add LLVM
  > llvm: Raise SkipRecipe exception for unsupported architectures
  > mesa, llvm: Use native version of llvm-config
  > mesa: Depend on llvm-native
  > mesa: Use chrpath to delete rpaths
  > action: new bitbake-layer plugin to create a simple layer
  > scripts/oe-publish-sdk: use hook to call git update-server-info
  > devtool: sdk-update: fix pulling updates from git
  > package_manager: Fix support for NO_RECOMMENDATONS
  > gtk-icon-utils-native: 3.22.16 -> 3.22.17
  > gtk+3: 3.22.16 -> 3.22.17
  > x86-base.inc: enable live image type
  > chrpath: use https for SRC_URI
  > initramfs-framework/setup-live: remove superfluous break
  > automake: Add missing libtool tag for cppasm language
  > libpng: upgrade to 1.6.31
  > gettext.bbclass: also search for files in target sysroot
  > webkitgtk: Do not use -isystem forcibly
  > python3-pycairo: Pass -fPIC via CFLAGS
  > go: Remove -fPIE -pie from SECURITY_PIE_CFLAGS
  > kexec-tools: Remove -fPIE -pie from SECURITY_PIE_CFLAGS
  > libsdl: Pass --tag option to libtool invocation
  > libproxy: Remove PIE flags from SECURITY_PIE_CFLAGS
  > ossp-uuid, libffi, libgcrypt: Pass --tag=CC option to libtool
  > devtool: fix handling of errors during task execution
  > bitbake.conf: whitelist BB_SERVER_TIMEOUT from config hash
  > terminal: wait for terminal task to finish before procedding
  > Revert "cml1.bbclass: wait until menuconfig terminal finishes"
  > sstatetests: Use python function instead of bitbake-diffsigs script
  > diffstat: exclude aclocal
  > diffstat: use HTTP mirror for SRC_URI
  > qemux86 qemux86-64: Enable pci
  > librsvg: 2.40.17 -> 2.40.18
  > python: don't include -tests with modules
  > wic: improve generating disk system identifier
  > meta: drop do_bootdirectdisk do_vmimg references
  > autoconf-archive: GPLv3 + autoconf exception
  > re2c: fix build race
  > uninative: Allow a local own-mirror to work with uninative
  > mesa: Fix build when building with llvmpipe
  > llvm: Add recipe for 5.0
  > re2c: Transfer recipe from meta-oe and upgrade to 0.16
  > ninja: Add recipe
  > image: Make do_image_qa a dummy sstate task to match do_image_complete
  > image/rm_work: Promote do_image_complete to be more sstate like
  > image: Drop before do_build from do_rootfs and do_image
  > sstate: Improve SSTATE_SKIP_CREATION
  > rm_work: Improve handling for addto_recipe_sysroot
  > libpng: fix MIRRORS usage
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@avalluri @mythi @okartau @skuusela @refkit-ci