Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename_device: Remove rename_device functionality #379

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

rename_device: Remove rename_device functionality #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95ce078
rename_device: Remove rename_device functionality (1/2)
jamacku Jun 29, 2021
d134188
rename_device: Require rust-ifcfg-devname package as replacement for …
jamacku Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions initscripts.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Requires: systemd
Requires: util-linux
Requires: chkconfig
Requires: initscripts-service
Requires: initscripts-rename-device
Requires: rust-ifcfg-devname

Requires(pre): shadow-utils
Requires(post): coreutils
Expand Down Expand Up @@ -90,16 +90,6 @@ other legacy tools & utilities.

# === SUBPACKAGES =============================================================

%package -n initscripts-rename-device
Summary: Udev helper utility that provides network interface naming

%shared_requirements

%description -n initscripts-rename-device
Udev helper utility that provides network interface naming

# ---------------

%package -n initscripts-service
Summary: Support for service command
BuildArch: noarch
Expand Down Expand Up @@ -336,14 +326,6 @@ fi

# =============================================================================

%files -n initscripts-rename-device

%{_prefix}/lib/udev/rename_device

%{_udevrulesdir}/*

# ---------------

%files -n initscripts-service

%dir %{_libexecdir}/%{name}
Expand Down
11 changes: 1 addition & 10 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,17 @@ CC = gcc
CFLAGS += $(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE -fPIE
LDFLAGS += $(RPM_LD_FLAGS) -pie -z relro -z now

PROGS = consoletype genhostid rename_device usernetctl usleep
PROGS = consoletype genhostid usernetctl usleep

all: $(PROGS)

install: all
install -m 0755 -d $(DESTDIR)$(bindir)
install -m 0755 -d $(DESTDIR)$(sbindir)
install -m 0755 -d $(DESTDIR)$(libdir)/udev
install -m 0755 build/usleep $(DESTDIR)$(bindir)
install -m 0755 build/consoletype $(DESTDIR)$(sbindir)
install -m 0755 build/genhostid $(DESTDIR)$(sbindir)
install -m 0755 build/usernetctl $(DESTDIR)$(sbindir)
install -m 0755 build/rename_device $(DESTDIR)$(libdir)/udev

clean:
rm -f build/*
Expand All @@ -52,13 +50,6 @@ build/genhostid.o: genhostid.c
$(CC) $(CFLAGS) -c -o $@ $^


rename_device: build/rename_device.o
$(CC) $(LDFLAGS) -o build/$@ $^ `pkg-config glib-2.0 --libs`

build/rename_device.o: rename_device.c
$(CC) $(CFLAGS) -c -o $@ $^ `pkg-config glib-2.0 --cflags`


usernetctl: build/usernetctl.o
$(CC) $(LDFLAGS) -o build/$@ $^

Expand Down
Loading