From 1b12e7c5da141f398e6c64f05a2da210181aadd9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 2 Oct 2023 21:59:12 +0200
Subject: [PATCH] treewide: replace luabitops with lua-bit32
The lua-bit32 library is pulled in by luaposix already, so we can drop
luabitops.
---
package/gluon-core/Makefile | 2 +-
package/gluon-core/luasrc/usr/lib/lua/gluon/iputil.lua | 2 +-
package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua | 2 +-
package/gluon-hoodselector/Makefile | 2 +-
package/gluon-hoodselector/luasrc/usr/sbin/hoodselector | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile
index 93b2d599b..867a52aa5 100644
--- a/package/gluon-core/Makefile
+++ b/package/gluon-core/Makefile
@@ -11,7 +11,7 @@ define Package/gluon-core
TITLE:=Base files of Gluon
DEPENDS:= \
+gluon-site +libgluonutil +libiwinfo-lua +lua-platform-info +lua-simple-uci +lua-hash +lua-jsonc \
- +luabitop +luaposix +vxlan +odhcp6c +firewall +pretty-hostname
+ +lua-bit32 +luaposix +vxlan +odhcp6c +firewall +pretty-hostname
endef
define Package/gluon-core/description
diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/iputil.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/iputil.lua
index 266ede38f..e2c37cfd3 100644
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/iputil.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/iputil.lua
@@ -1,4 +1,4 @@
-local bit = require 'bit'
+local bit = require 'bit32'
local M = {}
diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
index d51610667..1f47c5b30 100644
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
@@ -1,4 +1,4 @@
-local bit = require 'bit'
+local bit = require 'bit32'
local posix_fcntl = require 'posix.fcntl'
local posix_glob = require 'posix.glob'
local posix_syslog = require 'posix.syslog'
diff --git a/package/gluon-hoodselector/Makefile b/package/gluon-hoodselector/Makefile
index 9706a6058..e0dbf46fa 100644
--- a/package/gluon-hoodselector/Makefile
+++ b/package/gluon-hoodselector/Makefile
@@ -6,7 +6,7 @@ include ../gluon.mk
define Package/gluon-hoodselector
TITLE:=Automatically migrate nodes between domains.
- DEPENDS:=+luaposix +libgluonutil +lua-math-polygon +libjson-c +gluon-site +micrond +luabitop @GLUON_MULTIDOMAIN
+ DEPENDS:=+luaposix +libgluonutil +lua-math-polygon +libjson-c +gluon-site +micrond +lua-bit32 @GLUON_MULTIDOMAIN
CONFLICTS:=+gluon-config-mode-domain-select
endef
diff --git a/package/gluon-hoodselector/luasrc/usr/sbin/hoodselector b/package/gluon-hoodselector/luasrc/usr/sbin/hoodselector
index 1183584c6..808d90d5a 100755
--- a/package/gluon-hoodselector/luasrc/usr/sbin/hoodselector
+++ b/package/gluon-hoodselector/luasrc/usr/sbin/hoodselector
@@ -1,6 +1,6 @@
#!/usr/bin/lua
-local bit = require('bit')
+local bit = require('bit32')
local util = require ('gluon.util')
local unistd = require('posix.unistd')
local fcntl = require('posix.fcntl')
--
GitLab