janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 23:13:54 +01:00
Code Activity

integrate-distro.sh: Rpm installation now runs through with opensuse 12.3, some failures still however

Browse source 
Signed-off-by: Jan Lindemann <jan@jannet.de>
This commit is contained in:
Jan Lindemann 2013-04-05 09:59:27 +00:00 • committed by Jan Lindemann
commit c8d8889f27
1 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

36
scripts/integrate-distro.sh
View file

@ -3,7 +3,7 @@
# -- defaults # -- defaults
# install_dev=/dev/sdb # install_dev=/dev/sdb
arch=`uname -m` arch=`uname -m`
suse_version=12.2 suse_version=12.3
o_name=suse-$suse_version o_name=suse-$suse_version
cmd=install cmd=install
initrd_modules="aufs via-rhine e1000 e1000e myri10ge forcedeth usbcore ohci-hcd ehci-hcd uhci-hcd hid usbhid ahci 8139too sata_nv" initrd_modules="aufs via-rhine e1000 e1000e myri10ge forcedeth usbcore ohci-hcd ehci-hcd uhci-hcd hid usbhid ahci 8139too sata_nv"
@ -26,6 +26,7 @@ case $suse_version in
dhcpcd dhcpcd
kbd kbd
unscd
portmap portmap
xorg-x11-Xnest xorg-x11-Xnest
xorg-x11-fonts-scalable xorg-x11-fonts-scalable
@ -58,9 +59,24 @@ case $suse_version in
kernel_flavour= kernel_flavour=
;; ;;
12.2) 12.2)
kernel_version=3.7.8~jng11 payload_pkgs="
unscd
"
kernel_version=3.7.8-jng11-default
rpm_kernel_version=3.7.8~jng11-1 rpm_kernel_version=3.7.8~jng11-1
;; ;;
12.3)
base_pkgs="
module-init-tools
"
payload_pkgs="
nscd
"
kernel_version=3.7.10-jng12-default
rpm_kernel_version=3.7.10~jng12-1
;;
esac esac
umask 0022 umask 0022
@ -73,9 +89,20 @@ unused_pkgs="
aufs-kmp aufs-kmp
" "
base_pkgs="
$base_pkgs
coreutils
sysvinit
"
update_pkgs="
$update_pkgs
zypper
"
# -- pciutils # -- pciutils
# used by jux, should be done by grepping /proc-files # used by jux, should be done by grepping /proc-files
special_pkgs=" special_pkgs="
$special_pkgs
aufs aufs
aufs-kmp-default aufs-kmp-default
kernel$kernel_flavour-$rpm_kernel_version kernel$kernel_flavour-$rpm_kernel_version
@ -118,7 +145,6 @@ payload_pkgs="
nfs-kernel-server nfs-kernel-server
tftp tftp
unscd
nss_ldap nss_ldap
fuse fuse
@ -827,8 +853,8 @@ cmd_install()
make_etc_issue > $root/etc/issue make_etc_issue > $root/etc/issue
make_etc_issue_net > $root/etc/issue.net make_etc_issue_net > $root/etc/issue.net
host_zypper "base" install --auto-agree-with-licenses coreutils sysvinit host_zypper "base" install --auto-agree-with-licenses $base_pkgs
host_zypper "base update" install --auto-agree-with-licenses zypper host_zypper "base update" install --auto-agree-with-licenses $update_pkgs
#undo_rpmnew #undo_rpmnew
run setup_zypper_repos base update payload run setup_zypper_repos base update payload