Skip to content

Commit 8a95adc

Browse files
committed
Sync preinstall_setup() with recipe_build_preinstallimage()
1 parent 214a07d commit 8a95adc

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

build-recipe-preinstallimage

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ recipe_build_preinstallimage() {
4646
.build.hostarch.*) ;; # to be packaged
4747
.build.initrd.*) ;; # to be packaged
4848
.build*) continue ;;
49+
.init_b_cache) continue ;;
4950
.preinstallimage*) continue ;;
5051
.srcfiles*) continue ;;
5152
.pkgs) continue ;;

init_buildsystem

+7-2
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,11 @@ preinstall_setup() {
226226
rm -rf build-preinstall
227227
mkdir build-preinstall || cleanup_and_exit 1
228228
for i in * .* ; do
229+
# please keep in sync with recipe_build_preinstallimage
229230
case "$i" in
230-
.|..|.build|.build.*|.build-srcdir|.init_b_cache|.pkgs|build-preinstall|proc|sys) continue ;;
231+
.|..|build-preinstall) continue ;;
232+
.build.kernel.*|.build.hostarch.*|.build.initrd.*) ;;
233+
.build*|.init_b_cache|.preinstallimage*|.srcfiles*|.pkgs|.rpm-cache|installed-pkg|proc|sys) continue ;;
231234
esac
232235
mv "./$i" build-preinstall || cleanup_and_exit 1
233236
done
@@ -238,7 +241,9 @@ preinstall_integrate() {
238241
cd "$BUILD_ROOT/build-preinstall" || cleanup_and_exit 1
239242
for i in * .* ; do
240243
case "$i" in
241-
.|..|.build|.build.*|.build-srcdir|.init_b_cache|.pkgs|build-preinstall|proc|sys) continue ;;
244+
.|..|build-preinstall) continue ;;
245+
.build.kernel.*|.build.hostarch.*|.build.initrd.*) ;;
246+
.build*|.init_b_cache|.preinstallimage*|.srcfiles*|.pkgs|.rpm-cache|installed-pkg|proc|sys) continue ;;
242247
esac
243248
mv "./$i" .. || cleanup_and_exit 1
244249
done

0 commit comments

Comments
 (0)