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

Cleanup path for SOURCES and allow SOURCES and TARGET to be defined … #2348

Merged
merged 1 commit into from Dec 26, 2017

Conversation

@islipfd19
Copy link
Contributor

commented Dec 21, 2017

Cleanup for SOURCES where directory was absolute in packages
Allow user to define SOURCES at CLI to specify their own directory for sources
Allow user to define TARGET at CLI to specify their own directory where images and add-ons will be saved to

@islipfd19

This comment has been minimized.

Copy link
Contributor Author

commented Dec 21, 2017

This PR will allow a user to define a common sources and target location outside of the default directory. This will benefit the build server because each platform and add-on is built within their own workspace, a Jenkins requirement.

@islipfd19

This comment has been minimized.

Copy link
Contributor Author

commented Dec 21, 2017

Updated config/path $TARGET_IMG

@islipfd19

This comment has been minimized.

Copy link
Contributor Author

commented Dec 21, 2017

Fix TARGET is leaking from scripts/build that Milhouse discovered during a build test.

from within scripts/build you can't determine the true value of TARGET or TARGET_IMG. The problem is that scripts/build defines the variable TARGET (ie. host, or target, or init) and then when building packages those packages may query config/options $1 eg. $(get_build_dir linux) and now because TARGET=host (or whatever) the value of TARGET_IMG becomes host (because TARGET_IMG=$TARGET)

instead of using TARGET on cli, the user will now use TARGET_DIR

@islipfd19

This comment has been minimized.

Copy link
Contributor Author

commented Dec 21, 2017

Update PR as per hiassoft's suggestion 'SOURCES=${SOURCES_DIR:-$ROOT/sources}'

@islipfd19

This comment has been minimized.

Copy link
Contributor Author

commented Dec 21, 2017

Updated as per Milhouse's suggestion:

maybe just one small change... replace

with

then delete line 31 (TARGET_IMG=$TARGET_DIR)

@islipfd19

This comment has been minimized.

Copy link
Contributor Author

commented Dec 21, 2017

Fix 'ADDONS' as it was trying to create the addons folder outside of target.

@islipfd19

This comment has been minimized.

Copy link
Contributor Author

commented Dec 21, 2017

Revert previous fix and update scriprs/create_addon, where the fix belongs

@islipfd19

This comment has been minimized.

Copy link
Contributor Author

commented Dec 21, 2017

Fix typo in scripts/create_addon

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

commented Dec 22, 2017

@islipfd19 all good now?

@islipfd19

This comment has been minimized.

Copy link
Contributor Author

commented Dec 22, 2017

@MilhouseVH it hasn't been fully tested yet (I have an issue with jenkins slave tht took up my time after this PR), though from what I've seen I don't see any issues. I'm going to kck off a few test builds on jenkins with this now.

@islipfd19

This comment has been minimized.

Copy link
Contributor Author

commented Dec 22, 2017

@MilhouseVH PR confirmed to be working with successful builds of Generic, RPi and add-on hdhomerun on Jenkins. The test included removing OS level symlinks of SOURCES and TARGET. Custom defined SOURCES and TARGET.were provided and used during the build process,

One note, the target folder was created in the workspace but was empty.

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