Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/core/systemd/systemd-195-r1.smage2

    Diff of /smage/trunk/core/systemd/systemd-195-r1.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 4207 by niro, Fri Nov 9 10:57:08 2012 UTC revision 4208 by niro, Fri Nov 9 11:59:27 2012 UTC
    # Line 252  fi Line 252  fi
    252  src_install_systemd()  src_install_systemd()
    253  {  {
    254   mmake -j1 DESTDIR=${BINDIR} install || die   mmake -j1 DESTDIR=${BINDIR} install || die
    255  if [[ ${ENABLE_GTK} = 1 ]]  
    256  then   # alx
    257   SRCDIR="${UI_SRCDIR}" mmake DESTDIR=${BINDIR} install || die   mdelete -r /etc/bash_completion.d || die
    258  fi   mdelete -r /usr/include || die
    259     mdelete -r /usr/share/doc || die
    260     mdelete -r /usr/share/man || die
    261     mdelete -r /usr/share/pkgconfig || die
    262     zapmost ${BINDIR}/usr/$(mlibdir) \
    263     binfmt.d \
    264     modules-load.d \
    265     systemd \
    266     tmpfiles.d \
    267     libsystemd\*.so.* \
    268     || die
    269    
    270   # keep some directories   # keep some directories
    271   mkeepdir /run || die   mkeepdir /run || die
    # Line 304  fi Line 314  fi
    314   mkeepdir /usr/lib/systemd/system-generators || die   mkeepdir /usr/lib/systemd/system-generators || die
    315    
    316   # login-manager pam policy - force register kdm, gdm etc with pam_systemd   # login-manager pam policy - force register kdm, gdm etc with pam_systemd
    317   all-abis minstallpam login-manager.pamd login-manager || die   #all-abis minstallpam login-manager.pamd login-manager || die
    318    
    319   # do not bother with non-existend services, mask them   # do not bother with non-existend services, mask them
    320   mlink /dev/null /etc/systemd/system/syslog.service || die   mlink /dev/null /etc/systemd/system/syslog.service || die
    # Line 314  fi Line 324  fi
    324   # we have no rpm, remove config macros   # we have no rpm, remove config macros
    325   mdelete -r /etc/rpm || die   mdelete -r /etc/rpm || die
    326    
      minstalldocs DISTRO_PORTING LICENSE README TODO || die  
       
    327   # remove files which are owned by other packages   # remove files which are owned by other packages
    328   if [[ ${ENABLE_GTK} = 1 ]]   if [[ ${ENABLE_GTK} = 1 ]]
    329   then   then
    # Line 358  fi Line 366  fi
    366   minstalludevrule rules/99-systemd.rules || die   minstalludevrule rules/99-systemd.rules || die
    367  }  }
    368    
    369    src_install_systemd-dev()
    370    {
    371     mmake -j1 DESTDIR=${BINDIR} install || die
    372    if [[ ${ENABLE_GTK} = 1 ]]
    373    then
    374     SRCDIR="${UI_SRCDIR}" mmake DESTDIR=${BINDIR} install || die
    375    fi
    376    
    377     # do not package the kernel.core_pattern setting until systemd-coredump
    378     # is a part of an actual systemd release and it's made clear how to get
    379     # the core dumps out of the journal
    380     rm ${BINDIR}/usr/lib/sysctl.d/coredump.conf || die
    381     rm -r ${BINDIR}/usr/lib/sysctl.d || die
    382    
    383     # we create all wants links manually at installation time to make sure
    384     # they are not owned and hence overriden by mage after the user deleted
    385     # them.
    386     rm -r ${BINDIR}/etc/systemd/system/*.target.wants || die
    387    
    388     # we have no rpm, remove config macros
    389     mdelete -r /etc/rpm || die
    390    
    391     minstalldocs DISTRO_PORTING LICENSE README TODO || die
    392    
    393     # remove files which are owned by other packages
    394     if [[ ${ENABLE_GTK} = 1 ]]
    395     then
    396     mdelete /usr/bin/systemadm || die
    397     mdelete /usr/bin/systemd-gnome-ask-password-agent || die
    398     mdelete /usr/share/man/man1/systemadm.\* || die
    399     fi
    400     mdelete /usr/bin/systemd-analyze || die
    401     mdelete -r /etc/udev || die
    402     mdelete /usr/bin/udevadm || die
    403     mdelete /usr/include/libudev.h || die
    404     mdelete -r /usr/include/gudev-1.0 || die
    405     mdelete /usr/lib/systemd/systemd-udevd || die
    406     mdelete /usr/lib/systemd/system/systemd-udevd-control.socket || die
    407     mdelete /usr/lib/systemd/system/systemd-udevd-kernel.socket || die
    408     mdelete /usr/lib/systemd/system/systemd-udevd.service || die
    409     mdelete /usr/lib/systemd/system/systemd-udev-settle.service || die
    410     mdelete /usr/lib/systemd/system/systemd-udev-trigger.service || die
    411     mdelete -r /usr/lib/udev || die
    412     rm ${BINDIR}/usr/$(mlibdir)/libgudev* || die
    413     rm ${BINDIR}/usr/$(mlibdir)/libudev* || die
    414     #mdelete -r /usr/$(mlibdir)/girepository-1.0 || die
    415     mdelete /usr/$(mlibdir)/pkgconfig/gudev-1.0.pc || die
    416     mdelete /usr/$(mlibdir)/pkgconfig/libudev.pc || die
    417     if [[ $(mlibdir) != lib ]]
    418     then
    419     rm ${BINDIR}/usr/lib/libgudev* || die
    420     rm ${BINDIR}/usr/lib/libudev* || die
    421     #mdelete -r /usr/lib/girepository-1.0 || die
    422     mdelete /usr/lib/pkgconfig/gudev-1.0.pc || die
    423     mdelete /usr/lib/pkgconfig/libudev.pc || die
    424     fi
    425     #mdelete -r /usr/share/gir-1.0 || die
    426     mdelete /usr/share/man/man7/udev.7 || die
    427     mdelete /usr/share/man/man8/systemd-udevd.8 || die
    428     mdelete /usr/share/man/man8/udevadm.8 || die
    429     mdelete /usr/share/pkgconfig/udev.pc || die
    430    
    431     # alx
    432     zapmost ${BINDIR}/etc bash_completion.d || die
    433     zapmost ${BINDIR}/usr/$(mlibdir) \
    434     libsystemd.so \
    435     libsystemd.la \
    436     libsystemd.a \
    437     || die
    438     mdelete /usr/bin || die
    439     mdelete /usr/bin || die
    440     mdelete /usr/share/dbus-1 || die
    441     mdelete /usr/share/polkit-1 || die
    442     mdelete /usr/share/systemd || die
    443    }
    444    
    445  src_install_systemd-tools()  src_install_systemd-tools()
    446  {  {
    447   cd ${SRCDIR}   cd ${SRCDIR}
    # Line 369  src_install_systemd-tools() Line 453  src_install_systemd-tools()
    453   fi   fi
    454   all-abis minstallexec src/analyze/systemd-analyze || die   all-abis minstallexec src/analyze/systemd-analyze || die
    455  }  }
    456    src_install_libudev()
    457    {
    458     mmake -j1 DESTDIR=${BINDIR} install || die
    459    
    460     # cleanup all files but the libudev owned ones
    461     zapmost ${BINDIR} \
    462     usr/$(mlibdir)/libudev\*.so.\* \
    463     $([[ $(mlibdir) != lib ]] && echo 'usr/lib/libudev*.so.*') \
    464     || die
    465    }
    466    
    467  src_install_libudev()  src_install_libudev()
    468  {  {
    # Line 377  src_install_libudev() Line 471  src_install_libudev()
    471   # cleanup all files but the libudev owned ones   # cleanup all files but the libudev owned ones
    472   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    473   usr/include/libudev.h \   usr/include/libudev.h \
    474   usr/$(mlibdir)/libudev\* \   usr/$(mlibdir)/libudev.so \
    475     usr/$(mlibdir)/libudev.la \
    476     usr/$(mlibdir)/libudev.a \
    477   usr/$(mlibdir)/pkgconfig/libudev.pc \   usr/$(mlibdir)/pkgconfig/libudev.pc \
    478   $([[ $(mlibdir) != lib ]] && echo 'usr/lib/libudev*') \   $([[ $(mlibdir) != lib ]] && echo 'usr/lib/libudev.so') \
    479     $([[ $(mlibdir) != lib ]] && echo 'usr/lib/libudev.la') \
    480     $([[ $(mlibdir) != lib ]] && echo 'usr/lib/libudev.a') \
    481   $([[ $(mlibdir) != lib ]] && echo 'usr/lib/pkgconfig/libudev.pc') \   $([[ $(mlibdir) != lib ]] && echo 'usr/lib/pkgconfig/libudev.pc') \
    482   || die   || die
    483  }  }
    # Line 390  src_install_libgudev() Line 488  src_install_libgudev()
    488    
    489   # cleanup all files but the libgudev owned ones   # cleanup all files but the libgudev owned ones
    490   zapmost ${BINDIR} \   zapmost ${BINDIR} \
    491     usr/$(mlibdir)/libgudev\*.so.\* \
    492     $([[ $(mlibdir) != lib ]] && echo 'usr/lib/libgudev*.so.*') \
    493     || die
    494    }
    495    
    496    src_install_libgudev-dev()
    497    {
    498     mmake -j1 DESTDIR=${BINDIR} install || die
    499    
    500     # cleanup all files but the libgudev owned ones
    501     zapmost ${BINDIR} \
    502   usr/include/gudev-1.0 \   usr/include/gudev-1.0 \
    503   usr/$(mlibdir)/libgudev\* \   usr/$(mlibdir)/libgudev.so \
    504     usr/$(mlibdir)/libgudev.la \
    505     usr/$(mlibdir)/libgudev.a \
    506   usr/$(mlibdir)/pkgconfig/gudev-1.0.pc \   usr/$(mlibdir)/pkgconfig/gudev-1.0.pc \
    507   $([[ $(mlibdir) != lib ]] && echo 'usr/lib/libgudev*') \   $([[ $(mlibdir) != lib ]] && echo 'usr/lib/libgudev.so') \
    508     $([[ $(mlibdir) != lib ]] && echo 'usr/lib/libgudev.la') \
    509     $([[ $(mlibdir) != lib ]] && echo 'usr/lib/libgudev.a') \
    510   $([[ $(mlibdir) != lib ]] && echo 'usr/lib/pkgconfig/gudev-1.0.pc') \   $([[ $(mlibdir) != lib ]] && echo 'usr/lib/pkgconfig/gudev-1.0.pc') \
    511   || die   || die
    512    
    # Line 417  src_install_udev() Line 530  src_install_udev()
    530   usr/lib/systemd/system/systemd-udev-settle.service \   usr/lib/systemd/system/systemd-udev-settle.service \
    531   usr/lib/systemd/system/systemd-udev-trigger.service \   usr/lib/systemd/system/systemd-udev-trigger.service \
    532   usr/lib/udev \   usr/lib/udev \
      usr/share/man/man7/udev.7 \  
      usr/share/man/man8/systemd-udevd.8 \  
      usr/share/man/man8/udevadm.8 \  
      usr/share/pkgconfig/udev.pc \  
    533   || die   || die
    534    
    535   # remove udev rule for systemd   # remove udev rule for systemd
    536   mdelete /usr/lib/udev/rules.d/99-systemd.rules || die   mdelete /usr/lib/udev/rules.d/99-systemd.rules || die
    537    
      minstalldocs LICENSE* NEWS README TODO || die  
       
    538   # install our config   # install our config
    539   cd ${UDEV_CONFIG_SRCDIR}   cd ${UDEV_CONFIG_SRCDIR}
    540   make DESTDIR=${BINDIR} install || die   make DESTDIR=${BINDIR} install || die
    # Line 451  fi Line 558  fi
    558   echo "CONFIG_PROTECT_MASK=\"/etc/udev/rules.d\"" > ${BINDIR}/etc/env.d/02udev || die   echo "CONFIG_PROTECT_MASK=\"/etc/udev/rules.d\"" > ${BINDIR}/etc/env.d/02udev || die
    559  }  }
    560    
    561    src_install_udev-dev()
    562    {
    563     mmake -j1 DESTDIR=${BINDIR} install || die
    564    
    565     # cleanup all files but the udev owned ones
    566     zapmost ${BINDIR} \
    567     usr/share/man/man7/udev.7 \
    568     usr/share/man/man8/systemd-udevd.8 \
    569     usr/share/man/man8/udevadm.8 \
    570     usr/share/pkgconfig/udev.pc \
    571     || die
    572    
    573     minstalldocs LICENSE* NEWS README TODO || die
    574    }
    575    
    576  preinstall_udev()  preinstall_udev()
    577  {  {
    578   add_conf_prot_mask /etc/udev /etc/env.d /etc/rc.d/init.d /etc/modprobe.d   add_conf_prot_mask /etc/udev /etc/env.d /etc/rc.d/init.d /etc/modprobe.d
    Legend:
    Removed from v.4207  
    changed lines
      Added in v.4208