From dc92d5f922d5f6b157c091267d2828336727b8e2 Mon Sep 17 00:00:00 2001 From: piernov Date: Tue, 17 Jul 2012 01:44:52 +0200 Subject: systemd 186-2 correction port --- systemd/.footprint.i686 | 4 +- systemd/.footprint.x86_64 | 4 +- systemd/.md5sum.i686 | 3 +- systemd/.md5sum.x86_64 | 3 +- systemd/NuTyX.patch | 100 ++++++++++++++++++++++++++++++++++++++++++++++ systemd/Pkgfile | 46 ++++++++------------- systemd/os-release | 9 +++++ 7 files changed, 135 insertions(+), 34 deletions(-) create mode 100644 systemd/NuTyX.patch create mode 100644 systemd/os-release (limited to 'systemd') diff --git a/systemd/.footprint.i686 b/systemd/.footprint.i686 index 92a3761cc..b62bbd342 100644 --- a/systemd/.footprint.i686 +++ b/systemd/.footprint.i686 @@ -12,6 +12,7 @@ drwxr-xr-x root/root etc/dbus-1/system.d/ -rw-r--r-- root/root etc/dbus-1/system.d/org.freedesktop.systemd1.conf -rw-r--r-- root/root etc/dbus-1/system.d/org.freedesktop.timedate1.conf drwxr-xr-x root/root etc/modules-load.d/ +-rw-r--r-- root/root etc/os-release drwxr-xr-x root/root etc/rpm/ -rw-r--r-- root/root etc/rpm/macros.systemd drwxr-xr-x root/root etc/sysctl.d/ @@ -40,11 +41,11 @@ drwxr-xr-x root/root lib/security/ drwxr-xr-x root/root lib/udev/ drwxr-xr-x root/root sbin/ lrwxrwxrwx root/root sbin/halt -> /usr/bin/systemctl -lrwxrwxrwx root/root sbin/init -> ../usr/lib/systemd/systemd lrwxrwxrwx root/root sbin/poweroff -> /usr/bin/systemctl lrwxrwxrwx root/root sbin/reboot -> /usr/bin/systemctl lrwxrwxrwx root/root sbin/runlevel -> /usr/bin/systemctl lrwxrwxrwx root/root sbin/shutdown -> /usr/bin/systemctl +lrwxrwxrwx root/root sbin/systemd -> ../usr/lib/systemd/systemd lrwxrwxrwx root/root sbin/telinit -> /usr/bin/systemctl lrwxrwxrwx root/root sbin/udevadm -> ../usr/bin/udevadm drwxr-xr-x root/root usr/ @@ -151,6 +152,7 @@ lrwxrwxrwx root/root usr/lib/systemd/system/dbus-org.freedesktop.timedate1.servi lrwxrwxrwx root/root usr/lib/systemd/system/default.target -> graphical.target -rw-r--r-- root/root usr/lib/systemd/system/dev-hugepages.mount -rw-r--r-- root/root usr/lib/systemd/system/dev-mqueue.mount +-rw-r--r-- root/root usr/lib/systemd/system/display-manager.service -rw-r--r-- root/root usr/lib/systemd/system/emergency.service -rw-r--r-- root/root usr/lib/systemd/system/emergency.target -rw-r--r-- root/root usr/lib/systemd/system/final.target diff --git a/systemd/.footprint.x86_64 b/systemd/.footprint.x86_64 index 92a3761cc..b62bbd342 100644 --- a/systemd/.footprint.x86_64 +++ b/systemd/.footprint.x86_64 @@ -12,6 +12,7 @@ drwxr-xr-x root/root etc/dbus-1/system.d/ -rw-r--r-- root/root etc/dbus-1/system.d/org.freedesktop.systemd1.conf -rw-r--r-- root/root etc/dbus-1/system.d/org.freedesktop.timedate1.conf drwxr-xr-x root/root etc/modules-load.d/ +-rw-r--r-- root/root etc/os-release drwxr-xr-x root/root etc/rpm/ -rw-r--r-- root/root etc/rpm/macros.systemd drwxr-xr-x root/root etc/sysctl.d/ @@ -40,11 +41,11 @@ drwxr-xr-x root/root lib/security/ drwxr-xr-x root/root lib/udev/ drwxr-xr-x root/root sbin/ lrwxrwxrwx root/root sbin/halt -> /usr/bin/systemctl -lrwxrwxrwx root/root sbin/init -> ../usr/lib/systemd/systemd lrwxrwxrwx root/root sbin/poweroff -> /usr/bin/systemctl lrwxrwxrwx root/root sbin/reboot -> /usr/bin/systemctl lrwxrwxrwx root/root sbin/runlevel -> /usr/bin/systemctl lrwxrwxrwx root/root sbin/shutdown -> /usr/bin/systemctl +lrwxrwxrwx root/root sbin/systemd -> ../usr/lib/systemd/systemd lrwxrwxrwx root/root sbin/telinit -> /usr/bin/systemctl lrwxrwxrwx root/root sbin/udevadm -> ../usr/bin/udevadm drwxr-xr-x root/root usr/ @@ -151,6 +152,7 @@ lrwxrwxrwx root/root usr/lib/systemd/system/dbus-org.freedesktop.timedate1.servi lrwxrwxrwx root/root usr/lib/systemd/system/default.target -> graphical.target -rw-r--r-- root/root usr/lib/systemd/system/dev-hugepages.mount -rw-r--r-- root/root usr/lib/systemd/system/dev-mqueue.mount +-rw-r--r-- root/root usr/lib/systemd/system/display-manager.service -rw-r--r-- root/root usr/lib/systemd/system/emergency.service -rw-r--r-- root/root usr/lib/systemd/system/emergency.target -rw-r--r-- root/root usr/lib/systemd/system/final.target diff --git a/systemd/.md5sum.i686 b/systemd/.md5sum.i686 index 8e17d533d..e9b46d5fc 100644 --- a/systemd/.md5sum.i686 +++ b/systemd/.md5sum.i686 @@ -1,2 +1,3 @@ +424a1798ec8b9de122d3285f663b0179 NuTyX.patch +0aacd57f0add2f36ec54c337bb5562a1 os-release 17eff1d31e6e49bf82e129fe57efd59b systemd-186.tar.xz -0e226e6752f093a76150ec621048ba1c udev-config-20100128.tar.bz2 diff --git a/systemd/.md5sum.x86_64 b/systemd/.md5sum.x86_64 index 8e17d533d..e9b46d5fc 100644 --- a/systemd/.md5sum.x86_64 +++ b/systemd/.md5sum.x86_64 @@ -1,2 +1,3 @@ +424a1798ec8b9de122d3285f663b0179 NuTyX.patch +0aacd57f0add2f36ec54c337bb5562a1 os-release 17eff1d31e6e49bf82e129fe57efd59b systemd-186.tar.xz -0e226e6752f093a76150ec621048ba1c udev-config-20100128.tar.bz2 diff --git a/systemd/NuTyX.patch b/systemd/NuTyX.patch new file mode 100644 index 000000000..0a7e4c155 --- /dev/null +++ b/systemd/NuTyX.patch @@ -0,0 +1,100 @@ +--- configure.ac.old 2012-07-15 18:38:50.961999995 +0200 ++++ configure.ac 2012-07-15 18:41:44.681999995 +0200 +@@ -500,7 +500,7 @@ + AC_PATH_PROG([XSLTPROC], [xsltproc]) + AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x) + +-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom or other])) ++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom, nutyx or other])) + if test "z$with_distro" = "z"; then + if test "$cross_compiling" = yes; then + AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) +@@ -589,6 +589,12 @@ + AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia]) + M4_DEFINES=-DTARGET_MAGEIA=1 + ;; ++ nutyx) ++ SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d ++ SYSTEM_SYSVRCND_PATH=/etc/rc.d ++ AC_DEFINE(TARGET_NUTYX, [], [Target is NuTyX]) ++ M4_DEFINES=-DTARGET_NUTYX=1 ++ ;; + other) + ;; + *) +@@ -642,6 +648,7 @@ + AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego) + AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom) + AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia) ++AM_CONDITIONAL(TARGET_NUTYX, test x"$with_distro" = xnutyx) + + AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes") + +--- Makefile.am.old 2012-07-17 01:24:28.502999995 +0200 ++++ Makefile.am 2012-07-17 01:24:21.946999995 +0200 +@@ -191,6 +191,12 @@ + -DKBD_SETFONT=\"/bin/setfont\" \ + -DDEFAULT_FONT=\"LatArCyrHeb-16\" + else ++if TARGET_NUTYX ++AM_CPPFLAGS += \ ++ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ ++ -DKBD_SETFONT=\"/bin/setfont\" \ ++ -DDEFAULT_FONT=\"LatArCyrHeb-16\" ++else + AM_CPPFLAGS += \ + -DKBD_LOADKEYS=\"/bin/loadkeys\" \ + -DKBD_SETFONT=\"/bin/setfont\" \ +@@ -202,6 +208,7 @@ + endif + endif + endif ++endif + + # ------------------------------------------------------------------------------ + rootbin_PROGRAMS = \ +@@ -426,6 +433,11 @@ + systemd-rc-local-generator + endif + ++if TARGET_NUTYX ++dist_systemunit_DATA += \ ++ units/frugalware/display-manager.service ++endif ++ + dist_doc_DATA = \ + README \ + NEWS \ +--- src/journal/journalctl.c.old 2012-07-15 20:18:05.227999996 +0200 ++++ src/journal/journalctl.c 2012-07-15 20:18:39.341999995 +0200 +@@ -229,8 +229,8 @@ + } + + #ifdef HAVE_ACL +- if (!arg_quiet && geteuid() != 0 && in_group("adm") <= 0) +- log_warning("Showing user generated messages only. Users in the group 'adm' can see all messages. Pass -q to turn this message off."); ++ if (!arg_quiet && geteuid() != 0 && in_group("admin") <= 0) ++ log_warning("Showing user generated messages only. Users in the group 'admin' can see all messages. Pass -q to turn this message off."); + #endif + + r = sd_journal_open(&j, arg_local ? SD_JOURNAL_LOCAL_ONLY : 0); +--- src/journal/journald.c.old 2012-07-15 20:18:11.107999996 +0200 ++++ src/journal/journald.c 2012-07-15 20:18:23.791999995 +0200 +@@ -209,7 +209,7 @@ + } + + static void server_read_file_gid(Server *s) { +- const char *adm = "adm"; ++ const char *adm = "admin"; + int r; + + assert(s); +@@ -219,7 +219,7 @@ + + r = get_group_creds(&adm, &s->file_gid); + if (r < 0) +- log_warning("Failed to resolve 'adm' group: %s", strerror(-r)); ++ log_warning("Failed to resolve 'admin' group: %s", strerror(-r)); + + /* if we couldn't read the gid, then it will be 0, but that's + * fine and we shouldn't try to resolve the group again, so diff --git a/systemd/Pkgfile b/systemd/Pkgfile index 2168950d8..87ccdf65b 100644 --- a/systemd/Pkgfile +++ b/systemd/Pkgfile @@ -1,38 +1,25 @@ # Description: Gestionnaire de démarrage et de service remplaçant SysVinit. # URL: http://www.freedesktop.org/software/systemd/ -# Maintainer: cgit.freedesktop.org/systemd/systemd/ +# Maintainer: http://cgit.freedesktop.org/systemd/systemd/ # Packager: piernov -# Depends on: libusbx,usbutils,gobject-introspection,gperf,acl,pciutils, intltool, libcap -# Run on: libcap +# Depends on: libusbx, usbutils, gobject-introspection, gperf, pciutils, intltool, dbus, libcap, syslog-ng, sysvinit +# Run on: dbus,libcap,syslog-ng,sysvinit,acl name=systemd version=186 -release=1 -#_lfs_release=20100128 -source=(http://www.freedesktop.org/software/$name/$name-$version.tar.xz) -# http://www.linuxfromscratch.org/lfs/downloads/development/udev-config-${_lfs_release}.tar.bz2) +release=2 +source=(http://www.freedesktop.org/software/$name/$name-$version.tar.xz + NuTyX.patch + os-release) build() { -# if ( pkginfo -i|grep "^glib " > /dev/null) then -# EXTRA="--with-pci-ids-path=/usr/share/pci.ids" -# else -# EXTRA="--disable-extras --disable-introspection --disable-hwdb --disable-keymap" -# fi -# cd udev-$version - -# install -dv $PKG/lib/{firmware,udev/devices/{pts,shm}} -# ln -s /proc/self/fd $PKG/lib/udev/devices/fd -# ln -s /proc/self/fd/0 $PKG/lib/udev/devices/stdin -# ln -s /proc/self/fd/1 $PKG/lib/udev/devices/stdout -# ln -s /proc/self/fd/2 $PKG/lib/udev/devices/stderr -# ln -s /proc/kcore $PKG/lib/udev/devices/core cd $name-$version -# sed 's|usergeneratordir = $(pkglibexecdir)/user-generators|usergeneratordir=/usr/lib/systemd/user-generators|' -i Makefile.in + patch -p0 < ../NuTyX.patch + + autoreconf - SYSTEM_SYSVRCND_PATH=/etc/rc.d \ - SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d \ ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -42,7 +29,7 @@ build() { --disable-audit \ --disable-ima \ --with-pamlibdir=/lib/security \ - --with-distro=other \ + --with-distro=nutyx \ --with-pci-ids-path=/usr/share/pci.ids \ --with-usb-ids-path=/usr/share/usb.ids \ --with-firmware-path=/lib/firmware @@ -59,18 +46,17 @@ build() { for tool in runlevel reboot shutdown poweroff halt telinit; do ln -s '/usr/bin/systemctl' $PKG/sbin/$tool done - ln -s '../usr/lib/systemd/systemd' $PKG/sbin/init + + ln -s '../usr/lib/systemd/systemd' $PKG/sbin/systemd ln -s ../usr/bin/udevadm $PKG/sbin/udevadm ln -s ../../usr/lib/systemd/systemd-udevd $PKG/usr/bin/udevd install -m644 tmpfiles.d/legacy.conf $PKG/usr/lib/tmpfiles.d -# sed -i '1s/python$/python2/' $PKG/usr/bin/systemd-analyze - -# cd ../udev-config-${_lfs_release} -# make DESTDIR=$PKG install -# make DESTDIR=$PKG install-doc + sed -i '1s/python$/python2/' $PKG/usr/bin/systemd-analyze echo "d /run/var 0755 root root -" >> $PKG/usr/lib/tmpfiles.d/legacy.conf + + install -m644 ../os-release $PKG/etc/os-release } diff --git a/systemd/os-release b/systemd/os-release new file mode 100644 index 000000000..1d0f9c112 --- /dev/null +++ b/systemd/os-release @@ -0,0 +1,9 @@ +NAME="NuTyX Linux" +VERSION="2012 pakxe.4" +ID=nutyx +ID_LIKE=lfs +PRETTY_NAME="NuTyX Linux 2012 pakxe.4" +ANSI_COLOR="0;33" +HOME_URL="https://nutyx.org/" +SUPPORT_URL="http://nutyx.org/sections/view.php?id=12" +BUG_REPORT_URL="http://nutyx.org/sections/view.php?id=38" -- cgit v1.2.3-54-g00ecf