X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Fipkg-make-index.sh;h=f6f15d7dd8c33969d81d43abed706513e3078b86;hp=46051045ae072a817898aca26556b83716f0e59f;hb=7bf6b5972419d95745b894bf86a20de45883ca7f;hpb=60c1f0f64d23003a19a07d6b9638542130f6641d

diff --git a/scripts/ipkg-make-index.sh b/scripts/ipkg-make-index.sh
index 46051045ae..f6f15d7dd8 100755
--- a/scripts/ipkg-make-index.sh
+++ b/scripts/ipkg-make-index.sh
@@ -1,24 +1,31 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -e
 
 pkg_dir=$1
 
 if [ -z $pkg_dir ] || [ ! -d $pkg_dir ]; then
-	echo "Usage: ipkg-make-index <package_directory>"
+	echo "Usage: ipkg-make-index <package_directory>" >&2
 	exit 1
 fi
 
-which md5sum 2>&1 >/dev/null || alias md5sum=md5
+empty=1
 
 for pkg in `find $pkg_dir -name '*.ipk' | sort`; do
+	empty=
+	name="${pkg##*/}"
+	name="${name%%_*}"
+	[[ "$name" = "kernel" ]] && continue
+	[[ "$name" = "libc" ]] && continue
 	echo "Generating index for package $pkg" >&2
-	file_size=$(ls -l $pkg | awk '{print $5}')
-	md5sum=$(md5sum $pkg | awk '{print $1}')
+	file_size=$(stat -L -c%s $pkg)
+	sha256sum=$(mkhash sha256 $pkg)
 	# Take pains to make variable value sed-safe
-	sed_safe_pkg=`echo $pkg | sed -e 's/\\//\\\\\\//g'`
+	sed_safe_pkg=`echo $pkg | sed -e 's/^\.\///g' -e 's/\\//\\\\\\//g'`
 	tar -xzOf $pkg ./control.tar.gz | tar xzOf - ./control | sed -e "s/^Description:/Filename: $sed_safe_pkg\\
 Size: $file_size\\
-MD5Sum: $md5sum\\
+SHA256sum: $sha256sum\\
 Description:/"
 	echo ""
 done
+[ -n "$empty" ] && echo
+exit 0