diff options
author | Dimitri John Ledkov <dimitri.j.ledkov@intel.com> | 2014-10-05 22:43:51 +0100 |
---|---|---|
committer | Dimitri John Ledkov <dimitri.j.ledkov@intel.com> | 2014-10-05 22:44:01 +0100 |
commit | c3791b7c2ea6c9d62c737b72d80193bae5b811e5 (patch) | |
tree | ef869ad4f61b58a65ad16a8ee7d087547d6428f7 | |
parent | 34506ac4d2f4c4d1fe1c0da9f46a4f373bcca196 (diff) | |
parent | 3c5c14d5bbd0e93bd248a26c7a538dc0017236a3 (diff) |
merge patched into master
-rw-r--r-- | Build/Zypp.pm | 2 | ||||
l---------[-rw-r--r--] | configs/sles11.conf | 408 | ||||
-rw-r--r-- | debian/.git-dpm | 4 | ||||
-rw-r--r-- | debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch | 26 | ||||
-rw-r--r-- | debian/patches/series | 1 |
5 files changed, 31 insertions, 410 deletions
diff --git a/Build/Zypp.pm b/Build/Zypp.pm index bd0ced0..354ca01 100644 --- a/Build/Zypp.pm +++ b/Build/Zypp.pm @@ -8,7 +8,7 @@ sub parsecfg { my ($repocfg, $reponame) = @_; local *REPO; - open(REPO, '<', "$root/etc/zypp/repos.d/$repocfg.repo") or return undef; + open(REPO, '<', "$root/etc/zypp/repos.d/$repocfg") or return undef; my $name; my $repo = {}; while (<REPO>) { diff --git a/configs/sles11.conf b/configs/sles11.conf index ef63de8..87e994a 100644..120000 --- a/configs/sles11.conf +++ b/configs/sles11.conf @@ -1,407 +1 @@ -%define gcc_version 43 - -Preinstall: aaa_base acl attr bash coreutils diffutils -Preinstall: filesystem fillup glibc grep insserv libacl libattr -Preinstall: libbz2-1 libgcc%{gcc_version} libxcrypt m4 libncurses5 pam -Preinstall: permissions popt libreadline5 rpm sed tar zlib libselinux1 - -Runscripts: aaa_base - -Order: libopenssl0_9_8:openssl-certs - -VMinstall: util-linux perl-base libdb-4_5 libvolume_id1 libsepol1 - -Required: autoconf automake binutils bzip2 gcc gcc%{gcc_version} -Required: gettext-runtime glibc libtool perl rpm zlib libmpfr1 gmp -Required: libncurses5 - -Support: audit-libs cpio cpp cpp%{gcc_version} cracklib cvs -Support: file findutils gawk gdbm gettext-tools -Support: glibc-devel glibc-locale groff gzip info less -Support: libbz2-devel libdb-4_5 -Support: libstdc++%{gcc_version} -Support: libvolume_id1 libxcrypt libzio -Support: linux-kernel-headers make man netcfg -Support: net-tools pam-modules patch perl-base sysvinit -Support: texinfo timezone util-linux login -Support: libgomp43 libuuid1 psmisc -Support: terminfo-base - -Support: build brp-check-suse post-build-checks rpmlint-Factory -Keep: brp-check-suse - -%ifarch ia64 -Support: libunwind libunwind-devel -%endif - -Keep: audit-libs binutils bzip2 cpio cpp cracklib file findutils gawk gcc gcc-ada gcc-c++ -Keep: gdbm glibc-devel glibc-locale gzip libada -Keep: libunwind libunwind-devel libzio make pam-devel pam-modules -Keep: patch perl-base perl rcs timezone gmp libmpfr1 -Keep: cpp43 gcc43 gcc43-ada libstdc++43 -Keep: cpp42 gcc42 gcc42-ada libstdc++42 -Keep: cpp41 gcc41 gcc41-ada libstdc++41 -Keep: java-1_6_0-openjdk java-1_6_0-openjdk-devel -Keep: libvolume_id libvolume_id1 - -Prefer: -openSUSE-build-key -Prefer: libreadline5 -Prefer: libdb_java-4_5 libicu -Prefer: cracklib-dict-small postfix -Prefer: jta libpng fam mozilla mozilla-nss -Prefer: unixODBC libsoup glitz -Prefer: gnome-panel desktop-data-openSUSE gnome2-SuSE -Prefer: mono-nunit gecko-sharp2 -Prefer: apache2-prefork Mesa openmotif-libs ghostscript-mini ghostscript-library -Prefer: gtk-sharp2 glib-sharp2 glade-sharp2 -Prefer: libzypp-zmd-backend novell-NLDAPsdk zaptel-kmp-default -Prefer: hbedv-dazuko-kmp-default dazuko-kmp-default vmware-wkstnmods-kmp-default -Prefer: virtualbox-kmp-default -Prefer: libstdc++%{gcc_version} libgcc%{gcc_version} -Prefer: libstdc++%{gcc_version}-32bit libstdc++%{gcc_version}-64bit -Prefer: libstroke -Prefer: gnome-sharp2:art-sharp2 gnome-sharp:art-sharp -Prefer: ifolder3:gnome-sharp2 ifolder3:gconf-sharp2 -Prefer: nautilus-ifolder3:gnome-sharp2 inkscape:gtkmm24 -Prefer: gconf-sharp2:glade-sharp2 gconf-sharp:glade-sharp -Prefer: gjdoc:antlr-bootstrap -Prefer: tomboy:gconf-sharp2 tomboy:gnome-sharp2 -Prefer: zmd:libzypp-zmd-backend -Prefer: yast2-packagemanager-devel:yast2-packagemanager -Prefer: glitz-32bit:Mesa-32bit -Prefer: poppler-tools -Prefer: banshee:banshee-engine-gst helix-banshee:helix-banshee-engine-gst -Prefer: java-1_5_0-ibm:java-1_5_0-ibm-alsa -Prefer: microcode_ctl:kernel-default -Prefer: notification-daemon -Prefer: pkg-config gtk-doc wlan-kmp-default lua-libs -Prefer: gnu-jaf classpathx-mail avahi-compat-mDNSResponder yast2-control-center-qt -Prefer: vim-normal myspell-american wine -Prefer: eclipse-platform eclipse-scripts -Prefer: yast2-theme-openSUSE -Prefer: amarok:amarok-xine -Prefer: kdenetwork3-vnc:tightvnc -Prefer: libgweather0 jessie ndesk-dbus ndesk-dbus-glib tomcat6-jsp-2_1-api tomcat6-servlet-2_5-api -Prefer: icewm-lite -Prefer: patterns-openSUSE-GNOME-cd:banshee -Prefer: yast2-ncurses-pkg -Prefer: monodevelop: mono-addins -Prefer: ant-trax:saxon -Prefer: gnome-session:gnome-session-branding-openSUSE -Prefer: gnome-session:gconf2-branding-openSUSE -Prefer: xfce4-desktop:xfce4-desktop-branding-openSUSE -Prefer: bundle-lang-gnome:gnome-session-branding-openSUSE -Prefer: texlive-xmltex texlive-tools texlive-jadetex -Prefer: mono-web:mono-data-sqlite -Prefer: gnome-games:gnuchess -Prefer: OpenOffice_org:OpenOffice_org-branding-upstream -Prefer: gimp:gimp-branding-upstream -Prefer: libesd-devel:esound -Prefer: libesd0:esound-daemon -Prefer: glib2:glib2-branding-upstream -Prefer: kdebase4-workspace:kdebase4-workspace-branding-upstream -Prefer: mysql-connector-java:java-1_5_0-gcj-compat -Prefer: -geronimo-jta-1_0_1B-api -Prefer: rhino:xmlbeans-mini -Prefer: ghostscript-devel:ghostscript-library -Prefer: gdm:gdm-branding-upstream -Prefer: rpcbind log4j-mini eclipse-source -Prefer: mx4j:log4j-mini -Prefer: podsleuth:sg3_utils -Prefer: libcdio_cdda0 libcdio_paranoia0 -Prefer: mozilla-xulrunner190-32bit -Prefer: boo tog-pegasus -Prefer: kde4-kupdateapplet:kde4-kupdateapplet-zypp -Prefer: ant:xerces-j2 -Prefer: -bundle-lang-kde-de -bundle-lang-kde-en -bundle-lang-kde-es -Prefer: -bundle-lang-kde-fr -bundle-lang-kde-pt -Prefer: -bundle-lang-kde-zh -bundle-lang-kde-ja -bundle-lang-kde-ru -bundle-lang-kde-pl -Prefer: -bundle-lang-kde-sv -bundle-lang-kde-ko -bundle-lang-kde-fi -bundle-lang-kde-da -Prefer: -bundle-lang-kde-cs -bundle-lang-kde-nl -bundle-lang-kde-hu -bundle-lang-kde-nb -Prefer: -bundle-lang-kde-it -bundle-lang-kde-ca -bundle-lang-kde-ar -Prefer: -bundle-lang-gnome-es -bundle-lang-gnome-de -bundle-lang-gnome-fr -Prefer: -bundle-lang-gnome-pt -bundle-lang-gnome-en -Prefer: -bundle-lang-gnome-zh -bundle-lang-gnome-ja -bundle-lang-gnome-ru -bundle-lang-gnome-cs -Prefer: -bundle-lang-gnome-ko -bundle-lang-gnome-da -bundle-lang-gnome-nl -bundle-lang-gnome-hu -Prefer: -bundle-lang-gnome-pl -bundle-lang-gnome-fi -bundle-lang-gnome-nb -bundle-lang-gnome-sv -Prefer: -bundle-lang-gnome-it -bundle-lang-gnome-ca -bundle-lang-gnome-ar -Prefer: -bundle-lang-common-es -bundle-lang-common-de -bundle-lang-common-fr -Prefer: -bundle-lang-common-pt -bundle-lang-common-en -Prefer: -bundle-lang-common-ja -bundle-lang-common-zh -bundle-lang-common-cs -bundle-lang-common-ru -Prefer: -bundle-lang-common-nl -bundle-lang-common-hu -bundle-lang-common-pl -bundle-lang-common-da -Prefer: -bundle-lang-common-ko -bundle-lang-common-nb -bundle-lang-common-fi -bundle-lang-common-sv -Prefer: -bundle-lang-common-it -bundle-lang-common-ca -bundle-lang-common-ar -Prefer: -libgcc-mainline -libstdc++-mainline -gcc-mainline-c++ -Prefer: -libgcj-mainline -viewperf -compat -compat-openssl097g -Prefer: -zmd -OpenOffice_org -pam-laus -libgcc-tree-ssa -busybox-links - -Prefer: -NX -xaw3dd -db43 -Prefer: -xerces-j2-xml-resolver -xerces-j2-xml-apis -Prefer: -vmware-player -Prefer: libgcc%{gcc_version} libgcc%{gcc_version}-32bit libgcc%{gcc_version}-64bit -Prefer: libgcc%{gcc_version}-x86 libffi%{gcc_version} libgcj_bc%{gcc_version} -Prefer: libgomp%{gcc_version} libgomp%{gcc_version}-32bit libgomp%{gcc_version}-64bit -Prefer: libmudflap%{gcc_version} libmudflap%{gcc_version}-32bit libmudflap%{gcc_version}-64bit -Prefer: libobjc%{gcc_version} -Prefer: -libnetpbm -libcdio7-mini -libiso9660-5-mini -Prefer: -libcdio-mini -faac-mini -Prefer: -seamonkey -Prefer: -libdb-4_4-devel -libevoldap-2_4-2 -Conflict: ghostscript-library:ghostscript-mini -Conflict: ghostscript-fonts-std:ghostscript-mini -Prefer: -libopenal0-soft -openal-soft -lsb-buildenv -Prefer: gnu-crypto libusb-compat-devel -Prefer: libusb-0_1-4 -Prefer: CASA_auth_token_svc:xerces-j2 -Prefer: OpenOffice_org:xerces-j2 -Prefer: k3b:libdvdread4 -Prefer: glibc-devel -Prefer: NetworkManager:dhcp-client -Prefer: kdebase3-SuSE:kdebase3 - -Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-dvd9,openSUSE-release-livecdkde,openSUSE-release-livecdgnome -Ignore: cracklib:cracklib-dict -Ignore: aaa_base:aaa_skel,suse-release,logrotate,ash,mingetty,distribution-release,udev -Ignore: gettext-tools:libgcj,libstdc++-devel,libgcj41,libstdc++41-devel,libgcj42,libstdc++42-devel -Ignore: libgcj43,libstdc++43-devel -Ignore: pwdutils:openslp -Ignore: pam-modules:resmgr -Ignore: rpm:suse-build-key,build-key -Ignore: bind-utils:bind-libs -Ignore: alsa:dialog,pciutils -Ignore: portmap:syslogd -Ignore: fontconfig:freetype2 -Ignore: fontconfig-devel:freetype2-devel -Ignore: xorg-x11-libs:freetype2 -Ignore: xorg-x11:x11-tools,resmgr,xkeyboard-config,xorg-x11-Mesa,libusb,freetype2,libjpeg,libpng -Ignore: xorg-x11-server:xorg-x11-driver-input,xorg-x11-driver-video -Ignore: apache2:logrotate -Ignore: arts:alsa,audiofile,resmgr,libogg,libvorbis -Ignore: kdelibs3:alsa,arts,pcre,OpenEXR,aspell,cups-libs,mDNSResponder-lib,krb5,libjasper -Ignore: kdelibs3-devel:libvorbis-devel -Ignore: kdebase3:kdebase3-ksysguardd,OpenEXR,dbus-1,dbus-1-qt,hal,powersave,openslp,libusb -Ignore: kdebase3-SuSE:release-notes -Ignore: jack:alsa,libsndfile -Ignore: libxml2-devel:readline-devel -Ignore: gnome-vfs2:gnome-mime-data,desktop-file-utils,cdparanoia,dbus-1,dbus-1-glib,hal,libsmbclient,fam,file_alteration -Ignore: libgda:file_alteration -Ignore: gnutls:lzo,libopencdk -Ignore: gnutls-devel:lzo-devel,libopencdk-devel -Ignore: pango:cairo,glitz,libpixman,libpng -Ignore: pango-devel:cairo-devel -Ignore: cairo-devel:libpixman-devel -Ignore: libgnomeprint:libgnomecups -Ignore: libgnomeprintui:libgnomecups -Ignore: orbit2:libidl -Ignore: orbit2-devel:libidl,libidl-devel,indent -Ignore: qt3:libmng -Ignore: qt-sql:qt_database_plugin -Ignore: gtk2:libpng,libtiff -Ignore: libgnomecanvas-devel:glib-devel -Ignore: libgnomeui:gnome-icon-theme,shared-mime-info -Ignore: scrollkeeper:docbook_4 -Ignore: gnome-desktop:libgnomesu,startup-notification -Ignore: python-devel:python-tk -Ignore: gnome-pilot:gnome-panel -Ignore: gnome-panel:control-center2 -Ignore: gnome-menus:kdebase3 -Ignore: gnome-main-menu:rug -Ignore: libbonoboui:gnome-desktop -Ignore: postfix:pcre -Ignore: docbook_4:iso_ent,xmlcharent -Ignore: control-center2:nautilus,evolution-data-server,gnome-menus,gstreamer-plugins,gstreamer,metacity,mozilla-nspr,mozilla,libxklavier,gnome-desktop,startup-notification -Ignore: docbook-xsl-stylesheets:xmlcharent -Ignore: liby2util-devel:libstdc++-devel,openssl-devel -Ignore: yast2:yast2-ncurses,yast2_theme,perl-Config-Crontab,yast2-xml,SuSEfirewall2 -Ignore: yast2-core:netcat,hwinfo,wireless-tools,sysfsutils -Ignore: yast2-core-devel:libxcrypt-devel,hwinfo-devel,blocxx-devel,sysfsutils,libstdc++-devel -Ignore: yast2-packagemanager-devel:rpm-devel,curl-devel,openssl-devel -Ignore: yast2-devtools:libxslt -Ignore: yast2-installation:yast2-update,yast2-mouse,yast2-country,yast2-bootloader,yast2-packager,yast2-network,yast2-online-update,yast2-users,release-notes,autoyast2-installation -Ignore: yast2-bootloader:bootloader-theme -Ignore: yast2-packager:yast2-x11 -Ignore: yast2-x11:sax2-libsax-perl -Ignore: yast2-network:yast2-inetd -Ignore: openslp-devel:openssl-devel -Ignore: java-1_4_2-sun:xorg-x11-libs -Ignore: java-1_4_2-sun-devel:xorg-x11-libs -Ignore: tetex:xorg-x11-libs,expat,fontconfig,freetype2,libjpeg,ghostscript-x11,xaw3d,gd,dialog,ed -Ignore: texlive-bin:ghostscript-x11 -Ignore: texlive-bin-omega:ghostscript-x11 -Ignore: yast2-country:yast2-trans-stats -Ignore: tpb:tpctl-kmp -Ignore: tpctl:tpctl-kmp -Ignore: zaptel:zaptel-kmp -Ignore: mkinitrd:pciutils -Ignore: pciutils:pciutils-ids - -Ignore: libgcc:glibc-32bit -Ignore: libgcc41:glibc-32bit -Ignore: libgcc42:glibc-32bit -Ignore: libgcc43:glibc-32bit -Ignore: libstdc++:glibc-32bit -Ignore: libstdc41++:glibc-32bit -Ignore: libstdc42++:glibc-32bit -Ignore: libstdc43++:glibc-32bit -Ignore: ncurses-32bit - -Ignore: susehelp:susehelp_lang,suse_help_viewer -Ignore: mailx:smtp_daemon -Ignore: cron:smtp_daemon -Ignore: hotplug:syslog -Ignore: pcmcia:syslog -Ignore: openct:syslog -Ignore: avalon-logkit:servlet -Ignore: jython:servlet -Ignore: ispell:ispell_dictionary,ispell_english_dictionary -Ignore: aspell:aspel_dictionary,aspell_dictionary -Ignore: smartlink-softmodem:kernel,kernel-nongpl -Ignore: OpenOffice_org-de:myspell-german-dictionary -Ignore: OpenOffice_org:OpenOffice_org-i18n -Ignore: mediawiki:php-session,php-gettext,php-zlib,php-mysql,mod_php_any -Ignore: squirrelmail:mod_php_any,php-session,php-gettext,php-iconv,php-mbstring,php-openssl - -Ignore: simias:mono(log4net) -Ignore: zmd:mono(log4net) -Ignore: horde:mod_php_any,php-gettext,php-mcrypt,php-imap,php-pear-log,php-pear,php-session,php - -Ignore: xerces-j2:xml-commons-apis,xml-commons-resolver -Ignore: xdg-menu:desktop-data -Ignore: nessus-libraries:nessus-core -Ignore: evolution:yelp - -Ignore: mono-tools:mono(gconf-sharp),mono(glade-sharp),mono(gnome-sharp),mono(gtkhtml-sharp),mono(atk-sharp),mono(gdk-sharp),mono(glib-sharp),mono(gtk-sharp),mono(pango-sharp) -Ignore: gecko-sharp2:mono(glib-sharp),mono(gtk-sharp) - -Ignore: vcdimager:libcdio.so.6,libcdio.so.6(CDIO_6),libiso9660.so.4,libiso9660.so.4(ISO9660_4) -Ignore: libcdio:libcddb.so.2 - -Ignore: gnome-libs:libgnomeui -Ignore: nautilus:gnome-themes -Ignore: gnome-panel:gnome-themes -Ignore: gnome-panel:tomboy -Ignore: NetworkManager:NetworkManager-client -Ignore: libbeagle:beagle -Ignore: coreutils:coreutils-lang -Ignore: cpio:cpio-lang -Ignore: glib2:glib2-lang -Ignore: gtk2:gtk2-lang -Ignore: gtk:gtk-lang -Ignore: atk:atk-lang -Ignore: hal:pm-utils -Ignore: MozillaThunderbird:pinentry-dialog -Ignore: seamonkey:pinentry-dialog -Ignore: pinentry:pinentry-dialog -Ignore: gpg2:gpg2-lang -Ignore: util-linux:util-linux-lang -Ignore: suseRegister:distribution-release -Ignore: compiz:compiz-decorator -Ignore: icecream:gcc-c++ -Ignore: no -Ignore: package -Ignore: provides -Ignore: j9vm/libjvm.so()(64bit) -Ignore: kdepim3:suse_help_viewer -Ignore: kdebase3-SuSE:kdebase3-SuSE-branding -Ignore: kio_sysinfo:kdebase3-SuSE-branding -Ignore: gnome-menus:gnome-menus-branding -Ignore: epiphany:epiphany-branding -Ignore: phonon:phonon-backend -Ignore: openwbem-devel -Ignore: MozillaFirefox:MozillaFirefox-branding -Ignore: yast2:yast2-branding -Ignore: yast2-theme-SLE:yast2-branding -Ignore: yast2-registration:yast2-registration-branding - -%ifarch s390 s390x -Ignore: yast2-all-packages:yast2-x11 -%endif - -%ifnarch ia64 s390 s390x ppc ppc64 -Prefer: java-1_6_0-openjdk java-1_6_0-openjdk-devel -%endif -%ifarch s390 s390x ppc ppc64 -Prefer: java-1_6_0-ibm java-1_6_0-ibm-devel -%endif -%ifarch ia64 -Prefer: java-1_6_0-bea java-1_6_0-bea-devel -%endif - -Prefer: -java-1_5_0-gcj-compat-devel -%ifnarch ia64 s390 s390x ppc ppc64 -Substitute: java2-devel-packages java-1_6_0-openjdk-devel -%else - %ifarch s390 s390x ppc ppc64 -Substitute: java2-devel-packages java-1_6_0-ibm-devel unzip update-alternatives - %endif - %ifarch ia64 -Substitute: java2-devel-packages java-1_6_0-bea-devel unzip update-alternatives - %endif -%endif - -%ifarch x86_64 ppc64 s390x sparc64 -Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit -%else - %ifarch ppc -Substitute: glibc-devel-32bit glibc-devel-64bit - %else -Substitute: glibc-devel-32bit - %endif -%endif - -%ifarch %ix86 -Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-xen -%endif -%ifarch ia64 -Substitute: kernel-binary-packages kernel-default kernel-debug -%endif -%ifarch x86_64 -Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen -%endif -%ifarch ppc -Substitute: kernel-binary-packages kernel-default kernel-ppc64 kernel-ps3 -%endif -%ifarch ppc64 -Substitute: kernel-binary-packages kernel-default kernel-ppc64 -%endif -%ifarch s390 -Substitute: kernel-binary-packages kernel-s390 -%endif -%ifarch s390x -Substitute: kernel-binary-packages kernel-default -%endif - -%ifarch ppc64 -Substitute: mono-devel mono-devel mono-biarchcompat -Substitute: mono-basic mono-basic mono-biarchcompat -Substitute: mono-tools mono-tools mono-biarchcompat -Substitute: mono-data-sqlite mono-data-sqlite libsqlite3-0-32bit -%endif - - -Optflags: i586 -march=i586 -mtune=i686 -fmessage-length=0 -Optflags: i686 -march=i686 -mtune=i686 -fmessage-length=0 -Optflags: x86_64 -fmessage-length=0 -Optflags: ppc -fmessage-length=0 -Optflags: ppc64 -fmessage-length=0 -Optflags: ia64 -fmessage-length=0 -Optflags: s390 -fmessage-length=0 -Optflags: s390x -fmessage-length=0 - -Optflags: * -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables - -%define suse_version 1110 - -Macros: -%insserv_prereq insserv sed -%fillup_prereq fillup coreutils grep diffutils -%suseconfig_fonts_prereq perl aaa_base -%install_info_prereq info -%kernel_module_package_buildreq module-init-tools kernel-syms -%kernel_module_package_buildreqs module-init-tools kernel-syms - -%suse_version 1110 -%sles_version 0 -%ul_version 0 -%do_profiling 1 -%_vendor suse +sl11.1.conf
\ No newline at end of file diff --git a/debian/.git-dpm b/debian/.git-dpm index 6207a59..c19387a 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -613bb1d69baeafbc8400c41a91377d0c710f737c -613bb1d69baeafbc8400c41a91377d0c710f737c +3c5c14d5bbd0e93bd248a26c7a538dc0017236a3 +3c5c14d5bbd0e93bd248a26c7a538dc0017236a3 53ec11670b4264387ee59fe233e8122a39aa9174 53ec11670b4264387ee59fe233e8122a39aa9174 obs-build_20140918.orig.tar.gz diff --git a/debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch b/debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch new file mode 100644 index 0000000..a955184 --- /dev/null +++ b/debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch @@ -0,0 +1,26 @@ +From 3c5c14d5bbd0e93bd248a26c7a538dc0017236a3 Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com> +Date: Fri, 3 Oct 2014 14:28:45 +0100 +Subject: Fix Build::Zypp:parsecfg expected full config file name. +Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ + +Fixes #135 + +Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com> +--- + Build/Zypp.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Build/Zypp.pm b/Build/Zypp.pm +index bd0ced0..354ca01 100644 +--- a/Build/Zypp.pm ++++ b/Build/Zypp.pm +@@ -8,7 +8,7 @@ sub parsecfg { + my ($repocfg, $reponame) = @_; + + local *REPO; +- open(REPO, '<', "$root/etc/zypp/repos.d/$repocfg.repo") or return undef; ++ open(REPO, '<', "$root/etc/zypp/repos.d/$repocfg") or return undef; + my $name; + my $repo = {}; + while (<REPO>) { diff --git a/debian/patches/series b/debian/patches/series index 9b1a32c..24ce1f5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Use-obs-build-in-locations-and-executable-names-inst.patch +0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch |