Re: uboot-envtools and uboot-mkimage
I incorporated Julien's change suggestions (thanks for the review). Is it ok to upload uboot-envtools now? (Debdiff attached.) Best, Per uboot-envtools_20081215-2-3.debdiff Description: Binary data
Re: uboot-envtools and uboot-mkimage
On Sun, Aug 29, 2010 at 14:33:33 +0200, Per Andersson wrote: I incorporated Julien's change suggestions (thanks for the review). Is it ok to upload uboot-envtools now? (Debdiff attached.) I'm not sure why you call db_register from .config? Looks ok otherwise, should be ok to upload, gather translations, and then get it into squeeze. Cheers, Julien signature.asc Description: Digital signature
Re: uboot-envtools and uboot-mkimage
Le lundi 16 août 2010 à 23:25 +0100, Martin Michlmayr a écrit : * Per Andersson avtob...@gmail.com [2010-08-16 23:15]: Regarding uboot-mkimage and the proposed NMU or adoption. Is it Now that we have u-boot in Debian, maybe uboot-mkimage can be generated from the u-boot source package. u-boot, uboot-envtools and uboot-mkimage could be generated from the same source package, yes. Also, I'm not convinced that we should add an option in Debian that has not been approved in Debian. Is this option even necessary? If I understand correctly what you're trying to do, you can achieve the same by pading the image before running mkimage over it. Does this not work? (not been approved in upstream, you mean?) Well, yes, we can achieve the same thing by padding the image before running mkimage over it, it should work just the same, but it's still something related to u-boot images, and I don't really see why it shouldn't go there. Maybe I should ask upstream, maybe I should do the padding myself before the mkimage call, at several places. signature.asc Description: This is a digitally signed message part
Re: uboot-envtools and uboot-mkimage
On Sun, Aug 15, 2010 at 11:59 PM, Philipp Kern pk...@debian.org wrote: On 08/15/2010 11:40 PM, Per Andersson wrote: On Fri, Aug 13, 2010 at 8:29 PM, Adam D. Barratt a...@adam-barratt.org.uk wrote: On Fri, 2010-08-13 at 04:29 +0200, Per Andersson wrote: Thibaut Girka is working on Debian Installer for the Openmoko FreeRunner for Summer of Code with Debian. In order for this to work on Squeeze a patch is needed for uboot-envtools, which I maintain. In the packaging git repository I have prepared a bump in debian package revision from -2 to -3 for uboot-envtools, which includes the patch. Please could you let us see a debdiff for the proposed upload? avtob...@pong:~/debian/packages/pkg-fso$ debdiff /var/cache/apt/archives/uboot-envtools_20081215-2_i386.deb uboot-envtools_20081215-3_i386.deb [The following lists of changes regard files as different if they have different names, permissions or owners.] Could you please actually debdiff the dscs? debdiff'ing the debs is not really helpful for reviewing. Sorry, debdiff of dscs attached. Thanks for your hard work! -- Per uboot-envtools_20081215.debdiff Description: Binary data
Re: uboot-envtools and uboot-mkimage
On Mon, Aug 16, 2010 at 7:09 PM, Per Andersson avtob...@gmail.com wrote: On Sun, Aug 15, 2010 at 11:59 PM, Philipp Kern pk...@debian.org wrote: On 08/15/2010 11:40 PM, Per Andersson wrote: On Fri, Aug 13, 2010 at 8:29 PM, Adam D. Barratt a...@adam-barratt.org.uk wrote: On Fri, 2010-08-13 at 04:29 +0200, Per Andersson wrote: Thibaut Girka is working on Debian Installer for the Openmoko FreeRunner for Summer of Code with Debian. In order for this to work on Squeeze a patch is needed for uboot-envtools, which I maintain. In the packaging git repository I have prepared a bump in debian package revision from -2 to -3 for uboot-envtools, which includes the patch. Please could you let us see a debdiff for the proposed upload? avtob...@pong:~/debian/packages/pkg-fso$ debdiff /var/cache/apt/archives/uboot-envtools_20081215-2_i386.deb uboot-envtools_20081215-3_i386.deb [The following lists of changes regard files as different if they have different names, permissions or owners.] Could you please actually debdiff the dscs? debdiff'ing the debs is not really helpful for reviewing. Sorry, debdiff of dscs attached. I realized that the diff is probably way too big. I removed at least half of the debdiff, attached. Regarding uboot-mkimage and the proposed NMU or adoption. Is it possible to adopt the package now or should I wait? Attaching debdiff for uboot-mkimage (NMU), only difference in the case of adoption would of course be me as maintainer. -- Per uboot-envtools_20081215.debdiff Description: Binary data uboot-mkimage-0.4-broken-uboot-compat.debdiff Description: Binary data
Re: uboot-envtools and uboot-mkimage
On Mon, Aug 16, 2010 at 23:15:34 +0200, Per Andersson wrote:
--- uboot-envtools-20081215.orig/debian/uboot-envtools.postrm
+++ uboot-envtools-20081215/debian/uboot-envtools.postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+rm -f /etc/fw_env.config
+
+#DEBHELPER#
postrm can't rely on debconf being installed. dh_installdebconf's
snippet already handles this correctly, so you should remove the
inclusion of confmodule here.
only in patch2:
unchanged:
--- uboot-envtools-20081215.orig/debian/uboot-envtools.postinst
+++ uboot-envtools-20081215/debian/uboot-envtools.postinst
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+[ ! -f /etc/fw_env.config ] || exit 0 # bail if already configured
+
+db_get uboot-envtools/machine || true
+machine=$RET
+
+if [ $machine = Automatic ]; then
+machine=$(sed -n '/^Hardware/ {s/^Hardware\s*:\s*//;p}' /proc/cpuinfo)
+fi
+
+case $machine in
+Kurobox Pro | Buffalo/Revogear Kurobox Pro)
+file=kurobox_pro.config
+;;
+Linkstation Pro Live | Buffalo Linkstation Pro/Live)
+file=linkstation_pro_live.config
+;;
+Linkstation 2)
+file=lsmipsel.config
+;;
+Linkstation HG)
+file=lsppchg.config
+;;
+Openmoko Neo 1973 (GTA01) | GTA01)
+file=openmoko_gta01.config
+;;
+Openmoko FreeRunner (GTA02) | GTA02)
+file=openmoko_gta02.config
+;;
+QNAP TS-101)
+file=qnap_ts101.config
+;;
+QNAP TS-109/TS-209)
+file=qnap_ts109-209.config
+;;
+QNAP TS-119/TS-219)
+file=qnap_ts119-219.config
+;;
+*) # Do not configure
+exit 0
+;;
Why is this not done in .config, where you can set the default choice
before asking the question, instead of having an automatic choice
which just defers this?
+esac
+
+cp /usr/share/doc/uboot-envtools/examples/$file /etc/fw_env.config
+
+#DEBHELPER#
only in patch2:
unchanged:
--- uboot-envtools-20081215.orig/debian/uboot-envtools.config
+++ uboot-envtools-20081215/debian/uboot-envtools.config
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+[ ! -f /etc/fw_env.config ] || exit 0 # bail if already configured
+
+# select machine/file
+db_input low uboot-envtools/machine || true
+db_go || true
+
+exit 0
[...]
Cheers,
Julien
signature.asc
Description: Digital signature
Re: uboot-envtools and uboot-mkimage
* Per Andersson avtob...@gmail.com [2010-08-16 23:15]: Regarding uboot-mkimage and the proposed NMU or adoption. Is it Now that we have u-boot in Debian, maybe uboot-mkimage can be generated from the u-boot source package. Also, I'm not convinced that we should add an option in Debian that has not been approved in Debian. Is this option even necessary? If I understand correctly what you're trying to do, you can achieve the same by pading the image before running mkimage over it. Does this not work? -- Martin Michlmayr http://www.cyrius.com/ -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20100816222519.ga14...@jirafa.cyrius.com
Re: uboot-envtools and uboot-mkimage
* Per Andersson avtob...@gmail.com [2010-08-17 00:29]: Yes I have been thinking the same. Probably both uboot-mkimage and uboot-envtools can be generated from the u-boot source package. Should this merge be done now or for squeeze+1? imho it can wait for squeeze+1. -- Martin Michlmayr http://www.cyrius.com/ -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20100816223236.gc14...@jirafa.cyrius.com
Re: uboot-envtools and uboot-mkimage
On Tue, Aug 17, 2010 at 12:04 AM, Julien Cristau jcris...@debian.org wrote:
On Mon, Aug 16, 2010 at 23:15:34 +0200, Per Andersson wrote:
--- uboot-envtools-20081215.orig/debian/uboot-envtools.postrm
+++ uboot-envtools-20081215/debian/uboot-envtools.postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+rm -f /etc/fw_env.config
+
+#DEBHELPER#
postrm can't rely on debconf being installed. dh_installdebconf's
snippet already handles this correctly, so you should remove the
inclusion of confmodule here.
Ok.
only in patch2:
unchanged:
--- uboot-envtools-20081215.orig/debian/uboot-envtools.postinst
+++ uboot-envtools-20081215/debian/uboot-envtools.postinst
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+[ ! -f /etc/fw_env.config ] || exit 0 # bail if already configured
+
+db_get uboot-envtools/machine || true
+machine=$RET
+
+if [ $machine = Automatic ]; then
+ machine=$(sed -n '/^Hardware/ {s/^Hardware\s*:\s*//;p}' /proc/cpuinfo)
+fi
+
+case $machine in
+ Kurobox Pro | Buffalo/Revogear Kurobox Pro)
+ file=kurobox_pro.config
+ ;;
+ Linkstation Pro Live | Buffalo Linkstation Pro/Live)
+ file=linkstation_pro_live.config
+ ;;
+ Linkstation 2)
+ file=lsmipsel.config
+ ;;
+ Linkstation HG)
+ file=lsppchg.config
+ ;;
+ Openmoko Neo 1973 (GTA01) | GTA01)
+ file=openmoko_gta01.config
+ ;;
+ Openmoko FreeRunner (GTA02) | GTA02)
+ file=openmoko_gta02.config
+ ;;
+ QNAP TS-101)
+ file=qnap_ts101.config
+ ;;
+ QNAP TS-109/TS-209)
+ file=qnap_ts109-209.config
+ ;;
+ QNAP TS-119/TS-219)
+ file=qnap_ts119-219.config
+ ;;
+ *) # Do not configure
+ exit 0
+ ;;
Why is this not done in .config, where you can set the default choice
before asking the question, instead of having an automatic choice
which just defers this?
Do you mean that I should guess the Hardware, if possible, and
then let the default selection in the list be whatever was guessed?
--
Per
--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/aanlktinsjruuxf6-bvsd+ejkv_dkqdtxhkpbovy29...@mail.gmail.com
Re: uboot-envtools and uboot-mkimage
On Tue, Aug 17, 2010 at 12:25 AM, Martin Michlmayr t...@cyrius.com wrote: * Per Andersson avtob...@gmail.com [2010-08-16 23:15]: Regarding uboot-mkimage and the proposed NMU or adoption. Is it Now that we have u-boot in Debian, maybe uboot-mkimage can be generated from the u-boot source package. Yes I have been thinking the same. Probably both uboot-mkimage and uboot-envtools can be generated from the u-boot source package. Should this merge be done now or for squeeze+1? Also, I'm not convinced that we should add an option in Debian that has not been approved in Debian. Is this option even necessary? If I understand correctly what you're trying to do, you can achieve the same by pading the image before running mkimage over it. Does this not work? Thibaut, do you have any comments? -- Per -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/aanlktimz5epv-kg9tnkwtdctg7fstnjkszndhnk2s...@mail.gmail.com
Re: uboot-envtools and uboot-mkimage
On Fri, Aug 13, 2010 at 8:29 PM, Adam D. Barratt
a...@adam-barratt.org.uk wrote:
On Fri, 2010-08-13 at 04:29 +0200, Per Andersson wrote:
Thibaut Girka is working on Debian Installer for the Openmoko FreeRunner
for Summer of Code with Debian. In order for this to work on Squeeze a
patch is needed for uboot-envtools, which I maintain.
In the packaging git repository I have prepared a bump in debian package
revision from -2 to -3 for uboot-envtools, which includes the patch.
Please could you let us see a debdiff for the proposed upload?
avtob...@pong:~/debian/packages/pkg-fso$ debdiff
/var/cache/apt/archives/uboot-envtools_20081215-2_i386.deb
uboot-envtools_20081215-3_i386.deb
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .deb but not in first
-
-rw-r--r-- root/root DEBIAN/templates
-rwxr-xr-x root/root DEBIAN/config
-rwxr-xr-x root/root DEBIAN/postinst
-rwxr-xr-x root/root DEBIAN/postrm
Control files: lines which differ (wdiff format)
Depends: libc6 (= [-2.1)-] {+2.1), debconf (= 0.5) | debconf-2.0+}
Description: read/modify the environment for the [-bootloader-] U-Boot
{+boot loader+}
[-bootloader U-Boot.-]
{+U-Boot boot loader.+}
Installed-Size: [-128-] {+152+}
Version: [-20081215-2-] {+20081215-3+}
Excerpt from the changelog for the proposed upload
uboot-envtools (20081215-3) unstable; urgency=low
* debian/control: improved language in description.
* debian/control: bumped standards-version to 3.8.2.
* lsmipsel.config: corrected device name (Closes: #540361).
* uboot-envtools.postinst: corrected Linkstation 2 name.
* Added directories to be created.
* Added uboot-envedit script (Closes: #540039).
* debian/README.source: new file
* Introduced automatic device configuration.
-- Per Andersson avtob...@gmail.com Thu, 12 Aug 2010 00:22:47 +0200
Also, we need to do a NMU for uboot-mkimage in order to introduce a
simple patch that fixes padding on images for broken U-Boot versions.
Have you talked to the maintainer of record about this? I see that the
patch is in #584166 which he replied to in June saying he would have a
look.
Yes I have. The maintainer is happy to actually orphan the package
due to lack of time.
Best,
Per
--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/aanlktimc5ns4hprxcksvoutdoy89fkzkaeha3sjiy...@mail.gmail.com
Re: uboot-envtools and uboot-mkimage
On 08/15/2010 11:40 PM, Per Andersson wrote: On Fri, Aug 13, 2010 at 8:29 PM, Adam D. Barratt a...@adam-barratt.org.uk wrote: On Fri, 2010-08-13 at 04:29 +0200, Per Andersson wrote: Thibaut Girka is working on Debian Installer for the Openmoko FreeRunner for Summer of Code with Debian. In order for this to work on Squeeze a patch is needed for uboot-envtools, which I maintain. In the packaging git repository I have prepared a bump in debian package revision from -2 to -3 for uboot-envtools, which includes the patch. Please could you let us see a debdiff for the proposed upload? avtob...@pong:~/debian/packages/pkg-fso$ debdiff /var/cache/apt/archives/uboot-envtools_20081215-2_i386.deb uboot-envtools_20081215-3_i386.deb [The following lists of changes regard files as different if they have different names, permissions or owners.] Could you please actually debdiff the dscs? debdiff'ing the debs is not really helpful for reviewing. Kind regards, Philipp Kern -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4c686331.7060...@debian.org
Re: uboot-envtools and uboot-mkimage
On Fri, 2010-08-13 at 04:29 +0200, Per Andersson wrote: Thibaut Girka is working on Debian Installer for the Openmoko FreeRunner for Summer of Code with Debian. In order for this to work on Squeeze a patch is needed for uboot-envtools, which I maintain. In the packaging git repository I have prepared a bump in debian package revision from -2 to -3 for uboot-envtools, which includes the patch. Please could you let us see a debdiff for the proposed upload? Also, we need to do a NMU for uboot-mkimage in order to introduce a simple patch that fixes padding on images for broken U-Boot versions. Have you talked to the maintainer of record about this? I see that the patch is in #584166 which he replied to in June saying he would have a look. Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1281724177.23621.213.ca...@kaa.jungle.aubergine.my-net-space.net
uboot-envtools and uboot-mkimage
Hi! Thibaut Girka is working on Debian Installer for the Openmoko FreeRunner for Summer of Code with Debian. In order for this to work on Squeeze a patch is needed for uboot-envtools, which I maintain. In the packaging git repository I have prepared a bump in debian package revision from -2 to -3 for uboot-envtools, which includes the patch. Also, we need to do a NMU for uboot-mkimage in order to introduce a simple patch that fixes padding on images for broken U-Boot versions. Since I don't know I ask: What is the procedure now? Should we upload the packages and then ping the release team? Thanks for all the great work you do! -- Per -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/aanlktinwyezvr89timkwrweqefnin68frefnwrhcr...@mail.gmail.com
