TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM: update build scripts for opensuse TW

Browse Source
pull/78/head
François Andriot 3 years ago
parent c7623fbb06
commit e3454bb533
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
redhat/Makefile
Unescape View File

@ -368,7 +368,7 @@ kkbswitch: tdebase
klamav: tdebase klamav: tdebase
# Requires clamav >= 0.101.0 # Requires clamav >= 0.101.0
ifeq (,$(filter $(DIST), .el5 .el6 .mga6)) ifeq (,$(filter $(DIST), .el5 .el6 .mga6))
$(call buildpkg,applications/klamav) $(call buildpkg,applications/klamav)
endif endif

3
redhat/docker/osstw/Dockerfile.i686
Unescape View File

@ -7,7 +7,6 @@ ARG ARCH=i686
COPY packages /packages COPY packages /packages
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \ RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
&& zypper ar -f -G -n gnome http://ftp.lysator.liu.se/pub/opensuse/repositories/GNOME:/Next/openSUSE_Factory gnome \ && zypper ar -f -G -n gnome http://ftp.lysator.liu.se/pub/opensuse/repositories/GNOME:/Next/openSUSE_Factory gnome \
&& setarch ${ARCH} zypper refresh \
&& setarch ${ARCH} zypper -n refresh \ && setarch ${ARCH} zypper -n refresh \
&& setarch ${ARCH} zypper -n dup \ && setarch ${ARCH} zypper -n dup \
&& setarch ${ARCH} zypper -n update \ && setarch ${ARCH} zypper -n update \
@ -18,7 +17,7 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
USER trinity USER trinity
ADD rpmmacros /home/trinity/.rpmmacros COPY rpmmacros /home/trinity/.rpmmacros
# Add YUM repository for locally built packages # Add YUM repository for locally built packages
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \

9
redhat/docker/osstw/Dockerfile.x86_64
Unescape View File

@ -4,9 +4,10 @@ ARG TDE_VERSION=14.1.0
ARG ARCH=x86_64 ARG ARCH=x86_64
# Add PACKMAN repository # Add PACKMAN repository
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman COPY packages /packages
ADD packages /packages RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
RUN zypper refresh \ && zypper -n refresh \
&& zypper -n install busybox perl shadow \
&& zypper -n dup \ && zypper -n dup \
&& zypper -n update \ && zypper -n update \
&& zypper -n install $(</packages) && zypper -n install $(</packages)
@ -16,7 +17,7 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
USER trinity USER trinity
ADD rpmmacros /home/trinity/.rpmmacros COPY rpmmacros /home/trinity/.rpmmacros
# Add YUM repository for locally built packages # Add YUM repository for locally built packages
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \

2
redhat/docker/osstw/packages
Unescape View File

@ -4,7 +4,6 @@ aspell-devel
audiofile-devel audiofile-devel
automake automake
bdftopcf bdftopcf
bind-devel
binutils-devel binutils-devel
bison bison
bluez-devel bluez-devel
@ -17,6 +16,7 @@ cdparanoia-devel
chmlib-devel chmlib-devel
chrpath chrpath
clamav clamav
clamav-devel
cln-devel cln-devel
clucene-core-devel clucene-core-devel
cmake cmake

Write Preview
Loading…
Cancel
Save