diff options
| -rwxr-xr-x | redhat/buildall.sh | 6 | ||||
| -rw-r--r-- | redhat/buildenv.sh | 13 | ||||
| -rwxr-xr-x | redhat/genrpm.sh | 9 |
3 files changed, 13 insertions, 15 deletions
diff --git a/redhat/buildall.sh b/redhat/buildall.sh index 8358ef15a..1fce6fd63 100755 --- a/redhat/buildall.sh +++ b/redhat/buildall.sh @@ -76,7 +76,6 @@ grpiud() { } # Build dependencies -rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" #if ! rpm -q libqt3-devel && ! rpm -q lib64qt3-devel && ! rpm -q qt3-devel; then # grpiu dependencies/qt3 # eval ${PKGINST} qt3-devel @@ -98,14 +97,12 @@ grpiud extras/akode # Build main # basic packages -rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" grpiud tdelibs grpiud tdebase # Back to remaining dependencies ... grpiud dependencies/tqscintilla grpiud dependencies/python-tqt # Main packages which are required by later main packages -rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" grpiud tdepim grpiud tdemultimedia grpiud tdegames @@ -113,7 +110,6 @@ grpiud tdebindings grpiud tdegraphics grpiud tdenetwork # other main packages -rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" grpiui tdeaccessibility grpiui tdeaddons grpiui tdeadmin @@ -130,7 +126,6 @@ grpiui tdewebdev eval ${PKGINST} trinity-desktop-devel # Build libraries -rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" grpiud libraries/libkdcraw grpiud libraries/libkexiv2 grpiud libraries/libkipi @@ -141,7 +136,6 @@ grpiud libraries/python-trinity grpiud libraries/pytdeextensions # Build applications -rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" # K3B is required later for k9copy grpiud applications/k3b # other applications, any order ... diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index abccae62c..146ea170d 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -12,6 +12,7 @@ export PATH="${PATH}:${TDE_GITBASEPKG}" # Distribution suffix (e.g: .el6 , .mga3 ...) export DIST="$( "${TDE_GITBASEPKG}/rpmdist.sh" --dist )" +alias dist='~/bin/rpmdist.sh --dist' # Go to the RPMS folder alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}' @@ -50,8 +51,16 @@ checknew() { } # Build local repository metadata (Mageia) -alias cru='(cdrpm; genhdlist2 noarch; genhdlist2 $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)' -alias cruc='(cdrpm; genhdlist2 --clean noarch; genhdlist2 --clean $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)' +alias cru='(cdrpm; genhdlist2 --allow-empty-media noarch; genhdlist2 $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)' +alias cruc='(cdrpm; genhdlist2 --clean --allow-empty-media noarch; genhdlist2 --clean $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)' # Build local repository (RHEL) alias cry='(cdrpm; createrepo $(uname -i); createrepo noarch; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")' +alias sy='sudo yum localinstall -y --nogpgcheck' + +# Build local repository (openSUSE) +alias crz='(cdrpm; createrepo $(uname -i); createrepo noarch; sudo zypper refresh)' + +# Build local repository (PCLOS) +alias cra='(cdrpm; genpkglist $PWD noarch; genpkglist $PWD i586; genpkglist $PWD x86_64; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)' +alias crac='(cdrpm; for i in i586 noarch x86_64; do cd $i; tdesortrpm.sh; cd -; done; rpmsign --addsign */RPMS.*/*.rpm; for i in i586 noarch x86_64; do for j in 3rdparty applications dependencies extras libraries main; do genpkglist $PWD/$i $j; done; done; for i in i586 noarch x86_64; do genbasedir $PWD/$i 3rdparty applications dependencies extras libraries main; done; sudo apt-get update)' diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index 3842b4c0b..a6df1f0b5 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -161,13 +161,8 @@ cp -f "${COMP}/${SPEC}" "${SOURCEDIR}" echo "Copying TARBALL ..." cp -fv "${TARBALL}" "${SOURCEDIR}" -if [ $(hostname) = "aria.vtf" ]; then - BUILDDIR="$HOME/rpmbuild/BUILD/BUILD${DIST}.$(uname -i)" - BUILDROOTDIR="$HOME/rpmbuild/BUILDROOT/BUILDROOT${DIST}.$(uname -i)" -else - BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)" - BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)" -fi +BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)" +BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)" TOPSRCRPMDIR="$(rpm -E %_srcrpmdir)" TOPRPMDIR="$(rpm -E %_rpmdir)" |