aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/generic/patches-2.6.38/218-mini_fo_fix_2_6_38.patch10
1 files changed, 10 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.38/218-mini_fo_fix_2_6_38.patch b/target/linux/generic/patches-2.6.38/218-mini_fo_fix_2_6_38.patch
index f1416eb47e..6807c599a5 100644
--- a/target/linux/generic/patches-2.6.38/218-mini_fo_fix_2_6_38.patch
+++ b/target/linux/generic/patches-2.6.38/218-mini_fo_fix_2_6_38.patch
@@ -35,3 +35,13 @@
goto out;
}
}
+@@ -148,7 +148,8 @@ mini_fo_d_compare(dentry_t *dentry, qstr
+ hidden_dentry = dtohd(dentry);
+
+ if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
+- err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
++ err = hidden_dentry->d_op->d_compare(NULL, NULL, NULL, NULL,
++ hidden_dentry->d_name.len, a, b);
+ } else {
+ err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
+ }
d='n103' href='#n103'>103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157
#!/bin/sh

. $TOPDIR/scripts/functions.sh

part=""
ubootenv=""
ubinize_param=""
kernel=""
rootfs=""
outfile=""
err=""
ubinize_seq=""

ubivol() {
	volid=$1
	name=$2
	image=$3
	autoresize=$4
	size="$5"
	echo "[$name]"
	echo "mode=ubi"
	echo "vol_id=$volid"
	echo "vol_type=dynamic"
	echo "vol_name=$name"
	if [ "$image" ]; then
		echo "image=$image"
		[ -n "$size" ] && echo "vol_size=${size}"
	else
		echo "vol_size=1MiB"
	fi
	if [ "$autoresize" ]; then
		echo "vol_flags=autoresize"
	fi
}

ubilayout() {
	local vol_id=0
	local rootsize=
	local autoresize=
	local rootfs_type="$( get_fs_type "$2" )"

	if [ "$1" = "ubootenv" ]; then
		ubivol $vol_id ubootenv
		vol_id=$(( $vol_id + 1 ))
		ubivol $vol_id ubootenv2
		vol_id=$(( $vol_id + 1 ))
	fi
	for part in $parts; do
		name="${part%%=*}"
		prev="$part"
		part="${part#*=}"
		[ "$prev" = "$part" ] && part=

		image="${part%%=*}"
		prev="$part"
		part="${part#*=}"
		[ "$prev" = "$part" ] && part=

		size="$part"

		ubivol $vol_id "$name" "$image" "" "${size}MiB"
		vol_id=$(( $vol_id + 1 ))
	done
	if [ "$3" ]; then
		ubivol $vol_id kernel "$3"
		vol_id=$(( $vol_id + 1 ))
	fi

	if [ "$2" ]; then
		case "$rootfs_type" in
		"ubifs")
			autoresize=1
			;;
		"squashfs")
			# squashfs uses 1k block size, ensure we do not
			# violate that
			rootsize="$( round_up "$( stat -c%s "$2" )" 1024 )"
			;;
		esac
		ubivol $vol_id rootfs "$2" "$autoresize" "$rootsize"

		vol_id=$(( $vol_id + 1 ))
		[ "$rootfs_type" = "ubifs" ] || ubivol $vol_id rootfs_data "" 1
	fi
}

set_ubinize_seq() {
	if [ -n "$SOURCE_DATE_EPOCH" ] ; then
		ubinize_seq="-Q $SOURCE_DATE_EPOCH"
	fi
}

while [ "$1" ]; do
	case "$1" in
	"--uboot-env")
		ubootenv="ubootenv"
		shift
		continue
		;;
	"--kernel")