2009/11/2 Marius Vollmer <marius.voll...@nokia.com>:
> [ Jussi, we would like to get a new debian-etch devkit for Maemo 5 with
> the attached patch. Please advise how to best go about this.
> ]
>
> ext Ed Bartosh <bart...@gmail.com> writes:
>
>> I can also help with building devkit if needed.
>
> I didn't manage to get the devkit to compile (I didn't see a way to get
> it to not install into / during build), but I have a patch anyway
> (attached).
>
You can learn how to do it here:
http://scratchbox.org/documentation/docbook/devkit.html
Here you can get result of my build(patch attached):
https://garage.maemo.org/builder/scratchbox-devkit-debian_1.0.16-1.optify_i386.deb
I didn't test it, so don't expect too much :)
>> What's the best way to make SDK guys to adopt our changes? Bug?
>
> Jussi Haakala should be our man (in CC).
>
I think we should ask him to build final variant, when everyone will
be happy with it.
Until that I can build it.
--
BR,
Ed
Mon Nov 2 21:31:37 EET 2009 Ed Bartosh <bart...@gmail.com>
* modified dpkg-buildpackage to run maemo-optify
diff -rN -u old-sb-debian-devkit/debian/rules new-sb-debian-devkit/debian/rules
--- old-sb-debian-devkit/debian/rules 2009-11-02 21:38:29.000000000 +0200
+++ new-sb-debian-devkit/debian/rules 2009-11-02 21:38:30.000000000 +0200
@@ -4,6 +4,7 @@
DEVKIT = $(shell echo $(PACKAGE) | cut -d- -f3-)
VERSION = $(shell head -n1 /scratchbox/etc/scratchbox-version)
DATE = $(shell head -n2 /scratchbox/etc/scratchbox-version | tail -n1)
+VERSION = 1.0.16-1.optify
build:
diff -rN -u old-sb-debian-devkit/etch_tools/dpkg/Makefile new-sb-debian-devkit/etch_tools/dpkg/Makefile
--- old-sb-debian-devkit/etch_tools/dpkg/Makefile 2009-11-02 21:38:29.000000000 +0200
+++ new-sb-debian-devkit/etch_tools/dpkg/Makefile 2009-11-02 21:38:30.000000000 +0200
@@ -7,7 +7,8 @@
debian-triplet.patch \
cris.patch \
passwd-check-fix.patch \
- dpkg-uclibc.patch
+ dpkg-uclibc.patch \
+ maemo-optify.patch
LIBDEPS =
DEPENDS =
diff -rN -u old-sb-debian-devkit/etch_tools/dpkg/checksums new-sb-debian-devkit/etch_tools/dpkg/checksums
--- old-sb-debian-devkit/etch_tools/dpkg/checksums 2009-11-02 21:38:29.000000000 +0200
+++ new-sb-debian-devkit/etch_tools/dpkg/checksums 2009-11-02 21:38:30.000000000 +0200
@@ -5,3 +5,4 @@
d35eba925f322f4591ebc0f6cf292d1d download/dpkg-sbox.patch
84819d216460537ad94df636d340c7f5 download/passwd-check-fix.patch
fb6d6636d762fc6a1086807c0378002f download/dpkg-uclibc.patch
+3d6bc31986de2ab958d9d78927fbdd67 files/maemo-optify.patch
diff -rN -u old-sb-debian-devkit/etch_tools/dpkg/files/maemo-optify.patch new-sb-debian-devkit/etch_tools/dpkg/files/maemo-optify.patch
--- old-sb-debian-devkit/etch_tools/dpkg/files/maemo-optify.patch 1970-01-01 02:00:00.000000000 +0200
+++ new-sb-debian-devkit/etch_tools/dpkg/files/maemo-optify.patch 2009-11-02 21:38:30.000000000 +0200
@@ -0,0 +1,58 @@
+--- orig/dpkg-1.13.25/scripts/dpkg-buildpackage.sh 2006-06-21 05:35:01.000000000 +0300
++++ new/dpkg-1.13.25/scripts/dpkg-buildpackage.sh 2009-11-02 18:44:41.000000000 +0200
+@@ -12,6 +12,7 @@
+ echo "
+ Copyright (C) 1996 Ian Jackson.
+ Copyright (C) 2000 Wichert Akkerman
++Copyright (C) 2009 Nokia Corporation (Marius Vollmer)
+ This is free software; see the GNU General Public Licence version 2 or
+ later for copying conditions. There is NO warranty."
+ }
+@@ -45,6 +46,7 @@
+ -sn force Debian native source format. } only passed
+ -s[sAkurKUR] see dpkg-source for explanation. } to dpkg-source
+ -nc do not clean source tree (implies -b).
++ -no do not run maemo-optify-deb.
+ -tc clean source tree when finished.
+ -ap add pause before starting signature process.
+ -W turn certain errors into warnings. } passed to
+@@ -77,6 +79,7 @@
+ maint=''
+ desc=''
+ noclean=false
++nooptify=false
+ usepause=false
+ warnable_error=0
+ passopts=''
+@@ -109,6 +112,7 @@
+ -tc) cleansource=true ;;
+ -t*) targetgnusystem="$value" ;; # Order DOES matter!
+ -nc) noclean=true; if [ -z "$binaryonly" ]; then binaryonly=-b; fi ;;
++ -no) nooptify=true ;;
+ -b) binaryonly=-b; [ "$sourceonly" ] && \
+ { echo >&2 "$progname: cannot combine $1 and -S" ; exit 2 ; } ;;
+ -B) binaryonly=-B; checkbuilddep_args=-B; binarytarget=binary-arch; [ "$sourceonly" ] && \
+@@ -127,6 +131,13 @@
+ shift
+ done
+
++if [ x$nooptify != xtrue ]; then
++ if [ x`type -p maemo-optify-deb` = x ]; then
++ echo >&2 "$progname: maemo-optify-deb not found, not optifying."
++ nooptify=true
++ fi
++fi
++
+ if [ -z "$signcommand" ] ; then
+ signsource=:
+ signchanges=:
+@@ -216,6 +227,9 @@
+ if [ x$sourceonly = x ]; then
+ withecho debian/rules build
+ withecho $rootcommand debian/rules $binarytarget
++ if [ x$nooptify != xtrue ]; then
++ withecho $rootcommand maemo-optify-deb --auto
++ fi
+ fi
+ if [ "$usepause" = "true" ] && \
+ ( [ "$signchanges" != ":" ] || ( [ -z "$binaryonly" ] && [ "$signsource" != ":" ] ) ) ; then
_______________________________________________
maemo-developers mailing list
maemo-developers@maemo.org
https://lists.maemo.org/mailman/listinfo/maemo-developers
