Bug#631007: pu: package arcboot/0.3.14+squeeze0
Hi Adam,
thanks for your feedback!
On Sat, Jul 02, 2011 at 04:11:39PM +0100, Adam D. Barratt wrote:
> Hi,
>
> On Sun, 2011-06-19 at 19:18 +0200, Guido Günther wrote:
> > netinstall of MIPS IP22 is currently broken (#630424). This is due to
> > two bugs in tip22: a wrong load address and a discard entry in the
> > linker script. I've prepared 0.3.14+squeeze0 to fix this issue (diff
> > attached). O.k. to upload to stable for the 6.0.3 release?
>
> Apologies for the slight delay in getting back to you, and thanks for
> working on this. Having reviewed the diff, I have a few comments and
> queries.
>
> - The current stable version of arcboot is 0.3.13, so I'd expect this
> update to be 0.3.1_3_+squeeze1 or similar.
>
> - Why does __ARCSBOOT_VERSION__ jump to 0.3.13?
This is generated during build time. We should exclude this file from
the package but I didn't want to make any unnecessary changes.
>
> - Please drop this change:
>
> + * [d2741a1] overrides: remove ./ from paths to catch up with ftp-master
> + changes
O.k, reverted.
>
> ftp-master's lintian checks are only applied to uploads to unstable and
> experimental, so the old override paths aren't a problem; also, packages
> in stable are expected to pass a check from lintian in stable, not
> necessarily from another release.
>
> - Why was the "$(PRINT_LOADADDR)" makefile target dropped?
It's not needed and unused and was part of the same commit.
Will the chroots on the autobuilders be updated to the latest arcboot
before building d-i? Dann raised that issue:
http://lists.debian.org/debian-mips/2011/07/msg00000.html
Find a new diff attached.
Cheers,
-- Guido
>
> > In order to fix #630424 we also need to rebuild d-i on mips.
>
> There's usually (well, frequently) a d-i rebuild on all architectures
> for a point release in any case, if only to pull in a new kernel so that
> new installs don't have to fetch it from security during the install.
>
> Regards,
>
> Adam
>
diff --git a/Makefile b/Makefile
index 4bfb897..28c35ef 100644
--- a/Makefile
+++ b/Makefile
@@ -11,24 +11,26 @@ ifeq ($(SUBARCH),IP22)
KERNELADDR=0x88002000
MAXLOADSIZE=0x1700000
LOADADDR=0x88802000
+TIP_LOADADDR=0x89702000
OUTPUTFORMAT=ecoff-bigmips
endif
ifeq ($(SUBARCH),IP32)
KERNELADDR=0x80004000
MAXLOADSIZE=0x1400000
LOADADDR=0x81404000
+TIP_LOADADDR=$(LOADADDR)
OUTPUTFORMAT=elf32-tradbigmips
endif
# these contain subarch independent files
SUBARCH_INDEP_DIRS= \
- arclib \
- tip22
+ arclib
# these contain subarch dependent files
SUBARCH_DIRS= \
common \
- ext2load
+ ext2load \
+ tip22
define indep-tgt
$(foreach sd,$(SUBARCH_INDEP_DIRS),$(1)-subarch-indep-$(sd))
@@ -63,7 +65,13 @@ $(call dep-tgt,clean)
endef
define submake
-@$(MAKE) -C $(1) SUBARCH=$(SUBARCH) LOADADDR=$(LOADADDR) MAXLOADSIZE=$(MAXLOADSIZE) KERNELADDR=$(KERNELADDR) OUTPUTFORMAT=$(OUTPUTFORMAT) $(2)
+@$(MAKE) -C $(1) SUBARCH=$(SUBARCH) \
+ LOADADDR=$(LOADADDR) \
+ TIP_LOADADDR=$(TIP_LOADADDR) \
+ MAXLOADSIZE=$(MAXLOADSIZE) \
+ KERNELADDR=$(KERNELADDR) \
+ OUTPUTFORMAT=$(OUTPUTFORMAT) \
+ $(2)
endef
diff --git a/common/version.h b/common/version.h
index 8a2150f..bb8207f 100644
--- a/common/version.h
+++ b/common/version.h
@@ -1 +1 @@
-#define __ARCSBOOT_VERSION__ "0.3.9.1"
+#define __ARCSBOOT_VERSION__ "0.3.13"
diff --git a/debian/changelog b/debian/changelog
index 8983afd..0796e96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+arcboot (0.3.14+squeeze0) stable; urgency=low
+
+ * This upload fix the netinstall on IP22 and IP32
+ * [5e61c13] Drop .gnu.att section mapped add VMA 0
+ * [01c99b5] Move the tip22 image to 0x89702000 on IP22 as described in
+ #452798. Thanks to Edwin Kwan for analyzing this.
+ * [399eff1] Fix address substitution for IP32 it was being handled as IP22
+ in tip22
+ * [acd5d82] Cleanup all subarches
+
+ -- Guido Günther <agx@sigxcpu.org> Thu, 16 Jun 2011 23:38:40 +0200
+
arcboot (0.3.13) unstable; urgency=low
[ Florian Lohoff ]
diff --git a/debian/rules b/debian/rules
index e003fda..b8747b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,10 +44,11 @@ clean:
dh_testdir
rm -f build-stamp configure-stamp
- # Add here commands to clean up after the build process.
- $(MAKE) clean
+ $(MAKE) SUBARCH=IP32 clean
+ $(MAKE) SUBARCH=IP22 clean
rm -f arcboot.ip22 arcboot.ip32
+
dh_clean
install: build
@@ -63,7 +64,8 @@ install: build
# install tip22 into debian/tip22
$(MAKE) PREFIX=${PREFIX_TIP22} BINDIR=${BIN_TIP22} LIBDIR=${LIB_TIP22} -C arclib install
- $(MAKE) PREFIX=${PREFIX_TIP22} BINDIR=${BIN_TIP22} LIBDIR=${LIB_TIP22} -C tip22 install
+ $(MAKE) SUBARCH=IP22 PREFIX=${PREFIX_TIP22} BINDIR=${BIN_TIP22} LIBDIR=${LIB_TIP22} -C tip22 install
+ $(MAKE) SUBARCH=IP32 PREFIX=${PREFIX_TIP22} BINDIR=${BIN_TIP22} LIBDIR=${LIB_TIP22} -C tip22 install
# Install lintian overrides
cp debian/arcboot.lintian-overrides $(CURDIR)/debian/arcboot/usr/share/lintian/overrides/arcboot
diff --git a/tip22/Makefile b/tip22/Makefile
index 548371b..16031e5 100644
--- a/tip22/Makefile
+++ b/tip22/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright 2002-2004 Guido Guenther <agx@sigxcpu.org>
+# Copyright 2002-2004,2011 Guido Guenther <agx@sigxcpu.org>
#
ARCLIBDIR = ../arclib
@@ -24,47 +24,27 @@ TARGETS = $(OBJECTS) $(LD_SCRIPTS)
# uncomment for debugging
#CFLAGS+=-DDEBUG
-
-all: ${LIBS} ${BINS}
- @$(MAKE) SUBARCH=IP32 archall
- @$(MAKE) SUBARCH=IP22 archall
-
-archall: $(TARGETS)
-
+all: ${LIBS} ${BINS} $(TARGETS)
$(ARCLIB):
@$(MAKE) -C $(ARCLIBDIR)
-$(PRINT_LOADADDR):
- @$(MAKE) -C $(COMMONDIR) SUBARCH=$(SUBARCH)
-
-
%.$(SUBARCH).o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
%.script.$(SUBARCH): %.script.in
- LOADADDR=$(LOADADDR); \
+ LOADADDR=$(TIP_LOADADDR); \
OUTPUTFORMAT=$(OUTPUTFORMAT); \
sed -e "s/@@LOADADDR@@/$$LOADADDR/" \
-e "s/@@OUTPUTFORMAT@@/$$OUTPUTFORMAT/" <$< >$@
clean:
- @$(MAKE) SUBARCH=IP32 archclean
- @$(MAKE) SUBARCH=IP22 archclean
rm -f tags *~
-
-archclean:
- @$(MAKE) -C $(ARCLIBDIR) clean
- @$(MAKE) -C $(COMMONDIR) clean
rm -f $(TARGETS)
install: all
install -d ${PREFIX}/${BINDIR}
install -m 755 ${BINS} ${PREFIX}/${BINDIR}
- @$(MAKE) SUBARCH=IP32 archinstall
- @$(MAKE) SUBARCH=IP22 archinstall
-
-archinstall:
$(foreach tg,$(TARGETS),install -m 644 $(tg) ${PREFIX}/${LIBDIR};)
diff --git a/tip22/ld.script.in b/tip22/ld.script.in
index 4f5597c..67502ab 100644
--- a/tip22/ld.script.in
+++ b/tip22/ld.script.in
@@ -74,5 +74,6 @@ SECTIONS
*(.comment*)
*(.gptab*)
*(.note)
+ *(.gnu.att*)
}
}
Reply to: