Merge experimental sparc32 changes from Jurij: r5717 r5718 r5721 r5722 r5723 r5724
svn path=/dists/exp/linux-2.6/; revision=5730
This commit is contained in:
commit
19c48c258d
File diff suppressed because it is too large
Load Diff
|
@ -1,16 +1,27 @@
|
||||||
[base]
|
[base]
|
||||||
depends: initramfs-tools | yaird | linux-initramfs-tool
|
depends: initramfs-tools | yaird | linux-initramfs-tool
|
||||||
flavours:
|
flavours:
|
||||||
|
sparc32
|
||||||
sparc64
|
sparc64
|
||||||
sparc64-smp
|
sparc64-smp
|
||||||
|
suggests: silo, fdutils
|
||||||
|
|
||||||
|
[sparc32]
|
||||||
|
kernel-arch: sparc
|
||||||
|
kernel-subarch: sparc
|
||||||
|
kernel-headers-dirs: sparc
|
||||||
|
image-postproc: strip -R .comment -R .note -K sun4u_init -K _end -K _start arch/sparc/boot/image
|
||||||
|
class: uniprocessor sparc32 (sun4m) machines
|
||||||
|
|
||||||
|
[sparc64]
|
||||||
kernel-arch: sparc64
|
kernel-arch: sparc64
|
||||||
kpkg-subarch: sparc64
|
kpkg-subarch: sparc64
|
||||||
kernel-header-dirs: sparc64
|
kernel-header-dirs: sparc64
|
||||||
suggests: silo, fdutils
|
|
||||||
|
|
||||||
[sparc64]
|
|
||||||
class: uniprocessor 64-bit UltraSPARC class
|
class: uniprocessor 64-bit UltraSPARC class
|
||||||
|
|
||||||
[sparc64-smp]
|
[sparc64-smp]
|
||||||
|
kernel-arch: sparc64
|
||||||
|
kpkg-subarch: sparc64
|
||||||
|
kernel-header-dirs: sparc64
|
||||||
class: multi-processor 64-bit UltraSPARC class
|
class: multi-processor 64-bit UltraSPARC class
|
||||||
|
|
||||||
|
|
|
@ -83,6 +83,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
||||||
('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
|
('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
|
||||||
('kpkg-arch', 'KPKG_ARCH'),
|
('kpkg-arch', 'KPKG_ARCH'),
|
||||||
('kpkg-subarch', 'KPKG_SUBARCH'),
|
('kpkg-subarch', 'KPKG_SUBARCH'),
|
||||||
|
('image-postproc', 'IMAGE_POSTPROC'),
|
||||||
('type', 'TYPE'),
|
('type', 'TYPE'),
|
||||||
):
|
):
|
||||||
if config_entry.has_key(i[0]):
|
if config_entry.has_key(i[0]):
|
||||||
|
|
|
@ -128,9 +128,6 @@ $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH
|
||||||
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
|
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
|
||||||
ln -fs "$$(command -v touch)" debian/build/touch.orig
|
ln -fs "$$(command -v touch)" debian/build/touch.orig
|
||||||
cd '$(DIR)'; $(setup_env) PATH='$(CURDIR)/build:$(CURDIR)/bin:$(PATH)' $(kpkg_image) build
|
cd '$(DIR)'; $(setup_env) PATH='$(CURDIR)/build:$(CURDIR)/bin:$(PATH)' $(kpkg_image) build
|
||||||
ifdef image_postproc
|
|
||||||
cd '$(DIR)'; $(image_postproc)
|
|
||||||
endif
|
|
||||||
touch '$@'
|
touch '$@'
|
||||||
|
|
||||||
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
|
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
|
||||||
|
@ -165,6 +162,9 @@ install-doc: $(STAMPS_DIR)/source
|
||||||
cd '$(DIR)' && $(setup_env) make-kpkg --stem linux \
|
cd '$(DIR)' && $(setup_env) make-kpkg --stem linux \
|
||||||
--config defconfig kernel-manual
|
--config defconfig kernel-manual
|
||||||
cat '$(DIR)/debian/files' >> debian/files
|
cat '$(DIR)/debian/files' >> debian/files
|
||||||
|
ifdef IMAGE_POSTPROC
|
||||||
|
cd '$(DIR)'; $(IMAGE_POSTPROC)
|
||||||
|
endif
|
||||||
@for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do \
|
@for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do \
|
||||||
echo "mv \"$(BUILD_DIR)/$$i\" .."; \
|
echo "mv \"$(BUILD_DIR)/$$i\" .."; \
|
||||||
mv "$(BUILD_DIR)/$$i" ..; \
|
mv "$(BUILD_DIR)/$$i" ..; \
|
||||||
|
@ -187,6 +187,9 @@ install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBAR
|
||||||
install debian/bin/install-image '$(DIR)/debian/post-install'
|
install debian/bin/install-image '$(DIR)/debian/post-install'
|
||||||
cd '$(DIR)'; $(setup_env) $(kpkg_image) kernel-image
|
cd '$(DIR)'; $(setup_env) $(kpkg_image) kernel-image
|
||||||
cat '$(DIR)/debian/files' >> debian/files
|
cat '$(DIR)/debian/files' >> debian/files
|
||||||
|
ifdef IMAGE_POSTPROC
|
||||||
|
cd '$(DIR)'; $(IMAGE_POSTPROC)
|
||||||
|
endif
|
||||||
@for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do \
|
@for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do \
|
||||||
echo "mv \"$(BUILD_DIR)/$$i\" .."; \
|
echo "mv \"$(BUILD_DIR)/$$i\" .."; \
|
||||||
mv "$(BUILD_DIR)/$$i" ..; \
|
mv "$(BUILD_DIR)/$$i" ..; \
|
||||||
|
|
Loading…
Reference in New Issue