| Message ID | 20180328070545.5323-1-victor.chong@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [Linaro-uefi] opteed-build.sh: Copy images to UEFI dir | expand |
On Wed, Mar 28, 2018 at 08:05:45AM +0100, Victor Chong wrote: > atf-build.sh expects TOS binaries to be available in the UEFI image > dir so copy them there. > > Fixes: 0c485dab ("opteed-build.sh: Remove copy of images to UEFI dir") > Signed-off-by: Victor Chong <victor.chong@linaro.org> > --- > opteed-build.sh | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/opteed-build.sh b/opteed-build.sh > index 40fb844..301239e 100755 > --- a/opteed-build.sh > +++ b/opteed-build.sh > @@ -105,6 +105,19 @@ function build_platform > TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`" > TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`" > TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" > + DESTDIR="$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/" > + COREDIR="out/arm-plat-$TOS_PLATFORM/core" So, you said in the other thread that this name is hardcoded. But in the optee top-level Makefile, I see out-dir := $(O)/$(ARCH)-plat-$(PLATFORM) So please follow this pattern. / Leif > + if [ $VERBOSE -eq 1 ]; then > + echo "Copying TOS binaries to '$DESTDIR'" > + CPFLAGS="-v" > + else > + CPFLAGS="" > + fi > + for file in $COREDIR/{"$TOS_BIN","$TOS_BIN_EXTRA1","$TOS_BIN_EXTRA2"}; do > + if [ -f "$file" ]; then > + cp -a $CPFLAGS $file "$DESTDIR" > + fi > + done > else > return 1 > fi > -- > 2.16.2 >
On Thu, Mar 29, 2018 at 1:48 AM, Leif Lindholm <leif.lindholm@linaro.org> wrote: > On Wed, Mar 28, 2018 at 08:05:45AM +0100, Victor Chong wrote: >> atf-build.sh expects TOS binaries to be available in the UEFI image >> dir so copy them there. >> >> Fixes: 0c485dab ("opteed-build.sh: Remove copy of images to UEFI dir") >> Signed-off-by: Victor Chong <victor.chong@linaro.org> >> --- >> opteed-build.sh | 13 +++++++++++++ >> 1 file changed, 13 insertions(+) >> >> diff --git a/opteed-build.sh b/opteed-build.sh >> index 40fb844..301239e 100755 >> --- a/opteed-build.sh >> +++ b/opteed-build.sh >> @@ -105,6 +105,19 @@ function build_platform >> TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`" >> TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`" >> TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" >> + DESTDIR="$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/" >> + COREDIR="out/arm-plat-$TOS_PLATFORM/core" > > So, you said in the other thread that this name is hardcoded. > But in the optee top-level Makefile, I see > out-dir := $(O)/$(ARCH)-plat-$(PLATFORM) > > So please follow this pattern. Ok. $ARCH has only ever been 'arm' all these times that many things would probably break if it's something else, but you're right, no telling what will happen in the future. Will send v2. > > / > Leif > >> + if [ $VERBOSE -eq 1 ]; then >> + echo "Copying TOS binaries to '$DESTDIR'" >> + CPFLAGS="-v" >> + else >> + CPFLAGS="" >> + fi >> + for file in $COREDIR/{"$TOS_BIN","$TOS_BIN_EXTRA1","$TOS_BIN_EXTRA2"}; do >> + if [ -f "$file" ]; then >> + cp -a $CPFLAGS $file "$DESTDIR" >> + fi >> + done >> else >> return 1 >> fi >> -- >> 2.16.2 >>
diff --git a/opteed-build.sh b/opteed-build.sh index 40fb844..301239e 100755 --- a/opteed-build.sh +++ b/opteed-build.sh @@ -105,6 +105,19 @@ function build_platform TOS_BIN="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin`" TOS_BIN_EXTRA1="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra1`" TOS_BIN_EXTRA2="`$TOOLS_DIR/parse-platforms.py $PLATFORM_CONFIG -p $1 get -o tos_bin_extra2`" + DESTDIR="$EDK2_DIR/Build/$PLATFORM_IMAGE_DIR/$BUILD_PROFILE/FV/" + COREDIR="out/arm-plat-$TOS_PLATFORM/core" + if [ $VERBOSE -eq 1 ]; then + echo "Copying TOS binaries to '$DESTDIR'" + CPFLAGS="-v" + else + CPFLAGS="" + fi + for file in $COREDIR/{"$TOS_BIN","$TOS_BIN_EXTRA1","$TOS_BIN_EXTRA2"}; do + if [ -f "$file" ]; then + cp -a $CPFLAGS $file "$DESTDIR" + fi + done else return 1 fi
atf-build.sh expects TOS binaries to be available in the UEFI image dir so copy them there. Fixes: 0c485dab ("opteed-build.sh: Remove copy of images to UEFI dir") Signed-off-by: Victor Chong <victor.chong@linaro.org> --- opteed-build.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+)