From 13b79da9dd4d94dbcfbd2f643b32addb31af32c6 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 14 Mar 2012 11:49:04 +0100 Subject: [PATCH] squashfs: changed squashfs_install_overlay() to receive the targetdir as $1 --- target/share/squashfs.in | 5 ++++- target/share/squashfs/build.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/share/squashfs.in b/target/share/squashfs.in index ee41d96..1528e8b 100644 --- a/target/share/squashfs.in +++ b/target/share/squashfs.in @@ -37,7 +37,10 @@ squashfs_install_flist() { # weak functions # -squashfs_install_overlay() { overlay_apply "$@"; } +squashfs_install_overlay() { + local x="$1/squashfs" + [ ! -d "$x" ] || overlay_apply "$x" "$2" +} # should this package be extracted by flist or not? # squashfs_install diff --git a/target/share/squashfs/build.sh b/target/share/squashfs/build.sh index 4098f2a..5028891 100644 --- a/target/share/squashfs/build.sh +++ b/target/share/squashfs/build.sh @@ -58,7 +58,7 @@ done [ -z "$SQUASHFS_POSTINSTALL_HOOK" ] || eval "$SQUASHFS_POSTINSTALL_HOOK" # Apply overlay -[ ! -d "target/$target/squashfs" ] || squashfs_install_overlay "target/$target/squashfs" "$rootfs" +squashfs_install_overlay "target/$target" "$rootfs" # hook $SQUASHFS_POSTOVERLAY_HOOK #