diff options
| author | William A. Kennington III <wak@google.com> | 2017-04-19 14:24:45 -0700 |
|---|---|---|
| committer | William A. Kennington III <wak@google.com> | 2017-05-02 15:20:23 -0700 |
| commit | 0006af5f2bdc9e980d188ae6eff06d118ea99541 (patch) | |
| tree | 68b4de6d4935f936ac044c7c0d0e82c891433c40 /openpower | |
| parent | ddf63ced900d41b0c6ad6181889644ea0001b2cc (diff) | |
| download | talos-op-build-0006af5f2bdc9e980d188ae6eff06d118ea99541.tar.gz talos-op-build-0006af5f2bdc9e980d188ae6eff06d118ea99541.zip | |
sbe: Cleanup build commands and pass SBE_COMMIT_ID to the build directly
The sbe build depends on being able to parse the git repo for commit
information. Since the sbe download being used in the build is a git
achive and not a real git repo, this parsing fails. Instead we pass the
commit id directly to bypass the repo requirement.
This change includes a patch containing
open-power/sbe@695eed7bf424f58899e2650ecfdadc5389bf35f5
as updating to the lastest sbe code caused trouble in my testing.
Also, reindent to match other buildroot packages
Signed-off-by: William A. Kennington III <wak@google.com>
Diffstat (limited to 'openpower')
| -rw-r--r-- | openpower/package/sbe/sbe.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk index 74d70683..958aca28 100644 --- a/openpower/package/sbe/sbe.mk +++ b/openpower/package/sbe/sbe.mk @@ -14,13 +14,16 @@ SBE_INSTALL_IMAGES = YES SBE_INSTALL_TARGET = NO define SBE_BUILD_CMDS - bash -c 'cd $(@D) && make LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib CROSS_COMPILER_PATH=$(PPE42_GCC_BIN)' + SBE_COMMIT_ID=$(SBE_VERSION) $(MAKE1) -C $(@D) \ + LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib \ + CROSS_COMPILER_PATH=$(PPE42_GCC_BIN) \ + all endef define SBE_INSTALL_IMAGES_CMDS - $(INSTALL) -D $(@D)/images/p9_ipl_build $(HOST_DIR)/usr/bin/ - python $(@D)/src/build/sbeOpDistribute.py --sbe_binary_dir=$(STAGING_DIR)/sbe_binaries --img_dir=$(@D)/images - cp $(@D)/src/build/sbeOpDistribute.py $(STAGING_DIR)/sbe_binaries/ + $(INSTALL) -D $(@D)/images/p9_ipl_build $(HOST_DIR)/usr/bin/ + python $(@D)/src/build/sbeOpDistribute.py --sbe_binary_dir=$(STAGING_DIR)/sbe_binaries --img_dir=$(@D)/images + cp $(@D)/src/build/sbeOpDistribute.py $(STAGING_DIR)/sbe_binaries/ endef $(eval $(generic-package)) |
