lkp-deploy.sh does the concrete work of 90lkp, it adds the lkp scripts into testbox's rootfs to run test job.
Signed-off-by: Xu Xijian hdxuxijian@163.com --- .../modules.d/90lkp/lkp-deploy.sh | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 container/dracut-initrd/modules.d/90lkp/lkp-deploy.sh
diff --git a/container/dracut-initrd/modules.d/90lkp/lkp-deploy.sh b/container/dracut-initrd/modules.d/90lkp/lkp-deploy.sh new file mode 100755 index 0000000..8be927c --- /dev/null +++ b/container/dracut-initrd/modules.d/90lkp/lkp-deploy.sh @@ -0,0 +1,48 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +. /lib/dracut-lib.sh + +# transfer LKP dirs +[ -d /lkp ] || return 0 + +cp -a /lkp "$NEWROOT"/ + +for i in /lkp/lkp/src/rootfs/addon/* /usr/local/* /opt/* +do + dir=$(basename "$i") + + [ "$i" != "${i%/*}" ] && continue # skip when i is an empty dir, it's unnecessary to copy + + [ -d "$NEWROOT/$dir" ] || mkdir -p "$NEWROOT/$dir" + + for j in "$i"/* "$i"/.??* + do + [ "$j" != "${j%/*}" ] && continue # skip when j is an empty dir + + [ -f "$j" ] && { + cp -a "$j" "$NEWROOT/$dir"/ + continue + } + + subdir=$(basename "$j") + + [ -d "$NEWROOT/$dir/$subdir" ] || mkdir -p "$NEWROOT/$dir/$subdir" + + for k in "$j"/* + do + [ "$k" != "${k%/*}" ] && continue # skip when k is an empty dir + + cp -a "$j"/* "$NEWROOT/$dir/$subdir"/ + done + done +done + +[ -d /usr/src ] && + cp -a /usr/src "$NEWROOT"/usr/ + +kmdir=/lib/modules/$(uname -r) +if test -d "$kmdir" && ! test -d "$NEWROOT/$kmdir"; then + cp -an "$kmdir" "$NEWROOT"/lib/modules/ + cp -an /lib/firmware "$NEWROOT"/lib/ +fi
+#!/bin/bash +# SPDX-License-Identifier: GPL-2.0
+. /lib/dracut-lib.sh
+# transfer LKP dirs +[ -d /lkp ] || return 0
+cp -a /lkp "$NEWROOT"/
+for i in /lkp/lkp/src/rootfs/addon/* /usr/local/* /opt/* +do
- dir=$(basename "$i")
- [ "$i" != "${i%/*}" ] && continue # skip when i is an empty dir, it's unnecessary to copy
for you have get the basename of $i: dir just test [ $dir == '*' ]
Thanks, Luan Shengde
- [ -d "$NEWROOT/$dir" ] || mkdir -p "$NEWROOT/$dir"
- for j in "$i"/* "$i"/.??*
- do
[ "$j" != "${j%/\*}" ] && continue # skip when j is an empty dir
[ -f "$j" ] && {
cp -a "$j" "$NEWROOT/$dir"/
continue
}
subdir=$(basename "$j")
[ -d "$NEWROOT/$dir/$subdir" ] || mkdir -p "$NEWROOT/$dir/$subdir"
for k in "$j"/*
do
[ "$k" != "${k%/\*}" ] && continue # skip when k is an empty dir
cp -a "$j"/* "$NEWROOT/$dir/$subdir"/
done
- done
+done
+[ -d /usr/src ] &&
- cp -a /usr/src "$NEWROOT"/usr/
+kmdir=/lib/modules/$(uname -r) +if test -d "$kmdir" && ! test -d "$NEWROOT/$kmdir"; then
- cp -an "$kmdir" "$NEWROOT"/lib/modules/
- cp -an /lib/firmware "$NEWROOT"/lib/
+fi
2.23.0
On Wed, Mar 03, 2021 at 10:52:02AM +0800, Luan Shengde wrote:
+#!/bin/bash +# SPDX-License-Identifier: GPL-2.0
+. /lib/dracut-lib.sh
+# transfer LKP dirs +[ -d /lkp ] || return 0
+cp -a /lkp "$NEWROOT"/
+for i in /lkp/lkp/src/rootfs/addon/* /usr/local/* /opt/* +do
- dir=$(basename "$i")
- [ "$i" != "${i%/*}" ] && continue # skip when i is an empty dir, it's unnecessary to copy
for you have get the basename of $i: dir just test [ $dir == '*' ]
Thanks, Luan Shengde
It will cause error when execute [ $dir == '*' ], when $dir is really '*', error log will be like below, but [ "$i" != "${i%/*}" ] won't. xxj@crystal ~/my/tmp/1% ./t.sh * ./t.sh: line 9: [: too many arguments aa
The t.sh is: ------------------------------ #!/bin/bash
path=/home/xxj/my/tmp/1/11/*
for i in /home/xxj/my/tmp/1/11/* do dir=$(basename "$i") echo "$dir" [ $dir == '*' ] && echo bb [ "$i" != "${i%/*}" ] && echo aa done ------------------------------
Btw, I think the annotation is clear enough, no need to modify.
Thanks, Xijian
- [ -d "$NEWROOT/$dir" ] || mkdir -p "$NEWROOT/$dir"
- for j in "$i"/* "$i"/.??*
- do
[ "$j" != "${j%/\*}" ] && continue # skip when j is an empty dir
[ -f "$j" ] && {
cp -a "$j" "$NEWROOT/$dir"/
continue
}
subdir=$(basename "$j")
[ -d "$NEWROOT/$dir/$subdir" ] || mkdir -p "$NEWROOT/$dir/$subdir"
for k in "$j"/*
do
[ "$k" != "${k%/\*}" ] && continue # skip when k is an empty dir
cp -a "$j"/* "$NEWROOT/$dir/$subdir"/
done
- done
+done
+[ -d /usr/src ] &&
- cp -a /usr/src "$NEWROOT"/usr/
+kmdir=/lib/modules/$(uname -r) +if test -d "$kmdir" && ! test -d "$NEWROOT/$kmdir"; then
- cp -an "$kmdir" "$NEWROOT"/lib/modules/
- cp -an /lib/firmware "$NEWROOT"/lib/
+fi
2.23.0