diff --git a/config.mk b/config.mk index e4c8f538e..442509623 100644 --- a/config.mk +++ b/config.mk @@ -64,6 +64,7 @@ CENTOS_MINOR:=5 CENTOS_RELEASE:=$(CENTOS_MAJOR).$(CENTOS_MINOR) CENTOS_ARCH:=x86_64 UBUNTU_RELEASE:=precise +UBUNTU_INSTALLER_KERNEL_VERSION:=3.11.0-18 # Rebuld packages locally (do not use upstream versions) # This option is depricated, because there are no upstream versions diff --git a/mirror/ubuntu/createchroot.mk b/mirror/ubuntu/createchroot.mk index 0d680046c..54f24d9a9 100644 --- a/mirror/ubuntu/createchroot.mk +++ b/mirror/ubuntu/createchroot.mk @@ -1,8 +1,3 @@ - -di_initrd_img:=$(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/installer-amd64/current/images/netboot/ubuntu-installer/amd64/initrd.gz -di_kernel_modules_dir=$(shell zcat $(di_initrd_img) | cpio --list 'lib/modules/*/kernel') -UBUNTU_INSTALLER_KERNEL_VERSION=$(strip $(patsubst lib/modules/%/kernel,%,$(di_kernel_modules_dir))) - $(BUILD_DIR)/mirror/ubuntu/createchroot.done: mkdir -p $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot mkdir -p $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/proc diff --git a/mirror/ubuntu/files/mkrepo.sh b/mirror/ubuntu/files/mkrepo.sh index c594bb15f..c69509527 100644 --- a/mirror/ubuntu/files/mkrepo.sh +++ b/mirror/ubuntu/files/mkrepo.sh @@ -17,11 +17,6 @@ fi mkdir -p /repo/download/ -cat >> /requirements.txt << EOF -linux-image-${UBUNTU_INSTALLER_KERNEL_VERSION} -linux-headers-${UBUNTU_INSTALLER_KERNEL_VERSION} -EOF - cat /requirements-deb.txt | while read pkg; do apt-get --print-uris --yes install $pkg | grep ^\' | cut -d\' -f2 >/downloads_$pkg.list; done cat /downloads_*.list | sort | uniq > /repo/download/download_urls.list rm /downloads_*.list diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk index a8d5fdd9a..5bdd022b7 100644 --- a/mirror/ubuntu/module.mk +++ b/mirror/ubuntu/module.mk @@ -12,7 +12,3 @@ $(BUILD_DIR)/mirror/ubuntu/build.done: \ $(BUILD_DIR)/mirror/ubuntu/boot.done \ $(BUILD_DIR)/mirror/ubuntu/createchroot.done $(ACTION.TOUCH) - - -# XXX: createchroot needs to know the d-i kernel version -$(BUILD_DIR)/mirror/ubuntu/createchroot.done: $(BUILD_DIR)/mirror/ubuntu/boot.done diff --git a/requirements-deb.txt b/requirements-deb.txt index adb4db7c5..d1e7483b2 100644 --- a/requirements-deb.txt +++ b/requirements-deb.txt @@ -511,6 +511,8 @@ libyaml-0-2 libzmq1 linux-firmware linux-firmware-nonfree +linux-headers-3.11.0-18 +linux-image-3.11.0-18 linux-libc-dev linux-server lksctp-tools