diff --git a/build.sh b/build.sh index 86bc767a5..da53d5907 100755 --- a/build.sh +++ b/build.sh @@ -16,9 +16,6 @@ # # setup # - -_build_sh_ver="0.5.3" - _script_name="build(er)" _build_arch="$_arch" _cur_repo=`pwd | awk -F '/' '{print $NF}'` @@ -29,8 +26,6 @@ for subroutine in ${_needed_functions} do source _buildscripts/functions/${subroutine} done -# load makepkg.conf -source _buildscripts/${_cur_repo}-${_arch}-makepkg.conf current_repo="$_cur_repo" @@ -60,7 +55,7 @@ build_it() do_makedeps do_deps - ../makepkg -fL $_mkpkg_flags || BUILD_BROKEN="1" + ../makepkg -f $_mkpkg_flags || BUILD_BROKEN="1" if [ "$BUILD_BROKEN" = "1" ] ; then if [ "$_build_stop" = "1" ] ; then @@ -76,7 +71,7 @@ build_it() fi fi else - ../makepkg -fL $_mkpkg_flags || BUILD_BROKEN="1" + ../makepkg -f $_mkpkg_flags || BUILD_BROKEN="1" if [ "$BUILD_BROKEN" = "1" ] ; then if [ "$_build_stop" = "1" ] ; then @@ -100,39 +95,6 @@ build_it() exit 1 fi - # Create log package - ls *.log - mkdir -p log/var/log/chakra/$module - mv *.log log/var/log/chakra/$module - cd log - # Create .PKGINFO - echo "Create log packages for $module" - local builddate=$(date -u "+%s") - if [[ -n $PACKAGER ]]; then - local packager="$PACKAGER" - else - local packager="Unknown Packager" - fi - local size="$(du -sk)" - size="$(( ${size%%[^0-9]*} * 1024 ))" - - echo "# Generated by build.sh $_build_sh_ver" >.PKGINFO - echo "# $(LC_ALL=C date -u)" >>.PKGINFO - echo "pkgname = $module-log" >>.PKGINFO - echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO - echo "pkgdesc = Build logs of $module" >>.PKGINFO - echo "url = http://chakra-project.org" >>.PKGINFO - echo "builddate = $builddate" >>.PKGINFO - echo "packager = $packager" >>.PKGINFO - echo "size = $size" >>.PKGINFO - echo "arch = $CARCH" >>.PKGINFO - echo "group = chakra-log" >>.PKGINFO - # Create tarball - tar -cJf $module-log-$pkgver-$pkgrel-$CARCH.pkg.tar.xz var .PKGINFO - # Move pkg - mv $module-log-$pkgver-$pkgrel-$CARCH.pkg.tar.xz ../../_repo/local - cd .. - # Install packages if [ "$_build_autoinstall" = "1" ] ; then # Look for the exact package names : @@ -173,9 +135,8 @@ build_it() msg "removing debug packages ..." sudo pacman -Rcs kde-debug --noconfirm &>/dev/null + sudo pacman -Rcs chakra-logs --noconfirm &>/dev/null echo " " - msg "removing log packages ..." - sudo pacman -Rcs chakra-log --noconfirm &>/dev/null echo " " }