| Message ID | 20191012233041.29984-1-unixmania@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | board/wandboard/post-build.sh: create boot.scr at TARGET_DIR/boot | expand |
On 13/10/2019 01:30, unixmania@gmail.com wrote: > From: Carlos Santos <unixmania@gmail.com> > > There is no reason to create boot.scr at board/wandboard and later > install it at TARGET_DIR/boot, leaving a stale file behind. > > Signed-off-by: Carlos Santos <unixmania@gmail.com> > --- > board/wandboard/post-build.sh | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/board/wandboard/post-build.sh b/board/wandboard/post-build.sh > index 43e091c5d7..17aa9eefaf 100755 > --- a/board/wandboard/post-build.sh > +++ b/board/wandboard/post-build.sh > @@ -2,7 +2,9 @@ > > BOARD_DIR="$(dirname $0)" > > +install -d -m 755 $TARGET_DIR/boot > + > $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ > --n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr > +-n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr > > -install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr > +chmod 644 $TARGET_DIR/boot/boot.scr Is the chmod even needed? AFAIK mkimage doesn't create any special permissions, so the umask should apply. Regards, Arnout
Hello Carlos, On Sat, 12 Oct 2019 20:30:41 -0300 unixmania@gmail.com wrote: > From: Carlos Santos <unixmania@gmail.com> > > There is no reason to create boot.scr at board/wandboard and later > install it at TARGET_DIR/boot, leaving a stale file behind. > > Signed-off-by: Carlos Santos <unixmania@gmail.com> > --- > board/wandboard/post-build.sh | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Applied to master after dropping the additional chmod 644 on the file, as suggested by Arnout. Also, the same issue was present for other boards, so I also did the following commits: 2306339d1fe8d5ea2d9e17641f78a374f612f45e board/udoo/neo: create boot.scr in TARGET_DIR/boot 9ddbd11620b5a01945a438085d45ef2131bad35f board/solidrun/mx6cubox: create boot.scr in TARGET_DIR/boot What would perhaps be good is to use the BR2_TARGET_UBOOT_BOOT_SCRIPT feature, which would automatically run mkimage and install boot.src in $(BINARIES_DIR). The post-build script would then only have to copy it to $TARGET_DIR/boot/. Best regards, Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes: > Hello Carlos, > On Sat, 12 Oct 2019 20:30:41 -0300 > unixmania@gmail.com wrote: >> From: Carlos Santos <unixmania@gmail.com> >> >> There is no reason to create boot.scr at board/wandboard and later >> install it at TARGET_DIR/boot, leaving a stale file behind. >> >> Signed-off-by: Carlos Santos <unixmania@gmail.com> >> --- >> board/wandboard/post-build.sh | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) > Applied to master after dropping the additional chmod 644 on the file, > as suggested by Arnout. Also, the same issue was present for other > boards, so I also did the following commits: > 2306339d1fe8d5ea2d9e17641f78a374f612f45e board/udoo/neo: create boot.scr in TARGET_DIR/boot > 9ddbd11620b5a01945a438085d45ef2131bad35f board/solidrun/mx6cubox: create boot.scr in TARGET_DIR/boot > What would perhaps be good is to use the BR2_TARGET_UBOOT_BOOT_SCRIPT > feature, which would automatically run mkimage and install boot.src in > $(BINARIES_DIR). The post-build script would then only have to copy it > to $TARGET_DIR/boot/. The same set of commits now cherry-picked to 2020.02.x, thanks.
diff --git a/board/wandboard/post-build.sh b/board/wandboard/post-build.sh index 43e091c5d7..17aa9eefaf 100755 --- a/board/wandboard/post-build.sh +++ b/board/wandboard/post-build.sh @@ -2,7 +2,9 @@ BOARD_DIR="$(dirname $0)" +install -d -m 755 $TARGET_DIR/boot + $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ --n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr +-n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr -install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr +chmod 644 $TARGET_DIR/boot/boot.scr