summaryrefslogtreecommitdiffstats
path: root/tools/ipkg-utils
diff options
context:
space:
mode:
Diffstat (limited to 'tools/ipkg-utils')
-rw-r--r--tools/ipkg-utils/patches/200-force_gnu_format.patch27
-rw-r--r--tools/ipkg-utils/patches/210-remove_field_checks.patch36
2 files changed, 63 insertions, 0 deletions
diff --git a/tools/ipkg-utils/patches/200-force_gnu_format.patch b/tools/ipkg-utils/patches/200-force_gnu_format.patch
new file mode 100644
index 000000000..f363acbc0
--- /dev/null
+++ b/tools/ipkg-utils/patches/200-force_gnu_format.patch
@@ -0,0 +1,27 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -250,13 +250,13 @@ 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 -czpf $tmp_dir/data.tar.gz . )
++( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX --format=gnu -czpf $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 -czf $tmp_dir/control.tar.gz . )
++( cd $pkg_dir/$CONTROL && $TAR $ogargs --format=gnu -czf $tmp_dir/control.tar.gz . )
+ rm $tmp_dir/tarX
+
+ echo "2.0" > $tmp_dir/debian-binary
+@@ -266,7 +266,7 @@ rm -f $pkg_file
+ if [ "$outer" = "ar" ] ; then
+ ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
+ else
+- ( cd $tmp_dir && $TAR -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
++ ( cd $tmp_dir && $TAR --format=gnu -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
+ fi
+
+ rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
diff --git a/tools/ipkg-utils/patches/210-remove_field_checks.patch b/tools/ipkg-utils/patches/210-remove_field_checks.patch
new file mode 100644
index 000000000..2f1f2eab3
--- /dev/null
+++ b/tools/ipkg-utils/patches/210-remove_field_checks.patch
@@ -0,0 +1,36 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -101,9 +101,6 @@ You probably want to chown these to a sy
+ arch=`required_field Architecture`
+ [ "$?" -ne 0 ] && PKG_ERROR=1
+
+- required_field Maintainer >/dev/null
+- [ "$?" -ne 0 ] && PKG_ERROR=1
+-
+ required_field Description >/dev/null
+ [ "$?" -ne 0 ] && PKG_ERROR=1
+
+@@ -114,23 +111,6 @@ You probably want to chown these to a sy
+ echo "admin, base, comm, editors, extras, games, graphics, kernel, libs, misc, net, text, web, x11" >&2
+ fi
+
+- priority=`required_field Priority`
+- [ "$?" -ne 0 ] && PKG_ERROR=1
+- if [ -z "$priority" ]; then
+- echo "The Priority field should have one of the following values:" >&2
+- echo "required, important, standard, optional, extra." >&2
+- echo "If you don't know which priority value you should be using, then use \`optional'" >&2
+- fi
+-
+- source=`required_field Source`
+- [ "$?" -ne 0 ] && PKG_ERROR=1
+- if [ -z "$source" ]; then
+- echo "The Source field contain the URL's or filenames of the source code and any patches"
+- echo "used to build this package. Either gnu-style tarballs or Debian source packages "
+- echo "are acceptable. Relative filenames may be used if they are distributed in the same"
+- echo "directory as the .ipk file."
+- fi
+-
+ disallowed_filename=`disallowed_field Filename`
+ [ "$?" -ne 0 ] && PKG_ERROR=1
+