From c337de51395858c6f75a9f68c237869ed108049b Mon Sep 17 00:00:00 2001 From: Denis Benato Date: Wed, 12 Mar 2025 15:43:39 +0000 Subject: [PATCH 1/3] chore(Makefile): split up install by package --- Makefile | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 5c4a9dd6..8a8b70f6 100644 --- a/Makefile +++ b/Makefile @@ -48,25 +48,27 @@ clean: distclean: rm -rf .cargo vendor vendor.tar.xz -install-program: - $(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_ROG)" "$(DESTDIR)$(bindir)/$(BIN_ROG)" - - $(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_C)" "$(DESTDIR)$(bindir)/$(BIN_C)" +install-asusd: target/$(TARGET)/$(BIN_D) $(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)" + +install-asusctl: target/$(TARGET)/$(BIN_C) + $(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_C)" "$(DESTDIR)$(bindir)/$(BIN_C)" + +install-asusd_user: target/$(TARGET)/$(BIN_U) $(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_U)" "$(DESTDIR)$(bindir)/$(BIN_U)" -install-data: +install-rog_gui: target/$(TARGET)/$(BIN_ROG) + $(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_ROG)" "$(DESTDIR)$(bindir)/$(BIN_ROG)" + +.PHONY: install-asusd install-asusctl install-asusd_user install-rog_gui + +install-program: install-asusd install-asusctl install-asusd_user install-rog_gui + +install-data-rog_gui: $(INSTALL_DATA) "./rog-control-center/data/$(BIN_ROG).desktop" "$(DESTDIR)$(datarootdir)/applications/$(BIN_ROG).desktop" $(INSTALL_DATA) "./rog-control-center/data/$(BIN_ROG).png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/$(BIN_ROG).png" cd rog-aura/data/layouts && find . -type f -name "*.ron" -exec $(INSTALL_DATA) "{}" "$(DESTDIR)$(datarootdir)/rog-gui/layouts/{}" \; - $(INSTALL_DATA) "./data/$(BIN_D).rules" "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules" - $(INSTALL_DATA) "./rog-aura/data/$(LEDCFG)" "$(DESTDIR)$(datarootdir)/asusd/$(LEDCFG)" - $(INSTALL_DATA) "./data/$(BIN_D).conf" "$(DESTDIR)$(datarootdir)/dbus-1/system.d/$(BIN_D).conf" - - $(INSTALL_DATA) "./data/$(BIN_D).service" "$(DESTDIR)$(libdir)/systemd/system/$(BIN_D).service" - $(INSTALL_DATA) "./data/$(BIN_U).service" "$(DESTDIR)$(libdir)/systemd/user/$(BIN_U).service" - $(INSTALL_DATA) "./data/icons/asus_notif_yellow.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_yellow.png" $(INSTALL_DATA) "./data/icons/asus_notif_green.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_green.png" $(INSTALL_DATA) "./data/icons/asus_notif_blue.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_blue.png" @@ -81,8 +83,22 @@ install-data: $(INSTALL_DATA) "./data/icons/scalable/gpu-vfio.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/status/gpu-vfio.svg" $(INSTALL_DATA) "./data/icons/scalable/notification-reboot.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/status/notification-reboot.svg" +install-data-asusd: + $(INSTALL_DATA) "./data/$(BIN_D).rules" "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules" + $(INSTALL_DATA) "./rog-aura/data/$(LEDCFG)" "$(DESTDIR)$(datarootdir)/asusd/$(LEDCFG)" + $(INSTALL_DATA) "./data/$(BIN_D).conf" "$(DESTDIR)$(datarootdir)/dbus-1/system.d/$(BIN_D).conf" + + $(INSTALL_DATA) "./data/$(BIN_D).service" "$(DESTDIR)$(libdir)/systemd/system/$(BIN_D).service" + cd rog-anime/data && find "./anime" -type f -exec $(INSTALL_DATA) "{}" "$(DESTDIR)$(datarootdir)/asusd/{}" \; +install-data-asusd_user: + $(INSTALL_DATA) "./data/$(BIN_U).service" "$(DESTDIR)$(libdir)/systemd/user/$(BIN_U).service" + +.PHONY: install-data-asusd install-data-asusd_user + +install-data: install-data-asusd install-data-rog_gui + install: install-program install-data uninstall: From 11ee7827e958f2c5a82f391fbcd5e10c74b719a6 Mon Sep 17 00:00:00 2001 From: Denis Benato Date: Sun, 9 Mar 2025 22:25:52 +0100 Subject: [PATCH 2/3] chore: Add packaging instructions for deb This commits adds .deb packaging support for all applications in this repository. --- asusctl/Cargo.toml | 12 ++++++++++++ asusd-user/Cargo.toml | 13 +++++++++++++ asusd/Cargo.toml | 15 +++++++++++++++ rog-control-center/Cargo.toml | 14 ++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/asusctl/Cargo.toml b/asusctl/Cargo.toml index 9c1dffe2..fd69a065 100644 --- a/asusctl/Cargo.toml +++ b/asusctl/Cargo.toml @@ -27,3 +27,15 @@ zbus.workspace = true [dev-dependencies] rog_dbus = { path = "../rog-dbus" } + +[package.metadata.deb] +license-file = ["../LICENSE", "4"] +extended-description = """\ +An utility for Linux to control many aspects of various ASUS laptops +but can also be used with non-asus laptops with reduced features.""" +depends = "$auto" +section = "utility" +priority = "optional" +assets = [ + ["target/release/asusctl", "usr/bin/", "755"], +] diff --git a/asusd-user/Cargo.toml b/asusd-user/Cargo.toml index 0e2129cb..80eecd31 100644 --- a/asusd-user/Cargo.toml +++ b/asusd-user/Cargo.toml @@ -32,3 +32,16 @@ config-traits = { path = "../config-traits" } zbus.workspace = true env_logger.workspace = true + +[package.metadata.deb] +license-file = ["../LICENSE", "4"] +extended-description = """\ +An user utility for Linux to control fancy things on various ASUS laptops +like keyboard effects or anime matrix animation cycles.""" +depends = "$auto" +section = "utility" +priority = "optional" +assets = [ + ["target/release/asusd-user", "usr/bin/", "755"], + ["../asusd_user-fakeinstall/usr/lib/systemd/user/*", "usr/lib/systemd/user/", "644"], +] diff --git a/asusd/Cargo.toml b/asusd/Cargo.toml index 6105a7bf..2e12a2e9 100644 --- a/asusd/Cargo.toml +++ b/asusd/Cargo.toml @@ -45,3 +45,18 @@ concat-idents.workspace = true [dev-dependencies] cargo-husky.workspace = true + +[package.metadata.deb] +license-file = ["../LICENSE", "4"] +extended-description = """\ +The dbus server for asusctl and rog-control-center applications.""" +depends = "$auto" +section = "utility" +priority = "optional" +assets = [ + ["target/release/asusd", "usr/bin/", "755"], + ["../asusd-fakeinstall/usr/lib/systemd/system/*", "usr/lib/systemd/system/", "644"], + ["../asusd-fakeinstall/usr/lib/udev/rules.d/*", "usr/lib/udev/rules.d/", "644"], + ["../asusd-fakeinstall/usr/share/asusd/*", "usr/share/share/asusd/", "644"], + ["../asusd-fakeinstall/usr/share/dbus-1/system.d/*", "usr/share/dbus-1/system.d/", "644"], +] diff --git a/rog-control-center/Cargo.toml b/rog-control-center/Cargo.toml index 0f2dd18d..8a7318ab 100644 --- a/rog-control-center/Cargo.toml +++ b/rog-control-center/Cargo.toml @@ -58,3 +58,17 @@ features = [ [build-dependencies.slint-build] git = "https://github.com/slint-ui/slint.git" + +[package.metadata.deb] +license-file = ["../LICENSE", "4"] +extended-description = """\ +The dbus server for asusctl and rog-control-center applications.""" +depends = "$auto" +section = "utility" +priority = "optional" +assets = [ + ["target/release/rog-control-center", "usr/bin/", "755"], + ["../rog_gui-fakeinstall/usr/share/applications/*", "usr/share/share/applications/", "644"], + ["../rog_gui-fakeinstall/usr/share/icons/hicolor/512x512/apps/*", "usr/share/icons/hicolor/512x512/apps", "644"], + ["../rog_gui-fakeinstall/usr/share/icons/hicolor/scalable/status/*", "usr/share/icons/hicolor/scalable/status", "644"], +] From df93209839f415ed890c40c064fd7622acab6df0 Mon Sep 17 00:00:00 2001 From: Denis Benato Date: Thu, 13 Mar 2025 01:28:06 +0100 Subject: [PATCH 3/3] chore: Install LICENSE file --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8a8b70f6..7a6431b7 100644 --- a/Makefile +++ b/Makefile @@ -100,6 +100,7 @@ install-data-asusd_user: install-data: install-data-asusd install-data-rog_gui install: install-program install-data + $(INSTALL_DATA) "./LICENSE" "$(DESTDIR)$(datarootdir)/asusctl/LICENSE" uninstall: rm -f "$(DESTDIR)$(bindir)/$(BIN_ROG)"