Changeset 1365 in ProjectBuilder

Timestamp:

Nov 24, 2011, 4:22:20 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Prepare key support for SLES
• Adds OEL support for build

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (6 diffs)
• pb/bin/pb (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -59 +59 @@
 #
 osrelfile knoppix = /etc/knoppix_version
+osrelfile oel = /etc/oracle-release
 osrelfile yellowdog = /etc/yellowdog-release
 osrelfile esmith = /etc/e-smith-release
@@ -112 +113 @@
 osambiguous debian = debian,ubuntu
 osambiguous suse = suse,sles,opensuse
-osambiguous redhat = redhat,rhel,centos,mandrake,mandriva,vmware
+osambiguous redhat = redhat,rhel,centos,mandrake,mandriva,vmware,oel
 osambiguous lsb = ubuntu,lsb
 
@@ -131 +132 @@
 osrelexpr rhel = Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9]+).* \(
 osrelexpr centos = .*CentOS .*release ([0-9]).* 
+osrelexpr oel = Oracle Linux Server) .*release ([0-9]+).* \(
 osrelexpr redhat = Red Hat Linux release (.+) \(
 osrelexpr sles = SUSE .* Enterprise Server (\d+) \(
@@ -165 +167 @@
 osfamily sles = novell
 osfamily redhat = rh
+osfamily oel = rh
 osfamily rhel = rh
 osfamily fedora = rh
@@ -246 +249 @@
 ossuffix lsb = lsb
 ossuffix hpux = sd
+#ossuffix oel = oel
 #ossuffix rhel = rhel
 #ossuffix centos = el
@@ -300 +304 @@
 #
 rbsmindep rhel-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-iniparse,python-sqlite,python-urlgrabber,readline,redhat-release,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib
+rbsmindep oel-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-iniparse,python-sqlite,python-urlgrabber,readline,redhat-release,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib
 #
 rbsmindep rhel-6 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,e2fsprogs,e2fsprogs-libs,elfutils-libelf,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
+rbsmindep oel-6 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,e2fsprogs,e2fsprogs-libs,elfutils-libelf,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,util-linux-ng,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
 #
 rbsmindep opensuse-10.1 = aaa_base,audit-libs,bash,boost,bzip2,coreutils,cpio,cracklib,curl,cyrus-sasl,db,dbus-1,dbus-1-glib,device-mapper,diffutils,dirmngr,e2fsprogs,ethtool,expat,filesystem,fillup,findutils,gawk,gdbm,glib2,glibc,gpg2,grep,gzip,hal,info,insserv,krb5,libacl,libattr,libcom_err,libicu,libgcc,libgcrypt,libgpg-error,libidn,libksba,libnscd,libreiserfs,libstdc++,libusb,libxcrypt,libxml2,libxml2-python,libzio,libzypp,mingetty,module-init-tools,ncurses,neon,net-tools,openldap2-client,openslp,pam,pam-modules,parted,pciutils,pcre,perl,permissions,pinentry,pmtools,popt,procps,psmisc,pwdutils,python,python-elementtree,python-sqlite,python-urlgrabber,rpm,rpm-python,sed,setserial,sqlite,suse-release,sysvinit,termcap,udev,util-linux,yum,zlib

devel/pb/bin/pb

@@ -1733 +1733 @@
 # Create repodata
 createrepo -s $pbsha .
+# Link to the key
+ln -sf $ENV{'PBPROJ'}.pubkey repodata/repomd.xml.key
+# sign the repomd (at least useful for SLES - which requires a local key)
+# gpg -a --detach-sign repodata/repomd.xml
+# SLES also looks for media.1/info.txt
 EOF
             if ($pbos->{'family'} eq "md") {