openstack
/
fuel-main
Code Issues Proposed changes

Merge "Fix ISO build process for CentOS7"

This commit is contained in:
Jenkins 2015-12-04 14:31:37 +00:00 committed by Gerrit Code Review
parent b0fd14ba10 4853b7da21
commit 693f475119
11 changed files with 80 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bootstrap/module.mk
View File

@ -97,7 +97,7 @@ endef
#FIXME Partial-Bug: #1403088 #FIXME Partial-Bug: #1403088
YUM:=sudo yum -c $(BUILD_DIR)/bootstrap/etc/yum.conf --exclude=ruby-2.1.1 --exclude=ruby21 --installroot=$(INITRAMROOT) -y --nogpgcheck YUM:=sudo yum -c $(BUILD_DIR)/bootstrap/etc/yum.conf --exclude=ruby-2.1.1 --exclude=ruby21 --installroot=$(INITRAMROOT) -y --nogpgcheck
KERNEL_PATTERN:=kernel-lt-3.10.* KERNEL_PATTERN:=kernel-3.10.0*
KERNEL_FIRMWARE_PATTERN:=linux-firmware* KERNEL_FIRMWARE_PATTERN:=linux-firmware*
clean: clean-bootstrap clean: clean-bootstrap
@ -114,7 +114,7 @@ $(BUILD_DIR)/bootstrap/initramfs.img: \
$(BUILD_DIR)/bootstrap/linux: $(BUILD_DIR)/mirror/centos/build.done $(BUILD_DIR)/bootstrap/linux: $(BUILD_DIR)/mirror/centos/build.done
mkdir -p $(BUILD_DIR)/bootstrap mkdir -p $(BUILD_DIR)/bootstrap
find $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) -name '$(KERNEL_PATTERN)' | xargs rpm2cpio | \ find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name '$(KERNEL_PATTERN)' | xargs rpm2cpio | \
(cd $(BUILD_DIR)/bootstrap/; cpio -imd './boot/vmlinuz*') (cd $(BUILD_DIR)/bootstrap/; cpio -imd './boot/vmlinuz*')
mv $(BUILD_DIR)/bootstrap/boot/vmlinuz* $(BUILD_DIR)/bootstrap/linux mv $(BUILD_DIR)/bootstrap/boot/vmlinuz* $(BUILD_DIR)/bootstrap/linux
rm -r $(BUILD_DIR)/bootstrap/boot rm -r $(BUILD_DIR)/bootstrap/boot
@ -213,9 +213,9 @@ $(BUILD_DIR)/bootstrap/prepare-initram-root.done: \
# Perhaps this stuff should be moved to global config.mk # Perhaps this stuff should be moved to global config.mk
# Installing kernel modules # Installing kernel modules
find $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) -name '$(KERNEL_PATTERN)' | xargs rpm2cpio | \ find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name '$(KERNEL_PATTERN)' | xargs rpm2cpio | \
( cd $(INITRAMROOT); sudo cpio -idm './lib/modules/*' './boot/vmlinuz*' ) ( cd $(INITRAMROOT); sudo cpio -idm './lib/modules/*' './boot/vmlinuz*' )
find $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) -name '$(KERNEL_FIRMWARE_PATTERN)' | xargs rpm2cpio | \ find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name '$(KERNEL_FIRMWARE_PATTERN)' | xargs rpm2cpio | \
( cd $(INITRAMROOT); sudo cpio -idm './lib/firmware/*' ) ( cd $(INITRAMROOT); sudo cpio -idm './lib/firmware/*' )
find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name 'libmlx4*' | xargs rpm2cpio | \ find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name 'libmlx4*' | xargs rpm2cpio | \
( cd $(INITRAMROOT); sudo cpio -idm './etc/*' './usr/lib64/*' ) ( cd $(INITRAMROOT); sudo cpio -idm './etc/*' './usr/lib64/*' )

2
iso/.treeinfo
View File

@ -17,4 +17,4 @@ kernel = images/pxeboot/vmlinuz
initrd = images/pxeboot/initrd.img initrd = images/pxeboot/initrd.img
[stage2] [stage2]
mainimage = images/install.img mainimage = LiveOS/squashfs.img

13
iso/isolinux/isolinux.cfg
View File

@ -15,13 +15,18 @@ menu color hotsel 0 #ff000000 #ffffffff
menu color hotkey 7 #ffffffff #ff000000 menu color hotkey 7 #ffffffff #ff000000
menu color scrollbar 0 #ffffffff #00000000 menu color scrollbar 0 #ffffffff #00000000
label nailgunstatic label nailgun
menu label DVD Fuel Install (^Static IP) menu label ^1. Fuel Install (Static IP)
menu default menu default
kernel vmlinuz kernel vmlinuz
append initrd=initrd.img biosdevname=0 ks=cdrom:/ks.cfg ip=10.20.0.2 gw=10.20.0.1 dns1=10.20.0.1 netmask=255.255.255.0 hostname=fuel.domain.tld showmenu=yes append initrd=initrd.img net.ifnames=0 biosdevname=0 ks=hd:sr0:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: dns1=10.20.0.1 selinux=0
label nailgunifname
menu label ^2. Fuel Advanced Install (Static IP)
kernel vmlinuz
append initrd=initrd.img ks=hd:sr0:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:adminif:off::: dns1=10.20.0.1 selinux=0 ifname=adminif:XX:XX:XX:XX:XX:XX
label usbboot label usbboot
menu label USB Fuel Install (S^tatic IP) menu label ^3. USB Fuel Install (Static IP)
kernel vmlinuz kernel vmlinuz
append initrd=initrd.img biosdevname=0 repo=hd:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ ks=hd:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2 gw=10.20.0.1 dns1=10.20.0.1 netmask=255.255.255.0 hostname=fuel.domain.tld showmenu=yes append initrd=initrd.img biosdevname=0 repo=hd:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ ks=hd:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2 gw=10.20.0.1 dns1=10.20.0.1 netmask=255.255.255.0 hostname=fuel.domain.tld showmenu=yes

10
iso/module.mk
View File

@ -241,8 +241,8 @@ $(ISO_PATH): $(BUILD_DIR)/iso/isoroot.done
mkdir -p $(BUILD_DIR)/iso/efi_tmp/efi_image mkdir -p $(BUILD_DIR)/iso/efi_tmp/efi_image
# We need to have a partition which will be pointed from ISO as efi partition # We need to have a partition which will be pointed from ISO as efi partition
# vmlinuz + initrd + bootloader + conffile = about 38MB # vmlinuz + initrd + bootloader + conffile = about 38MB. 100M should be enough ^_^
dd bs=1M count=40 if=/dev/zero of=$(BUILD_DIR)/iso/efi_tmp/efiboot.img dd bs=1M count=100 if=/dev/zero of=$(BUILD_DIR)/iso/efi_tmp/efiboot.img
# UEFI standard say to us that EFI partition should be some FAT-related filesystem # UEFI standard say to us that EFI partition should be some FAT-related filesystem
mkfs.vfat $(BUILD_DIR)/iso/efi_tmp/efiboot.img mkfs.vfat $(BUILD_DIR)/iso/efi_tmp/efiboot.img
sudo umount -l $(BUILD_DIR)/iso/efi_tmp/efi_image || true sudo umount -l $(BUILD_DIR)/iso/efi_tmp/efi_image || true
@ -253,7 +253,7 @@ $(ISO_PATH): $(BUILD_DIR)/iso/isoroot.done
# bootloader and it conffiles in /EFI/BOOT/* on main ISO partition (with ISO9660 fs) # bootloader and it conffiles in /EFI/BOOT/* on main ISO partition (with ISO9660 fs)
echo > $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf echo > $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf
echo "default=0" >> $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf echo "default=0" >> $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf
echo "splashimage=/EFI/BOOT/splash.xpm.gz" >> $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf #echo "splashimage=/EFI/BOOT/splash.xpm.gz" >> $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf
echo "timeout 300" >> $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf echo "timeout 300" >> $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf
echo "hiddenmenu" >> $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf echo "hiddenmenu" >> $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf
echo "title DVD Fuel Install (Static IP)" >> $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf echo "title DVD Fuel Install (Static IP)" >> $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf
@ -271,8 +271,8 @@ $(ISO_PATH): $(BUILD_DIR)/iso/isoroot.done
sudo cp -f $(BUILD_DIR)/iso/isoroot-mkisofs/isolinux/initrd.img $(BUILD_DIR)/iso/efi_tmp/efi_image/ sudo cp -f $(BUILD_DIR)/iso/isoroot-mkisofs/isolinux/initrd.img $(BUILD_DIR)/iso/efi_tmp/efi_image/
sudo mkdir -p $(BUILD_DIR)/iso/efi_tmp/efi_image/EFI/BOOT/ sudo mkdir -p $(BUILD_DIR)/iso/efi_tmp/efi_image/EFI/BOOT/
sudo cp -f $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf $(BUILD_DIR)/iso/efi_tmp/efi_image/EFI/BOOT/ sudo cp -f $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf $(BUILD_DIR)/iso/efi_tmp/efi_image/EFI/BOOT/
sudo cp -f $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.efi $(BUILD_DIR)/iso/efi_tmp/efi_image/EFI/BOOT/ sudo cp -f $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.EFI $(BUILD_DIR)/iso/efi_tmp/efi_image/EFI/BOOT/
sudo cp -f $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/splash.xpm.gz $(BUILD_DIR)/iso/efi_tmp/efi_image/EFI/BOOT/ #sudo cp -f $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/splash.xpm.gz $(BUILD_DIR)/iso/efi_tmp/efi_image/EFI/BOOT/
sudo umount $(BUILD_DIR)/iso/efi_tmp/efi_image sudo umount $(BUILD_DIR)/iso/efi_tmp/efi_image
cp -f $(BUILD_DIR)/iso/efi_tmp/efiboot.img $(BUILD_DIR)/iso/isoroot-mkisofs/images/ cp -f $(BUILD_DIR)/iso/efi_tmp/efiboot.img $(BUILD_DIR)/iso/isoroot-mkisofs/images/
sudo rm -rf $(BUILD_DIR)/iso/efi_tmp/ sudo rm -rf $(BUILD_DIR)/iso/efi_tmp/

14
mirror/centos/boot.mk
View File

@ -1,7 +1,8 @@
ISOLINUX_FILES:=boot.msg grub.conf initrd.img isolinux.bin memtest vesamenu.c32 vmlinuz ISOLINUX_FILES:=boot.msg grub.conf initrd.img isolinux.bin memtest vesamenu.c32 vmlinuz
IMAGES_FILES:=efiboot.img efidisk.img install.img IMAGES_FILES:=efiboot.img boot.iso
LIVEOS_FILES:=squashfs.img
PXEBOOT_FILES:=initrd.img vmlinuz PXEBOOT_FILES:=initrd.img vmlinuz
EFI_FILES:=BOOTX64.conf BOOTX64.efi splash.xpm.gz EFI_FILES:=BOOTX64.EFI MokManager.efi grub.cfg grubx64.efi
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS) MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
MIRROR_CENTOS_KERNEL_BASEURL?=$(MIRROR_CENTOS_KERNEL)/os/$(CENTOS_ARCH) MIRROR_CENTOS_KERNEL_BASEURL?=$(MIRROR_CENTOS_KERNEL)/os/$(CENTOS_ARCH)
@ -30,9 +31,16 @@ $(addprefix $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/images/pxeboot/,$(PXEBOOT_FILES)):
wget -nv -O $@.tmp $(MIRROR_CENTOS_KERNEL_BASEURL)/images/pxeboot/$(@F) wget -nv -O $@.tmp $(MIRROR_CENTOS_KERNEL_BASEURL)/images/pxeboot/$(@F)
mv $@.tmp $@ mv $@.tmp $@
# centos liveos images
$(addprefix $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/LiveOS/,$(LIVEOS_FILES)):
@mkdir -p $(@D)
wget -nv -O $@.tmp $(MIRROR_CENTOS_KERNEL_BASEURL)/LiveOS/$(@F)
mv $@.tmp $@
$(BUILD_DIR)/mirror/centos/boot.done: \ $(BUILD_DIR)/mirror/centos/boot.done: \
$(addprefix $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/images/,$(IMAGES_FILES)) \ $(addprefix $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/images/,$(IMAGES_FILES)) \
$(addprefix $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/EFI/BOOT/,$(EFI_FILES)) \ $(addprefix $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/EFI/BOOT/,$(EFI_FILES)) \
$(addprefix $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/isolinux/,$(ISOLINUX_FILES)) \ $(addprefix $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/isolinux/,$(ISOLINUX_FILES)) \
$(addprefix $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/images/pxeboot/,$(PXEBOOT_FILES)) $(addprefix $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/images/pxeboot/,$(PXEBOOT_FILES)) \
$(addprefix $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/LiveOS/,$(LIVEOS_FILES))
$(ACTION.TOUCH) $(ACTION.TOUCH)

1
mirror/centos/extra-repos.mk
View File

@ -25,6 +25,5 @@ endef
define extra_repo_metadata define extra_repo_metadata
set -ex ; createrepo -g $(LOCAL_MIRROR)/extra-repos/$(call get_repo_name,$1)/comps.xml \ set -ex ; createrepo -g $(LOCAL_MIRROR)/extra-repos/$(call get_repo_name,$1)/comps.xml \
-u media://`head -1 $(SOURCE_DIR)/iso/.discinfo` \
-o $(LOCAL_MIRROR)/extra-repos/$(call get_repo_name,$1)/ $(LOCAL_MIRROR)/extra-repos/$(call get_repo_name,$1)/ -o $(LOCAL_MIRROR)/extra-repos/$(call get_repo_name,$1)/ $(LOCAL_MIRROR)/extra-repos/$(call get_repo_name,$1)/
endef endef

1
mirror/centos/mos-repo.mk
View File

@ -7,7 +7,6 @@ $(BUILD_DIR)/mirror/centos/mos-download.done: $(BUILD_DIR)/mirror/centos/yum-con
$(BUILD_DIR)/mirror/centos/mos-repo.done: $(BUILD_DIR)/mirror/centos/mos-download.done $(BUILD_DIR)/mirror/centos/mos-repo.done: $(BUILD_DIR)/mirror/centos/mos-download.done
createrepo -g $(LOCAL_MIRROR_MOS_CENTOS)/comps.xml \ createrepo -g $(LOCAL_MIRROR_MOS_CENTOS)/comps.xml \
-u media://`head -1 $(SOURCE_DIR)/iso/.discinfo` \
-o $(LOCAL_MIRROR_MOS_CENTOS)/ $(LOCAL_MIRROR_MOS_CENTOS)/ -o $(LOCAL_MIRROR_MOS_CENTOS)/ $(LOCAL_MIRROR_MOS_CENTOS)/
$(ACTION.TOUCH) $(ACTION.TOUCH)

1
mirror/centos/repo.mk
View File

@ -186,6 +186,5 @@ $(BUILD_DIR)/mirror/centos/repo.done: \
$(BUILD_DIR)/mirror/centos/yum.done \ $(BUILD_DIR)/mirror/centos/yum.done \
| $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/comps.xml | $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/comps.xml
createrepo -g $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/comps.xml \ createrepo -g $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/comps.xml \
-u media://`head -1 $(SOURCE_DIR)/iso/.discinfo` \
-o $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/ $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/ -o $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/ $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/
$(ACTION.TOUCH) $(ACTION.TOUCH)

7
packages/rpm/module.mk
View File

@ -12,7 +12,7 @@ clean-rpm:
RPM_SOURCES:=$(BUILD_DIR)/packages/rpm/SOURCES RPM_SOURCES:=$(BUILD_DIR)/packages/rpm/SOURCES
$(BUILD_DIR)/packages/rpm/buildd.tar.gz: SANDBOX_PACKAGES:=rpm-build tar yum yum-utils $(BUILD_DIR)/packages/rpm/buildd.tar.gz: SANDBOX_PACKAGES:=ruby rpm-build tar python-setuptools python-pbr nodejs npm yum yum-utils git
$(BUILD_DIR)/packages/rpm/buildd.tar.gz: SANDBOX:=$(BUILD_DIR)/packages/rpm/SANDBOX/buildd $(BUILD_DIR)/packages/rpm/buildd.tar.gz: SANDBOX:=$(BUILD_DIR)/packages/rpm/SANDBOX/buildd
$(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_UP:=$(SANDBOX_UP) $(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_UP:=$(SANDBOX_UP)
$(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_DOWN:=$(SANDBOX_DOWN) $(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_DOWN:=$(SANDBOX_DOWN)
@ -73,7 +73,7 @@ else
$(BUILD_DIR)/packages/rpm/$1-repocleanup.done: SPECFILE:=$(SOURCE_DIR)/packages/rpm/specs/$1.spec $(BUILD_DIR)/packages/rpm/$1-repocleanup.done: SPECFILE:=$(SOURCE_DIR)/packages/rpm/specs/$1.spec
endif endif
$(BUILD_DIR)/packages/rpm/$1-repocleanup.done: $(BUILD_DIR)/mirror/centos/mos-repo.done $(BUILD_DIR)/packages/rpm/$1-repocleanup.done: $(BUILD_DIR)/mirror/centos/mos-repo.done
python $(SOURCE_DIR)/packages/rpm/genpkgnames.py $$(SPECFILE) | xargs -I{} sudo find $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL)/Packages -regex '.*/{}-[^-]+-[^-]+' -delete python $(SOURCE_DIR)/packages/rpm/genpkgnames.py $$(SPECFILE) | xargs -I{} sudo find $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL)/Packages -type f -regex '.*/{}-[^-]+-[^-]+' -delete
$$(ACTION.TOUCH) $$(ACTION.TOUCH)
endef endef
@ -98,7 +98,6 @@ $(BUILD_DIR)/packages/rpm/repo.done: $(BUILD_DIR)/bootstrap/fuel-bootstrap-image
$(BUILD_DIR)/packages/rpm/repo.done: $(BUILD_DIR)/packages/rpm/repo.done:
find $(BUILD_DIR)/packages/rpm/RPMS -name '*.rpm' -exec cp -u {} $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL)/Packages \; find $(BUILD_DIR)/packages/rpm/RPMS -name '*.rpm' -exec cp -u {} $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL)/Packages \;
createrepo -g $(LOCAL_MIRROR_MOS_CENTOS)/comps.xml \ createrepo -g $(LOCAL_MIRROR_MOS_CENTOS)/comps.xml \
-u media://`head -1 $(SOURCE_DIR)/iso/.discinfo` \
-o $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) -o $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL)
$(ACTION.TOUCH) $(ACTION.TOUCH)
@ -123,7 +122,6 @@ $(BUILD_DIR)/packages/rpm/fuel-docker-images.done: \
cp $(SANDBOX)/tmp/RPMS/*/fuel-docker-images-*.rpm $(BUILD_DIR)/packages/rpm/RPMS/x86_64 cp $(SANDBOX)/tmp/RPMS/*/fuel-docker-images-*.rpm $(BUILD_DIR)/packages/rpm/RPMS/x86_64
find $(BUILD_DIR)/packages/rpm/RPMS -name '*.rpm' | xargs cp -u --target-directory=$(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL)/Packages find $(BUILD_DIR)/packages/rpm/RPMS -name '*.rpm' | xargs cp -u --target-directory=$(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL)/Packages
createrepo -g $(LOCAL_MIRROR_MOS_CENTOS)/comps.xml \ createrepo -g $(LOCAL_MIRROR_MOS_CENTOS)/comps.xml \
-u media://`head -1 $(SOURCE_DIR)/iso/.discinfo` \
-o $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) -o $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL)
$(ACTION.TOUCH) $(ACTION.TOUCH)
@ -167,7 +165,6 @@ $(BUILD_DIR)/packages/rpm/repo-late.done: $(BUILD_DIR)/packages/rpm/repo.done
endif endif
find $(BUILD_DIR)/packages/rpm/RPMS -name '*.rpm' -exec cp -u --target-directory $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL)/Packages {} + find $(BUILD_DIR)/packages/rpm/RPMS -name '*.rpm' -exec cp -u --target-directory $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL)/Packages {} +
createrepo -g $(LOCAL_MIRROR_MOS_CENTOS)/comps.xml \ createrepo -g $(LOCAL_MIRROR_MOS_CENTOS)/comps.xml \
-u media://`head -1 $(SOURCE_DIR)/iso/.discinfo` \
-o $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) -o $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL) $(LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL)
$(ACTION.TOUCH) $(ACTION.TOUCH)

121
requirements-rpm.txt
View File

@ -1,5 +1,4 @@
ami-creator ami-creator
anacron
apr-util apr-util
atop atop
augeas-libs augeas-libs
@ -7,7 +6,6 @@ bakefile
@Base @Base
bash bash
bzip2 bzip2
ceph
cloud-init cloud-init
cloud-utils cloud-utils
cobbler cobbler
@ -15,42 +13,42 @@ cobbler-web
@Core @Core
createrepo createrepo
cronie cronie
cronie-anacron
crontabs crontabs
Cython Cython
daemonize
debootstrap debootstrap
deltarpm deltarpm
device-mapper-persistent-data
dhcp dhcp
dnsmasq dnsmasq
docker-io docker
dpkg dpkg
dpkg-dev dpkg-dev
dpkg-devel dpkg-devel
erlang erlang
ethtool ethtool
euca2ools euca2ools
fence-agents fabric
fence-agents-all
gcc gcc
gdisk gdisk
genisoimage genisoimage
GeoIP GeoIP
git git
gperftools gperftools
grub2
grub2-efi
grub2-efi-modules
grub2-tools
gv gv
htop
httpd httpd
iproute iproute
iptables iptables
ipxe-roms ipxe-roms
kernel-2.6.32-504.16.2.el6 kernel
kernel-devel-2.6.32-504.16.2.el6 kernel-devel
kernel-headers-2.6.32-504.16.2.el6 kernel-headers
kernel-lt
kmod-hpsa
leveldb leveldb
libevent-devel libevent-devel
libfcgi
libiscsi libiscsi
libmlx4 libmlx4
libunwind libunwind
@ -62,26 +60,25 @@ linux-firmware
logrotate logrotate
lrzip lrzip
lvm2 lvm2
lxc
mailcap mailcap
mcollective mcollective
mdadm mdadm
megaraid_sas
mod_wsgi mod_wsgi
monit monit
mtools mtools
MySQL-python MySQL-python
MySQL-shared-wsrep mysql-wsrep-5.6
nginx nginx
nmap-ncat nmap-ncat
nodejs-nailgun nodejs-nailgun
openssh-clients openssh-clients
openssl-devel openssl-devel
openstack-keystone openstack-keystone
postgresql-9.3.5-1PGDG.el6.mira3 os-client-config
postgresql-devel-9.3.5-1PGDG.el6.mira3 postgresql
postgresql-libs-9.3.5-1PGDG.el6.mira3 postgresql-devel
postgresql-server-9.3.5-1PGDG.el6.mira3 postgresql-libs
postgresql-server
puppet puppet
pydot-ng pydot-ng
pyparsing pyparsing
@ -89,23 +86,20 @@ python-alembic
python-amqp python-amqp
python-amqplib python-amqplib
python-anyjson python-anyjson
python-argparse python-appdirs
python-babel python-babel
python-backports python-backports
python-backports-ssl_match_hostname python-backports-ssl_match_hostname
python-beautifulsoup4
python-boto python-boto
python-ceilometerclient python-ceilometerclient
python-chardet python-chardet
python-cheetah python-cheetah
python-cherrypy
python-cinderclient python-cinderclient
python-cliff python-cliff
python-cliff-tablib python-cliff-tablib
python-cmd2 python-cmd2
python-coverage python-coverage
python-crypto python-crypto
python-daemon
python-daemonize python-daemonize
python-decorator python-decorator
python-django python-django
@ -113,21 +107,18 @@ python-docker-py
python-dogpile-cache python-dogpile-cache
python-dogpile-core python-dogpile-core
python-ecdsa python-ecdsa
python-editor
python-empy python-empy
python-ethtool python-ethtool
python-eventlet python-eventlet
python-fabric
python-flask python-flask
python-futures python-futures
python-fysom python-fysom
python-gevent python-gevent
python-glanceclient
python-greenlet python-greenlet
python-heatclient python-heatclient
python-html5lib
python-httplib2 python-httplib2
python-imgcreate python-imgcreate
python-importlib
python-ipaddr python-ipaddr
python-ironicclient python-ironicclient
python-iso8601 python-iso8601
@ -141,14 +132,11 @@ python-keystoneclient
python-keystonemiddleware python-keystonemiddleware
python-kombu python-kombu
python-ldappool python-ldappool
python-lockfile
python-logutils python-logutils
python-lxml python-lxml
python-mako python-mako
python-markdown python-markdown
python-markupsafe python-markupsafe
python-MarkupSafe
python-meld3
python-memcached python-memcached
python-migrate python-migrate
python-muranoclient python-muranoclient
@ -157,11 +145,9 @@ python-netifaces
python-networkx-core python-networkx-core
python-neutronclient python-neutronclient
python-nose python-nose
python-nose-cover3
python-novaclient python-novaclient
python-oauthlib python-oauthlib
python-openstackclient python-openstackclient
python-ordereddict
python-oslo-config python-oslo-config
python-oslo-db python-oslo-db
python-oslo-i18n python-oslo-i18n
@ -178,7 +164,6 @@ python-pecan
python-pip python-pip
python-ply python-ply
python-posix_ipc python-posix_ipc
python-PrettyTable
python-psycopg2 python-psycopg2
python-pycadf python-pycadf
python-pygments python-pygments
@ -199,10 +184,10 @@ python-suds
python-swiftclient python-swiftclient
python-tablib python-tablib
python-testresources python-testresources
python-unicodecsv
python-unittest2 python-unittest2
python-urllib3 python-urllib3
python-urwid python-urwid
python-waitress
python-warlock python-warlock
python-webob python-webob
python-webpy python-webpy
@ -211,7 +196,6 @@ python-websockify
python-webtest python-webtest
python-werkzeug python-werkzeug
python-wsgilog python-wsgilog
python-wsgiproxy2
python-wsgiref python-wsgiref
python-yaql python-yaql
pytz pytz
@ -222,61 +206,49 @@ rpm
rpm-build rpm-build
rsync rsync
ruby ruby
ruby21
ruby21-augeas
ruby21-facter
ruby21-hiera
ruby21-mcollective
ruby21-puppet
ruby21-rubygem-activesupport
ruby21-rubygem-amq-client
ruby21-rubygem-amq-protocol
ruby21-rubygem-bunny
ruby21-rubygem-i18n
ruby21-rubygem-json
ruby21-rubygem-json_pure
ruby21-rubygem-librarianp
ruby21-rubygem-librarian-puppet-simple
ruby21-rubygem-mcollective-client
ruby21-rubygem-mime-types
ruby21-rubygem-netaddr
ruby21-rubygem-net-ssh
ruby21-rubygem-net-ssh-gateway
ruby21-rubygem-net-ssh-multi
ruby21-rubygem-open4
ruby21-rubygem-openstack
ruby21-rubygem-Platform
ruby21-rubygem-raemon
ruby21-rubygem-rest-client
ruby21-rubygem-rgen
ruby21-rubygem-shadow
ruby21-rubygem-stomp
ruby21-rubygem-symboltable
ruby21-rubygem-systemu
ruby21-rubygem-thor
ruby-augeas ruby-augeas
ruby-devel ruby-devel
rubygem-activesupport
rubygem-amq-protocol
rubygem-bunny
rubygem-cstruct rubygem-cstruct
rubygem-deep_merge rubygem-eventmachine
rubygem-extlib rubygem-extlib
rubygem-ffi
rubygem-ffi-yajl
rubygem-httpclient rubygem-httpclient
rubygem-i18n
rubygem-ipaddress rubygem-ipaddress
rubygem-json rubygem-json
rubygem-librarian-puppet-simple
rubygem-mcollective-client
rubygem-mime-types
rubygem-minitest
rubygem-mixlib-cli rubygem-mixlib-cli
rubygem-mixlib-config rubygem-mixlib-config
rubygem-mixlib-log rubygem-mixlib-shellout
rubygem-netaddr rubygem-netaddr
rubygem-net-ssh
rubygem-net-ssh-gateway
rubygem-net-ssh-multi
rubygem-ohai rubygem-ohai
rubygem-open4
rubygem-openstack rubygem-openstack
rubygem-Platform
rubygem-popen4
rubygem-raemon
rubygem-rdoc
rubygem-rest-client
rubygem-rethtool rubygem-rethtool
rubygems rubygems
rubygem-stomp rubygem-stomp
rubygem-symboltable
rubygem-systemu rubygem-systemu
rubygem-thread_safe
rubygem-tzinfo
rubygem-wmi-lite
rubygem-yajl-ruby rubygem-yajl-ruby
ruby-irb
ruby-libs ruby-libs
ruby-rdoc
ruby-ri
ruby-shadow ruby-shadow
scapy scapy
screen screen
@ -285,7 +257,6 @@ selinux-policy
send2syslog send2syslog
snappy snappy
socat socat
subscription-manager
sudo sudo
supervisor supervisor
syslinux syslinux
@ -294,8 +265,8 @@ tar
tftp-server tftp-server
tmux tmux
uwsgi uwsgi
uwsgi-plugin-common
uwsgi-plugin-python uwsgi-plugin-python
vim
vim-minimal vim-minimal
wxGTK wxGTK
xinetd xinetd

2
sandbox.mk
View File

@ -86,11 +86,13 @@ echo 'Installing packages for Sandbox'
sudo /bin/sh -c 'export TMPDIR=$(SANDBOX)/tmp/yum TMP=$(SANDBOX)/tmp/yum; echo $(SANDBOX_PACKAGES) | xargs -n1 yum -c $(SANDBOX)/etc/yum.conf --installroot=$(SANDBOX) -y --nogpgcheck install' sudo /bin/sh -c 'export TMPDIR=$(SANDBOX)/tmp/yum TMP=$(SANDBOX)/tmp/yum; echo $(SANDBOX_PACKAGES) | xargs -n1 yum -c $(SANDBOX)/etc/yum.conf --installroot=$(SANDBOX) -y --nogpgcheck install'
mount | grep -q $(SANDBOX)/proc || sudo mount --bind /proc $(SANDBOX)/proc mount | grep -q $(SANDBOX)/proc || sudo mount --bind /proc $(SANDBOX)/proc
mount | grep -q $(SANDBOX)/dev || sudo mount --bind /dev $(SANDBOX)/dev mount | grep -q $(SANDBOX)/dev || sudo mount --bind /dev $(SANDBOX)/dev
#mount | grep -q $(SANDBOX)/sys || sudo mount --bind /sys $(SANDBOX)/sys
endef endef
define SANDBOX_DOWN define SANDBOX_DOWN
sudo umount $(SANDBOX)/proc || true sudo umount $(SANDBOX)/proc || true
sudo umount $(SANDBOX)/dev || true sudo umount $(SANDBOX)/dev || true
#sudo umount $(SANDBOX)/sys || true
endef endef
define apt_sources_list define apt_sources_list