# HG changeset patch # User Michael Schloh von Bennewitz # Date 1343938273 -7200 # Node ID 061d2617f42fb8be7f94fa6756a9fde2cdd32ac0 # Parent dec7ed8e8eafdf698d837ac1058784553063a9b2 Provide 80Ko of shell script instead of standard 64Ko allocation. This is needed to accommodate recent script addtions involving smf(5). diff -r dec7ed8e8eaf -r 061d2617f42f openpkg/etc.wrapbin.sh --- a/openpkg/etc.wrapbin.sh Thu Aug 02 22:07:29 2012 +0200 +++ b/openpkg/etc.wrapbin.sh Thu Aug 02 22:11:13 2012 +0200 @@ -95,7 +95,7 @@ if [ ".$o_tar" = .yes ]; then tmpdir="${TMPDIR-/tmp}/openpkg.$$" ( umask 077 && mkdir $tmpdir) || exit 1 - dd if=$l_me bs=8192 skip=8 2>/dev/null |\ + dd if=$l_me bs=8192 skip=10 2>/dev/null |\ ( cd $tmpdir || exit 1 tar xf - 2>/dev/null || exit 1 ./openpkg.bzip2 -d -c openpkg.tar.bz2 @@ -166,7 +166,7 @@ # extract and install binary distribution files echo "++ extracting OpenPKG binary distribution" -dd if=$l_me bs=8192 skip=8 2>/dev/null |\ +dd if=$l_me bs=8192 skip=10 2>/dev/null |\ (cd $l_prefix; tar xf - 2>/dev/null) echo "++ installing OpenPKG binary distribution" ( cd $l_prefix || exit 1 @@ -261,7 +261,7 @@ # the distribution tarball is appended in raw format directly to the # end of this script, just leaded by padding whitespaces which make -# sure that the tarball data starts at the predefined offset of 64KB. +# sure that the tarball data starts at the predefined offset of 80KB. # This allows us to unpack the tarball by just skipping the leading -# 64KB (= 8192*8, see above). +# 80KB (= 8192*10, see above). diff -r dec7ed8e8eaf -r 061d2617f42f openpkg/etc.wrapsrc.sh --- a/openpkg/etc.wrapsrc.sh Thu Aug 02 22:07:29 2012 +0200 +++ b/openpkg/etc.wrapsrc.sh Thu Aug 02 22:11:13 2012 +0200 @@ -93,7 +93,7 @@ # optionally extract the embedded tarball only if [ ".$o_tar" = .yes ]; then - dd if=$l_me bs=8192 skip=8 2>/dev/null + dd if=$l_me bs=8192 skip=10 2>/dev/null exit 0 fi @@ -124,7 +124,7 @@ echo "++ extracting OpenPKG source distribution" rm -rf $l_dir >/dev/null 2>&1 mkdir $l_dir || exit 1 -dd if=$l_me bs=8192 skip=8 2>/dev/null | (cd $l_dir; tar xf - 2>/dev/null) +dd if=$l_me bs=8192 skip=10 2>/dev/null | (cd $l_dir; tar xf - 2>/dev/null) if [ ".$cusr" = .root ]; then ( cd $l_dir || exit 1 chown -R -h $cusr . >/dev/null 2>&1 || true @@ -151,7 +151,7 @@ # the distribution tarball is appended in raw format directly to the # end of this script, just leaded by padding whitespaces which make -# sure that the tarball data starts at the predefined offset of 64KB. +# sure that the tarball data starts at the predefined offset of 80KB. # This allows us to unpack the tarball by just skipping the leading -# 64KB (= 8192*8, see above). +# 80KB (= 8192*10, see above). diff -r dec7ed8e8eaf -r 061d2617f42f openpkg/openpkg.boot --- a/openpkg/openpkg.boot Thu Aug 02 22:07:29 2012 +0200 +++ b/openpkg/openpkg.boot Thu Aug 02 22:11:13 2012 +0200 @@ -224,11 +224,11 @@ -e "s;@l_release@;$l_release;" \ -e "s;@l_version@;$l_version;" echo . | awk '{ - for (i = 0; i < 8192; i++) { + for (i = 0; i < 8192*2; i++) { printf(" "); } }' >>$tmpdir/openpkg.boot.tmp - dd if=$tmpdir/openpkg.boot.tmp bs=8192 count=8 \ + dd if=$tmpdir/openpkg.boot.tmp bs=8192 count=10 \ of=$pkgdir/$name-$version-$release.src.sh 2>/dev/null rm -f $tmpdir/openpkg.boot.tmp (cd $tmpdir && tar cf - *) >>$pkgdir/$name-$version-$release.src.sh @@ -597,12 +597,12 @@ -e "/^@POST@/r $tmpdir/rpm.post" |\ sed -e '/^@PRE@/d' -e '/^@POST@/d' >$tmpdir/openpkg.boot.tmp echo . | awk '{ - for (i = 0; i < 8192; i++) { + for (i = 0; i < 8192*2; i++) { printf(" "); } }' >>$tmpdir/openpkg.boot.tmp rm -f $pkgdir/openpkg-$v.$t.sh -dd if=$tmpdir/openpkg.boot.tmp bs=8192 count=8 \ +dd if=$tmpdir/openpkg.boot.tmp bs=8192 count=10 \ of=$pkgdir/openpkg-$v.$t.sh 2>/dev/null rm -f $tmpdir/openpkg.boot.tmp ( cd $RPM_BUILD_ROOT$prefix