Something in this change has broken the majority of i386 daily build images. Apparently it fails to remove the System.map from boot. Thiemo Seufer wrote: > Author: ths-guest > Date: Sun Apr 25 20:18:56 2004 > New Revision: 14414 > > Modified: > trunk/installer/build/Makefile > trunk/installer/debian/changelog > Log: > Cleanup the Makefile's System.map handling. > > > Modified: trunk/installer/build/Makefile > ============================================================================== > --- trunk/installer/build/Makefile (original) > +++ trunk/installer/build/Makefile Sun Apr 25 20:18:56 2004 > @@ -311,33 +311,24 @@ > rm -f $(DPKGDIR)/available $(DPKGDIR)/*-old $(DPKGDIR)/lock > > ifdef KERNELVERSION > -ifdef VERSIONED_SYSTEM_MAP > # Set up modules.dep, ensure there is at least one standard dir (kernel > # in this case), so depmod will use its prune list for archs with no > # modules. > # > set -e; \ > + if [ -n "$(VERSIONED_SYSTEM_MAP)" ]; then \ > + [ ! -e $(TREE)/boot/System.map-$(VERSION) ] || sysmap_name="$(TREE)/boot/System.map-$(VERSION)"; \ > + else \ > + [ ! -e $(TREE)/boot/System.map ] || sysmap_name="$(TREE)/boot/System.map"; \ > + fi; \ > + [ -n "$$sysmap_name" ] || sysmap_opt="-F $$sysmap_name"; \ > $(foreach VERSION,$(KERNELVERSION), \ > if [ -d $(TREE)/lib/modules/$(VERSION) ]; then \ > - mkdir -p $(TREE)/lib/modules/$(VERSION)/kernel; \ > - if [ -e $(TREE)/boot/System.map-$(VERSION) ]; then \ > - $(shell ./choose-subarch-env $(VERSION)) depmod -F $(TREE)/boot/System.map-$(VERSION) -q -a -b $(TREE)/ $(VERSION); \ > - mv $(TREE)/boot/System.map-$(VERSION) $(TEMP); \ > - else \ > - $(shell ./choose-subarch-env $(VERSION)) depmod -q -a -b $(TREE)/ $(VERSION); \ > - fi;fi;) > -else > - set -e; \ > - $(foreach VERSION,$(KERNELVERSION), \ > - if [ -d $(TREE)/lib/modules/$(VERSION) ]; then \ > - mkdir -p $(TREE)/lib/modules/$(VERSION)/kernel; \ > - if [ -e $(TREE)/boot/System.map ]; then \ > - $(shell ./choose-subarch-env $(VERSION)) depmod -F $(TREE)/boot/System.map -q -a -b $(TREE)/ $(VERSION); \ > - mv $(TREE)/boot/System.map $(TEMP); \ > - else \ > - $(shell ./choose-subarch-env $(VERSION)) depmod -q -a -b $(TREE)/ $(VERSION); \ > - fi;fi;) > -endif > + mkdir -p $(TREE)/lib/modules/$(VERSION)/kernel; \ > + $(shell ./choose-subarch-env $(VERSION)) depmod $$sysmap_opt -q -a -b $(TREE)/ $(VERSION); \ > + fi; \ > + [ -n "$$sysmap_name" ] || mv $(TREE)/boot/System.map-$(VERSION) $(TEMP)) > + > # These files depmod makes are used by hotplug, and we shouldn't > # need them, yet anyway. > find $(TREE)/lib/modules/ -name 'modules*' \ > > Modified: trunk/installer/debian/changelog > ============================================================================== > --- trunk/installer/debian/changelog (original) > +++ trunk/installer/debian/changelog Sun Apr 25 20:18:56 2004 > @@ -1,11 +1,12 @@ > debian-installer (20040425) UNRELEASED; urgency=low > > * Bastian Blank > - - busybox is not longer kernel dependend. > + - busybox is not longer kernel dependent. > - Only call depmod if there are modules in the tree. > - Make TEMP and DEST resolvable in the config. > * Thiemo Seufer > - mips config cleanup, no changes in behaviour. > + - Cleanup the Makefile's System.map handling. > > -- Bastian Blank <waldi@debian.org> Sun, 25 Apr 2004 11:21:52 +0200 > > -- see shy jo
Attachment:
signature.asc
Description: Digital signature