From 50de9ff98e813c7ba37d552c40d24a7a36d3b789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Sun, 3 Jan 2016 18:45:50 +0200 Subject: [PATCH 01/12] fix for ntfs usb-disc --- system/base/eudev/files/10-flash-mounts.rules | 88 ++++++++++++++----- system/base/eudev/pspec.xml | 2 +- 2 files changed, 66 insertions(+), 24 deletions(-) diff --git a/system/base/eudev/files/10-flash-mounts.rules b/system/base/eudev/files/10-flash-mounts.rules index 95f21a88..f2f66f44 100644 --- a/system/base/eudev/files/10-flash-mounts.rules +++ b/system/base/eudev/files/10-flash-mounts.rules @@ -1,33 +1,75 @@ -#!/bin/sh -# start at sdb to ignore the system hard drive -KERNEL!="sd[b-z]*", GOTO="exit" -ACTION=="add", PROGRAM!="/sbin/blkid %N", GOTO="exit" +#! /bin/sh -# import some useful filesystem info as variables -IMPORT{program}="/sbin/blkid -o udev -p %N" +####################################### +# USB Flash Drives automounting # +####################################### -# get the label if present, otherwise assign one based on device/partition -ENV{ID_FS_LABEL}!="", ENV{dir_name}="%E{ID_FS_LABEL}" -ENV{ID_FS_LABEL}=="", ENV{dir_name}="flash_drive_%k" +# start at sdb to ignore the system hard drive +KERNEL!="sd[b-z]*", GOTO="exit" +ACTION=="add", PROGRAM!="/sbin/blkid %N", GOTO="exit" -# create the dir in /media and symlink it to /mnt -ACTION=="add", RUN+="/bin/mkdir -p '/media/%E{dir_name}'" +# import some useful filesystem info as variables +IMPORT{program}="/sbin/blkid -o udev -p %N" -# global mount options -#ACTION=="add", ENV{mount_options}="relatime" +# get the label if present, otherwise assign one based on device/partition +ENV{ID_FS_LABEL}!="", ENV{dir_name}="%E{ID_FS_LABEL}" +ENV{ID_FS_LABEL}=="", ENV{dir_name}="flash_drive_%k" -# filesystem-specific mount options (777/666 dir/file perms for vfat) -ACTION=="add",ENV{mount_options_vfat}="gid=100,dmask=000,fmask=111,utf8,flush,rw,noatime,users" +# create the dir in /media and symlink it to /mnt +ACTION=="add", RUN+="/bin/mkdir -p '/media/%E{dir_name}'" -# add device to /etc/fstab -#ACTION=="add", ENV{ID_FS_TYPE}=="vfat|ntfs", RUN+="/bin/sed -i '$a\/dev/%k /media/%E{dir_name} vfat %E{mount_options_vfat} 0 0' /etc/fstab" +# global mount options +#ACTION=="add", ENV{mount_options}="relatime" -# mount device -ACTION=="add", ENV{ID_FS_TYPE}=="vfat|ntfs", RUN+="/bin/mount -t auto -o %E{mount_options_vfat} /dev/%k '/media/%E{dir_name}'" +# filesystem-specific mount options (777/666 dir/file perms for ntfs/vfat) -# clean up after device removal -ACTION=="remove", ENV{dir_name}!="", RUN+="/bin/umount -l '/media/%E{dir_name}'", RUN+="/bin/rmdir '/media/%E{dir_name}'" -ACTION=="remove", ENV{ID_FS_TYPE}!="", RUN+="/bin/sed -i '/\/dev\/%k /d' /etc/fstab" -# exit + +######## +# vfat # +######## + +# vfat specific mount options +ACTION=="add", ENV{mount_options_vfat}="gid=100,dmask=000,fmask=111,utf8,flush,rw,noatime,users" + +# add device to /etc/fstab +ACTION=="add", ENV{ID_FS_TYPE}=="vfat", RUN+="/bin/sed -i '$a\/dev/%k /media/%E{dir_name} vfat %E{mount_options_vfat} 0 0' /etc/fstab" + +# mount device +ACTION=="add", ENV{ID_FS_TYPE}=="vfat", RUN+="/bin/mount -t auto -o %E{mount_options_vfat} /dev/%k '/media/%E{dir_name}'" + + + +######## +# ntfs # +######## + +# ntfs specific mount options +ACTION=="add", ENV{mount_options_ntfs}="gid=100,dmask=000,fmask=111,utf8,flush,rw,noatime,users" + +# add device to /etc/fstab +ACTION=="add", ENV{ID_FS_TYPE}=="ntfs", RUN+="/bin/sed -i '$a\/dev/%k /media/%E{dir_name} ntfs-3g %E{mount_options_ntfs} 0 0' /etc/fstab" + +# mount device +ACTION=="add", ENV{ID_FS_TYPE}=="ntfs", RUN+="/bin/mount -t ntfs-3g -o %E{mount_options_ntfs} /dev/%k '/media/%E{dir_name}'" + + + +##################### +# other filesystems # +##################### + +# ntfs specific mount options +ACTION=="add", ENV{mount_options_other}="gid=100,dmask=000,fmask=111,utf8,flush,rw,noatime,users" + +# automount all other filesystems +ACTION=="add", ENV{ID_FS_TYPE}!="(ntfs|vfat)", RUN+="/bin/mount -t auto -o %E{mount_options_other} /dev/%k '/media/%E{dir_name}'" + +################################# +# clean up after device removal # +################################# +ACTION=="remove", ENV{dir_name}!="", RUN+="/bin/umount -l '/media/%E{dir_name}'", RUN+="/bin/rmdir '/media/%E{dir_name}'" +ACTION=="remove", ENV{ID_FS_TYPE}!="", RUN+="/bin/sed -i '/\/dev\/%k /d' /etc/fstab" + +# exit LABEL="exit" diff --git a/system/base/eudev/pspec.xml b/system/base/eudev/pspec.xml index 84935372..f1cf0bd1 100644 --- a/system/base/eudev/pspec.xml +++ b/system/base/eudev/pspec.xml @@ -123,7 +123,7 @@ 2016-01-03 3.1.2 - Add rules for mount storage. + Add rules for mount storage, ntfs usb disc too. Ertuğrul Erata ertugrulerata@gmail.com From bea005e33dc2c84bfdba1ffaa9def68c523334ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Sun, 3 Jan 2016 20:49:59 +0200 Subject: [PATCH 02/12] version update ... --- system/base/findutils/pspec.xml | 9 ++++++++- system/base/gettext/pspec.xml | 9 ++++++++- system/base/man-pages/pspec.xml | 11 +++++++++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/system/base/findutils/pspec.xml b/system/base/findutils/pspec.xml index d0ea9ac2..e50e0dee 100644 --- a/system/base/findutils/pspec.xml +++ b/system/base/findutils/pspec.xml @@ -12,7 +12,7 @@ app:console GNU utilities to find files The GNU Find Utilities are the basic directory searching utilities of the GNU operating system. These programs are typically used in conjunction with other programs to provide modular and powerful directory search and file locating capabilities to other commands. - http://ftp.gnu.org/pub/gnu/findutils/findutils-4.4.2.tar.gz + http://ftp.gnu.org/pub/gnu/findutils/findutils-4.6.0.tar.gz gettext-devel @@ -31,6 +31,13 @@ + + 2016-01-03 + 4.6.0 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 4.4.2 diff --git a/system/base/gettext/pspec.xml b/system/base/gettext/pspec.xml index 4301cce6..3472c702 100644 --- a/system/base/gettext/pspec.xml +++ b/system/base/gettext/pspec.xml @@ -13,7 +13,7 @@ library GNU libraries and utilities for producing multi-lingual messages The GNU gettext package provides a set of tools and documentation for producing multi-lingual messages in programs. Tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs, a runtime library which supports the retrieval of translated messages, and stand-alone programs for handling the translatable and the already translated strings. Gettext provides an easy to use library and tools for creating, using, and modifying natural language catalogs and is a powerful and simple method for internationalizing programs. - http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.6.tar.gz + http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.7.tar.gz acl-devel glib2-devel @@ -72,6 +72,13 @@ + + 2016-01-03 + 0.19.7 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-10-27 0.19.6 diff --git a/system/base/man-pages/pspec.xml b/system/base/man-pages/pspec.xml index 113b9561..f8f4f632 100644 --- a/system/base/man-pages/pspec.xml +++ b/system/base/man-pages/pspec.xml @@ -12,8 +12,8 @@ data:doc A somewhat comprehensive collection of Linux man pages A large collection of man pages (documentation) from the Linux Documentation Project (LDP). - https://www.kernel.org/pub/linux/docs/man-pages/man-pages-4.02.tar.xz - http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-2003-a.tar.xz + https://www.kernel.org/pub/linux/docs/man-pages/man-pages-4.04.tar.xz + http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-2003-a.tar.xz @@ -32,6 +32,13 @@ + + 2016-01-03 + 4.04 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-08-25 4.02 From 13a835fc167be4f4eed623c8f131c527e006c374 Mon Sep 17 00:00:00 2001 From: suvari Date: Sun, 3 Jan 2016 21:19:56 +0200 Subject: [PATCH 03/12] pciutils: ver. bump to 3.4.1 --- system/base/pciutils/actions.py | 1 + system/base/pciutils/pspec.xml | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/system/base/pciutils/actions.py b/system/base/pciutils/actions.py index 8eebafd0..0bb7c162 100644 --- a/system/base/pciutils/actions.py +++ b/system/base/pciutils/actions.py @@ -11,6 +11,7 @@ from pisi.actionsapi import get def build(): autotools.make('OPT="%s" \ SHARED="yes" \ + PREFIX=/usr \ IDSDIR="/usr/share/misc" \ MANDIR="/usr/share/man" \ all' % get.CFLAGS()) diff --git a/system/base/pciutils/pspec.xml b/system/base/pciutils/pspec.xml index b434031d..79ed0498 100644 --- a/system/base/pciutils/pspec.xml +++ b/system/base/pciutils/pspec.xml @@ -12,7 +12,7 @@ app:console Various utilities dealing with the PCI bus The PCI Utilities are a collection of programs for inspecting and manipulating configuration of PCI devices. - ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-3.2.1.tar.xz + ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-3.4.1.tar.xz