kirkwood: refresh kernel config

[openwrt/openwrt.git] / scripts / ipkg-build

diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index 2d410767f34c64bab41d3c93683c618618b36679..343aab6caf312161712235362f345bc550860911 100755 (executable)
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -10,18 +10,16 @@
 set -e
 
 version=1.0
-FIND="$(which find)"
-FIND="${FIND:-$(which gfind)}"
-TAR="${TAR:-$(which tar)}"
-SVN="$(which svn)"
-GIT="$(which git)"
-export GZIP="-n"
-
-# look up date of last commit
-if [ -d "$TOPDIR/.git" ]; then
-       TIMESTAMP=$($GIT log -1 -s --format=%ci)
-elif [ -d "$TOPDIR/.svn" ]; then
-       TIMESTAMP=$($SVN info "$TOPDIR" | sed -n "s/^Last Changed Date: \(.*\)/\1/p")
+FIND="$(command -v find)"
+FIND="${FIND:-$(command -v gfind)}"
+TAR="${TAR:-$(command -v tar)}"
+GZIP="$(command -v gzip)"
+
+# try to use fixed source epoch
+if [ -n "$PKG_SOURCE_DATE_EPOCH" ]; then
+       TIMESTAMP=$(date --date="@$PKG_SOURCE_DATE_EPOCH")
+elif [ -n "$SOURCE_DATE_EPOCH" ]; then
+       TIMESTAMP=$(date --date="@$SOURCE_DATE_EPOCH")
 else
        TIMESTAMP=$(date)
 fi
@@ -60,34 +58,48 @@ pkg_appears_sane() {
                done
 
                rm $CONTROL/conffiles
-               mv $CONTROL/conffiles.resolved $CONTROL/conffiles
-               chmod 0644 $CONTROL/conffiles
+               if [ -f $CONTROL/conffiles.resolved ]; then
+                       mv $CONTROL/conffiles.resolved $CONTROL/conffiles
+                       chmod 0644 $CONTROL/conffiles
+               fi
        fi
 
        cd $owd
        return $PKG_ERROR
 }
 
+resolve_file_mode_id() {
+       local var=$1 type=$2 name=$3 id
+
+       case "$name" in
+               root)
+                       id=0
+               ;;
+               *[!0-9]*)
+                       id=$(sed -ne "s#^$type $name \\([0-9]\\+\\)\\b.*\$#\\1#p" "$TOPDIR/tmp/.packageusergroup" 2>/dev/null)
+               ;;
+               *)
+                       id=$name
+               ;;
+       esac
+
+       export "$var=$id"
+
+       [ -n "$id" ]
+}
+
 ###
 # ipkg-build "main"
 ###
-ogargs=""
-noclean=0
-usage="Usage: $0 [-c] [-C] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
-while getopts "cg:ho:v" opt; do
+file_modes=""
+usage="Usage: $0 [-v] [-h] [-m] <pkg_directory> [<destination_directory>]"
+while getopts "hvm:" opt; do
     case $opt in
-       o ) owner=$OPTARG
-           ogargs="--owner=$owner"
-           ;;
-       g ) group=$OPTARG
-           ogargs="$ogargs --group=$group"
-           ;;
-       c ) ;;
-       C ) noclean=1;;
        v ) echo $version
            exit 0
            ;;
        h )     echo $usage  >&2 ;;
+       m )     file_modes=$OPTARG ;;
        \? )    echo $usage  >&2
        esac
 done
@@ -109,7 +121,7 @@ case $# in
        ;;
 *)
        echo $usage >&2
-       exit 1 
+       exit 1
        ;;
 esac
 
@@ -138,21 +150,49 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$
 mkdir $tmp_dir
 
 echo $CONTROL > $tmp_dir/tarX
-# Preserve permissions (-p) when creating data.tar.gz as non-root user
-( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX --format=gnu -czpf $tmp_dir/data.tar.gz --mtime="$TIMESTAMP" . )
+cd $pkg_dir
+for file_mode in $file_modes; do
+       case $file_mode in
+       /*:*:*:*)
+           ;;
+       *)
+           echo "ERROR: file modes must use absolute path and contain user:group:mode"
+           echo "$file_mode"
+           exit 1
+           ;;
+       esac
+
+       mode=${file_mode##*:}; path=${file_mode%:*}
+       group=${path##*:};     path=${path%:*}
+       user=${path##*:};      path=${path%:*}
+
+       if ! resolve_file_mode_id uid user "$user"; then
+               echo "ERROR: unable to resolve uid of $user" >&2
+               exit 1
+       fi
+
+       if ! resolve_file_mode_id gid group "$group"; then
+               echo "ERROR: unable to resolve gid of $group" >&2
+               exit 1
+       fi
+
+       chown "$uid:$gid" "$pkg_dir/$path"
+       chmod  "$mode" "$pkg_dir/$path"
+done
+$TAR -X $tmp_dir/tarX --format=gnu --sort=name -cpf - --mtime="$TIMESTAMP" . | $GZIP -n - > $tmp_dir/data.tar.gz
 
 installed_size=`stat -c "%s" $tmp_dir/data.tar.gz`
 sed -i -e "s/^Installed-Size: .*/Installed-Size: $installed_size/" \
        $pkg_dir/$CONTROL/control
 
-( cd $pkg_dir/$CONTROL && $TAR $ogargs --format=gnu -czf $tmp_dir/control.tar.gz --mtime="$TIMESTAMP" . )
+( cd $pkg_dir/$CONTROL && $TAR --format=gnu --sort=name -cf -  --mtime="$TIMESTAMP" . | $GZIP -n - > $tmp_dir/control.tar.gz )
 rm $tmp_dir/tarX
 
 echo "2.0" > $tmp_dir/debian-binary
 
 pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
 rm -f $pkg_file
-( cd $tmp_dir && $TAR --format=gnu -zcf $pkg_file --mtime="$TIMESTAMP" ./debian-binary ./data.tar.gz ./control.tar.gz )
+( cd $tmp_dir && $TAR --format=gnu --sort=name -cf -  --mtime="$TIMESTAMP" ./debian-binary ./data.tar.gz ./control.tar.gz | $GZIP -n - > $pkg_file )
 
 rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
 rmdir $tmp_dir