git://git.onelab.eu
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9cb0816
)
4f10
author
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Thu, 18 Dec 2008 09:59:46 +0000
(09:59 +0000)
committer
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Thu, 18 Dec 2008 09:59:46 +0000
(09:59 +0000)
build.common
patch
|
blob
|
history
config.planetlab/bootcd.pkgs
patch
|
blob
|
history
config.planetlab/bootstrapfs.pkgs
patch
|
blob
|
history
mirroring/mirror.sh
patch
|
blob
|
history
vbuild-fedora-mirror.sh
patch
|
blob
|
history
diff --git
a/build.common
b/build.common
index
11ea761
..
3b73da3
100644
(file)
--- a/
build.common
+++ b/
build.common
@@
-63,7
+63,7
@@
function pl_getReleaseName () {
function pl_getKexcludes () {
distroname=$1; shift
case $distroname in
function pl_getKexcludes () {
distroname=$1; shift
case $distroname in
- f
8|f9
)
+ f
?|f1?
)
echo 'kernel* util-vserver* iptables iproute'
;;
centos5)
echo 'kernel* util-vserver* iptables iproute'
;;
centos5)
@@
-71,6
+71,7
@@
function pl_getKexcludes () {
;;
*)
echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh"
;;
*)
echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh"
+ exit 1
;;
esac
}
;;
esac
}
diff --git
a/config.planetlab/bootcd.pkgs
b/config.planetlab/bootcd.pkgs
index
8e5fb3b
..
b670023
100644
(file)
--- a/
config.planetlab/bootcd.pkgs
+++ b/
config.planetlab/bootcd.pkgs
@@
-74,5
+74,5
@@
precious: usr/share/terminfo/l/linux
precious: usr/share/terminfo/v/vt100
precious: usr/share/terminfo/x/xterm
precious: usr/share/zoneinfo/UTC
precious: usr/share/terminfo/v/vt100
precious: usr/share/terminfo/x/xterm
precious: usr/share/zoneinfo/UTC
-precious: usr/lib/locale/en_US.utf8
-precious
-f9
: usr/lib/locale/en_US.utf8
+precious
+f8
: usr/lib/locale/en_US.utf8
+precious
+centos5
: usr/lib/locale/en_US.utf8
diff --git
a/config.planetlab/bootstrapfs.pkgs
b/config.planetlab/bootstrapfs.pkgs
index
ab0f656
..
4cb3a8e
100644
(file)
--- a/
config.planetlab/bootstrapfs.pkgs
+++ b/
config.planetlab/bootstrapfs.pkgs
@@
-4,6
+4,7
@@
groupname: PlanetLab
groupdesc: PlanetLab Node Root
# packages to exclude from stock repositories
kexclude: @KEXCLUDE@
groupdesc: PlanetLab Node Root
# packages to exclude from stock repositories
kexclude: @KEXCLUDE@
+# fedora-release or centos-release are pulled from deps
# define packages
package: kernel
package: udev
# define packages
package: kernel
package: udev
@@
-26,9
+27,6
@@
package: libtermcap
package: passwd
package: procps
package: readline
package: passwd
package: procps
package: readline
-# let's try without those, should be pulled from deps
-#package+f8 package+f9: fedora-release
-#package+centos5: centos-release
package: rootfiles
package: rpm
package: setserial
package: rootfiles
package: rpm
package: setserial
diff --git
a/mirroring/mirror.sh
b/mirroring/mirror.sh
index
5fc0af9
..
8a59805
100755
(executable)
--- a/
mirroring/mirror.sh
+++ b/
mirroring/mirror.sh
@@
-6,7
+6,7
@@
DIRNAME=$(dirname $0)
default_url="http://localhost/mirror/"
default_distro="f8"
default_url="http://localhost/mirror/"
default_distro="f8"
-all_distros="f8 f
9 f
10 centos5"
+all_distros="f8 f10 centos5"
function check_distro () {
local distro=$1; shift
function check_distro () {
local distro=$1; shift
diff --git
a/vbuild-fedora-mirror.sh
b/vbuild-fedora-mirror.sh
index
cf0b7ca
..
73e1932
100755
(executable)
--- a/
vbuild-fedora-mirror.sh
+++ b/
vbuild-fedora-mirror.sh
@@
-28,9
+28,9
@@
jp_fedora_url="jp_fedora_url-needs-to-be-defined"
jp_centos_url="jp_centos_url-needs-to-be-defined"
jp_epel_url="jp_epel_url-needs-to-be-defined"
jp_centos_url="jp_centos_url-needs-to-be-defined"
jp_epel_url="jp_epel_url-needs-to-be-defined"
-default_distroname=
f8
-all_distronames="f8 f
9 f
10 centos5.2 epel5"
-default_arch=
i386
+default_distroname=
"centos5"
+all_distronames="f8 f10 centos5.2 epel5"
+default_arch=
"i386"
all_archs="i386 x86_64"
case $(hostname) in
all_archs="i386 x86_64"
case $(hostname) in