From: jy910.yun Date: Thu, 23 Aug 2012 09:45:42 +0000 (+0900) Subject: modify a problem regarding build break X-Git-Tag: 2.0_alpha^0 X-Git-Url: http://review.tizen.org/git/?p=external%2Fsystemd.git;a=commitdiff_plain modify a problem regarding build break --- diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100644 index 0000000..9d9f8cd --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1,7 @@ +; Sets emacs variables based on mode. +; A list of (major-mode . ((var1 . value1) (var2 . value2))) +; Mode can be nil, which gives default values. + +((nil . ((indent-tabs-mode . nil) + (tab-width . 8))) +) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f4a8a45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,100 @@ +test-install +org.freedesktop.hostname1.xml +org.freedesktop.locale1.xml +org.freedesktop.timedate1.xml +libsystemd-daemon.pc +libsystemd-login.pc +test-login +systemd-loginctl +systemd-localed +systemd-timedated +systemd-uaccess +systemd-logind +systemd-hostnamed +systemd-binfmt +systemd-getty-generator +systemd-nspawn +systemd-stdio-bridge +systemd-machine-id-setup +systemd-detect-virt +systemd-sysctl +test-strv +systemd-ac-power +systemd-timestamp +systemd-cryptsetup +systemd-cryptsetup-generator +systemd-tty-ask-password-agent +systemd-fsck +systemd-quotacheck +systemd-user-sessions +systemd-shutdown +systemd-tmpfiles +systemd-readahead-collect +systemd-readahead-replay +systemd-reply-password +systemd-gnome-ask-password-agent +systemd-ask-password +systemd-kmsg-syslogd +systemd-remount-api-vfs +test-hostname +systemd-modules-load +systemd-vconsole-setup +systemd-shutdownd +systemd-random-seed +systemd-update-utmp +test-env-replace +systemd-cgls +systemd.pc +test-cgroup +.libs/ +systemd-notify +test-daemon +systemd-install +org.freedesktop.systemd1.*.xml +test-ns +test-loopback +systemd-cgroups-agent +systemd-initctl +systemd +test-engine +test-job-type +systemd-stdout-syslog-bridge +systemctl +systemadm +.dirstamp +*.1 +*.3 +*.5 +*.7 +*.8 +*.html +*~ +*.tar.gz +*.o +*.lo +*.a +*.la +.deps/ +Makefile.in +aclocal.m4 +*.cache +compile +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +install-sh +missing +stamp-* +*.stamp +Makefile +ltmain.sh +*.tar.bz2 +*.tar.gz +*.tar.xz +libtool +.vimrc diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..04b1c6c --- /dev/null +++ b/.mailmap @@ -0,0 +1,4 @@ +Kay Sievers +Robert Gerus Robert "arachnist" Gerus +Zbigniew Jędrzejewski-Szmek Zbyszek Szmek +Fabiano Fidêncio Fabiano Fidencio diff --git a/packaging/systemd.spec b/packaging/systemd.spec index 26b608c..c73b502 100644 --- a/packaging/systemd.spec +++ b/packaging/systemd.spec @@ -1,7 +1,8 @@ +#sbs-git:slp/pkgs/s/systemd systemd 37 8ba5df3f1f236e059a9bd77314ed3ca0b4ffcde7 Name: systemd Summary: Systemd System and Service Manager -Version: 25.10 -Release: 1 +Version: 37 +Release: 2 Group: System/Base License: GPLv2 Source0: %{name}-%{version}.tar.gz @@ -13,6 +14,7 @@ BuildRequires: libcap-devel BuildRequires: libacl-devel BuildRequires: intltool BuildRequires: fdupes +BuildRequires: gperf %description system and service manager systemd is a replacement for sysvinit. @@ -22,15 +24,33 @@ process supervision using cgroups and the ability to not only depend on other init script being started, but also availability of a given mount point or dbus service. +%package devel +Summary: systemd development files +Requires: %{name} = %{version} +Group: Development/Libraries + +%description devel +Headers and static libraries for systemd (Development) %prep %setup -q %build -%autogen --disable-static -%configure --disable-static \ - --with-rootdir= \ +DH_OPTIONS='-Nlibpam-systemd -Nsystemd-gui' +export DH_OPTIONS + +libtoolize -c --force +intltoolize -c -f +aclocal -I m4 +autoconf -Wall +autoheader +automake --copy --foreign --add-missing + +./configure --prefix=/usr --disable-static \ + --disable-docs \ + --with-rootdir=/ \ + --with-rootlibdir=/lib \ --with-udevrulesdir=/lib/udev/rules.d \ --disable-gtk \ --disable-libcryptsetup \ @@ -39,6 +59,7 @@ mount point or dbus service. --disable-tcpwrap \ --disable-selinux \ --with-distro=slp + make %{?jobs:-j%jobs} %install @@ -46,39 +67,37 @@ rm -rf %{buildroot} %make_install mkdir -p $RPM_BUILD_ROOT/usr/include -cp $RPM_BUILD_ROOT/usr/share/doc/systemd/sd-daemon.h $RPM_BUILD_ROOT/usr/include +mkdir -p $RPM_BUILD_ROOT/usr/lib +cp src/sd-daemon.h $RPM_BUILD_ROOT/usr/include +#cp .libs/libsystemd-daemon.a $RPM_BUILD_ROOT/usr/lib + +%remove_docs %files %defattr(-,root,root,-) -/bin/systemctl -/bin/systemd -/bin/systemd-ask-password -/bin/systemd-machine-id-setup -/bin/systemd-notify -/bin/systemd-tmpfiles -/bin/systemd-tty-ask-password-agent -/etc/bash_completion.d/systemctl-bash-completion.sh -/etc/dbus-1/system.d/org.freedesktop.hostname1.conf -/etc/dbus-1/system.d/org.freedesktop.systemd1.conf -/etc/systemd/system.conf -/etc/systemd/system/getty.target.wants/serial-getty@serial_console.service -/etc/systemd/system/multi-user.target.wants/remote-fs.target -/etc/systemd/system/sysinit.target.wants/hwclock-load.service -/etc/tmpfiles.d/systemd.conf -/etc/tmpfiles.d/x11.conf -/etc/xdg/systemd/user -/lib/systemd/system* -/lib/udev/rules.d/99-systemd.rules -/usr/bin/systemd* -/usr/share/dbus-1/interfaces/org.freedesktop.systemd1* +/bin/* +/etc/dbus-1/system.d/* +/lib/* +/lib/systemd/system-generators/systemd-getty-generator +/lib/systemd/system/* +/lib/systemd/system/*/* +/lib/udev/rules.d/* +/usr/bin/* +/usr/etc/* +/usr/etc/*/* +/usr/etc/*/*/* +/usr/lib/libsystemd-daemon.so +/usr/lib/libsystemd-login.so +/usr/lib/systemd/user/* +/usr/lib/tmpfiles.d/* +/usr/share/dbus-1/interfaces/*.xml /usr/share/dbus-1/services/org.freedesktop.systemd1.service -/usr/share/dbus-1/system-services/org.freedesktop.hostname1.service -/usr/share/dbus-1/system-services/org.freedesktop.systemd1.service -%exclude /usr/share/doc/systemd/* -/usr/include/sd-daemon.h -/usr/lib/pkgconfig/libsystemd-daemon.pc -/usr/share/pkgconfig/systemd.pc -/usr/share/polkit-1/actions/org.freedesktop.hostname1.policy -/usr/share/polkit-1/actions/org.freedesktop.systemd1.policy -/usr/lib/systemd* +/usr/share/dbus-1/system-services/* +/usr/share/polkit-1/actions/* +/usr/share/systemd/kbd-model-map +%files devel +/usr/include/*.h +/usr/include/*/*.h +/usr/lib/pkgconfig/* +/usr/share/pkgconfig/systemd.pc