Skip to content

Commit

Permalink
Merge pull request #896 from YoeDistro/kraj/master
Browse files Browse the repository at this point in the history
Yoe Specific fixes
  • Loading branch information
cbrake authored Jan 30, 2024
2 parents e98225a + c2c4535 commit adc845f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
5 changes: 5 additions & 0 deletions envsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ PROXYHOST=""
YOE_ENV_VERSION=13
YOE_ENV_FILE=localconfig.sh

[ -n "`git config user.email`" ] && GIT_USER_EMAIL="$(git config user.email)" || GIT_USER_EMAIL="yoe@yoedistro"
[ -n "`git config user.name`" ] && GIT_USER_NAME="$(git config user.name)" || GIT_USER_NAME="Yoe User"
# Workaround for differences between yocto bitbake and vanilla bitbake
export BBFETCH2=True

Expand Down Expand Up @@ -299,6 +301,9 @@ TMPDIR = "${OE_BUILD_TMPDIR}"
#HTTP_PROXY = "http://${PROXYHOST}:${PROXYPORT}/"
MACHINE ?= "$MACHINE"
PATCH_GIT_USER_NAME = "${GIT_USER_NAME}"
PATCH_GIT_USER_EMAIL = "${GIT_USER_EMAIL}"
_EOF

echo "${AUTO_CONF} has been updated"
Expand Down
2 changes: 2 additions & 0 deletions sources/meta-yoe/conf/distro/yoe.inc
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ DISTRO_FEATURES:remove:riscv32 = "ld-is-lld"
# See https://discourse.llvm.org/t/lld-cannot-make-pie-binaries-on-x32/67131
DISTRO_FEATURES:remove:linux-gnux32 = "ld-is-lld"
DISTRO_FEATURES:remove:linux-muslx32 = "ld-is-lld"
# mips-yoe-linux-ld.lld: error: the .gnu.hash section is not compatible with the MIPS target
DISTRO_FEATURES:remove:mipsarcho32 = "ld-is-lld"

#PREFERRED_PROVIDER_pkgconfig = "pkgconf"
#PREFERRED_PROVIDER_pkgconfig-native = "pkgconf-native"
Expand Down
2 changes: 2 additions & 0 deletions sources/meta-yoe/recipes-core/images/yoe-simple-image.bb
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ IMAGE_INSTALL = "\
"

IMAGE_INSTALL:append:libc-musl = " gcompat"
# Add pregenerated ssh keys for improving first time bootup speed
IMAGE_INSTALL:append:qemuall = " ssh-pregen-hostkeys"

export IMAGE_BASENAME = "yoe-simple-image"

Expand Down

0 comments on commit adc845f

Please sign in to comment.