Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scripts/build: fix broken sym link after #3328 #3342

Merged
merged 7 commits into from Mar 6, 2019

Conversation

Projects
None yet
2 participants
@MilhouseVH
Copy link
Contributor

commented Feb 27, 2019

I don't know if anyone still builds mysql but this change is probably required when using the isolated sysroot.

Edit 1: This PR was initially prompted by code in mysql which will create a broken sym link. I subsequently discovered that open-vm-tools does something similar, but during make, so we have to fix that sym link during the transfer to the shared sysroot. The fix for open-vm-tools also fixes mysql so that change is now dropped.

Edit 2: So looking at mysql again, it's creating the broken sym link in $TOOLCHAIN/usr/bin so that still needs to be fixed, as the change to scripts/build can only fix sym links where the link is within the isolated sysroot. Easiest solution is to just copy the mysql file rather than create a sym link.

@MilhouseVH MilhouseVH force-pushed the MilhouseVH:le92_fixup_mysql branch from e36ecd1 to 4e62b99 Feb 27, 2019

@MilhouseVH MilhouseVH changed the title mysql: fix (probably) broken link after #3328 scripts/build: fix broken sym link after #3328 Feb 27, 2019

@MilhouseVH MilhouseVH added the BUGFIX label Feb 27, 2019

@MilhouseVH MilhouseVH force-pushed the MilhouseVH:le92_fixup_mysql branch 2 times, most recently from 3205941 to 16b09d0 Feb 28, 2019

@MilhouseVH MilhouseVH force-pushed the MilhouseVH:le92_fixup_mysql branch from 16b09d0 to ad93867 Feb 28, 2019

@MilhouseVH

This comment has been minimized.

Copy link
Contributor Author

commented Mar 1, 2019

Added commit which stops the JSON worker from filtering by PKG_ARCH, as we already have measures in place to ensure we don't build packages that are ARCH incompatible so there's no point doing it up front and then having to conditionally add packages as dependencies that otherwise wouldn't be built anyway.

This does mean we now consider more packages for the plan (all architectures), and potentially schedule packages that aren't required (due to wrong arch), but meh, it shouldn't cause a problem and makes life a little easier.

@MilhouseVH MilhouseVH force-pushed the MilhouseVH:le92_fixup_mysql branch from 3ec5674 to 34670aa Mar 2, 2019

@CvH

CvH approved these changes Mar 6, 2019

@CvH CvH merged commit f14df92 into LibreELEC:master Mar 6, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.