Skip to content

Commit

Permalink
Merge branch 'omp-jb44353' into 'master'
Browse files Browse the repository at this point in the history
fs_rules: Handel /dev/full in the same fashion as /dev/null

See merge request mer-core/scratchbox2!34
  • Loading branch information
Matti Kosola committed Oct 28, 2020
2 parents 4bf15fa + 13e571c commit 1e5ced4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
7 changes: 2 additions & 5 deletions rpm/scratchbox2.spec
@@ -1,12 +1,11 @@
Summary: Scratchbox2 crosscompiling environment
License: LGPL
URL: https://git.merproject.org/mer-core/scratchbox2
URL: https://git.sailfishos.org/mer-core/scratchbox2
Name: scratchbox2
Version: 2.3.90
Release: 14
Release: 0
Source: %{name}-%{version}.tar.gz
Prefix: /usr
Group: Development/Tools
ExclusiveArch: %{ix86}
BuildRequires: make
BuildRequires: autoconf
Expand All @@ -18,14 +17,12 @@ Scratchbox2 crosscompiling environment

%package -n libsb2
Summary: Scratchbox2 preload library
Group: Development/Tools

%description -n libsb2
Scratchbox2 preload library.

%package docs
Summary: Scratchbox2 docs
Group: Development/Tools

%description docs
Scratchbox2 man pages.
Expand Down
5 changes: 5 additions & 0 deletions scratchbox2/rule_lib/fs_rules/dev.lua
Expand Up @@ -51,6 +51,9 @@ rules_dev = {
{name = "rule lib: /dev/null (creat)",
path = "/dev/null",
func_class = FUNC_CLASS_CREAT, use_orig_path = true},
{name = "rule lib: /dev/full (creat)",
path = "/dev/full",
func_class = FUNC_CLASS_CREAT, use_orig_path = true},
{name = "rule lib: /dev/tty* (creat)",
prefix = "/dev/tty",
func_class = FUNC_CLASS_CREAT, use_orig_path = true},
Expand Down Expand Up @@ -90,6 +93,8 @@ rules_dev = {
path = "/dev/console", use_orig_path = true},
{name = "rule lib: /dev/null",
path = "/dev/null", use_orig_path = true},
{name = "rule lib: /dev/full",
path = "/dev/full", use_orig_path = true},
{name = "rule lib: /dev/tty*",
prefix = "/dev/tty", use_orig_path = true},
{name = "rule lib: /dev/fb*",
Expand Down

0 comments on commit 1e5ced4

Please sign in to comment.