RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

base-files: add compatibility for APK and OPKG 

Both package managers work slightly different, i.e. stores files at
different places. Modify the `functions.sh` file to cover those.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2024-05-03 18:24:17 +02:00
parent 3010ab87bc
commit bcc641504d
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/base-files/files/lib/functions.sh
View File

@ -211,8 +211,10 @@ config_list_foreach() {
default_prerm() { default_prerm() {
local root="${IPKG_INSTROOT}" local root="${IPKG_INSTROOT}"
local pkgname="$(basename ${1%.*})" [ -z "$pkgname" ] && local pkgname="$(basename ${1%.*})"
local ret=0 local ret=0
local filelist="${root}/usr/lib/opkg/info/${pkgname}.list"
[ -f "$root/lib/apk/packages/${pkgname}.list" ] && filelist="$root/lib/apk/packages/${pkgname}.list"
if [ -f "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" ]; then if [ -f "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" ]; then
( . "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" ) ( . "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" )
@ -220,7 +222,7 @@ default_prerm() {
fi fi
local shell="$(command -v bash)" local shell="$(command -v bash)"
for i in $(grep -s "^/etc/init.d/" "$root/usr/lib/opkg/info/${pkgname}.list"); do for i in $(grep -s "^/etc/init.d/" "$filelist"); do
if [ -n "$root" ]; then if [ -n "$root" ]; then
${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" disable ${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" disable
else else
@ -235,8 +237,11 @@ default_prerm() {
} }
add_group_and_user() { add_group_and_user() {
local pkgname="$1" [ -z "$pkgname" ] && local pkgname="$(basename ${1%.*})"
local rusers="$(sed -ne 's/^Require-User: *//p' $root/usr/lib/opkg/info/${pkgname}.control 2>/dev/null)" local rusers="$(sed -ne 's/^Require-User: *//p' $root/usr/lib/opkg/info/${pkgname}.control 2>/dev/null)"
if [ -f "$root/lib/apk/packages/${pkgname}.rusers" ]; then
local rusers="$(cat $root/lib/apk/packages/${pkgname}.rusers)"
fi
if [ -n "$rusers" ]; then if [ -n "$rusers" ]; then
local tuple oIFS="$IFS" local tuple oIFS="$IFS"
@ -337,11 +342,20 @@ update_alternatives() {
default_postinst() { default_postinst() {
local root="${IPKG_INSTROOT}" local root="${IPKG_INSTROOT}"
local pkgname="$(basename ${1%.*})" [ -z "$pkgname" ] && local pkgname="$(basename ${1%.*})"
local filelist="/usr/lib/opkg/info/${pkgname}.list" local filelist="${root}/usr/lib/opkg/info/${pkgname}.list"
[ -f "$root/lib/apk/packages/${pkgname}.list" ] && filelist="$root/lib/apk/packages/${pkgname}.list"
local ret=0 local ret=0
if [ -e "${root}/usr/lib/opkg/info/${pkgname}.list" ]; then
filelist="${root}/usr/lib/opkg/info/${pkgname}.list"
add_group_and_user "${pkgname}" add_group_and_user "${pkgname}"
fi
if [ -e "${root}/lib/apk/packages/${pkgname}.list" ]; then
filelist="${root}/lib/apk/packages/${pkgname}.list"
update_alternatives install "${pkgname}"
fi
if [ -d "$root/rootfs-overlay" ]; then if [ -d "$root/rootfs-overlay" ]; then
cp -R $root/rootfs-overlay/. $root/ cp -R $root/rootfs-overlay/. $root/
@ -374,7 +388,7 @@ default_postinst() {
fi fi
local shell="$(command -v bash)" local shell="$(command -v bash)"
for i in $(grep -s "^/etc/init.d/" "$root$filelist"); do for i in $(grep -s "^/etc/init.d/" "$filelist"); do
if [ -n "$root" ]; then if [ -n "$root" ]; then
${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" enable ${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" enable
else else