Skip to content

Add network #7

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

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

Add network #7

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
779354b
feat: add macOS compatibility
qkdreyer Nov 26, 2023
92d5d25
wip: add network
qkdreyer Nov 28, 2023
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
6 changes: 3 additions & 3 deletions configs/garlicos_aarch64_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,8 @@ BR2_FORTIFY_SOURCE_1=y
#
BR2_ROOTFS_SKELETON_DEFAULT=y
# BR2_ROOTFS_SKELETON_CUSTOM is not set
BR2_TARGET_GENERIC_HOSTNAME="buildroot"
BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot"
BR2_TARGET_GENERIC_HOSTNAME="GarlicOS"
BR2_TARGET_GENERIC_ISSUE="Welcome to GarlicOS"
BR2_TARGET_GENERIC_PASSWD_SHA256=y
# BR2_TARGET_GENERIC_PASSWD_SHA512 is not set
BR2_TARGET_GENERIC_PASSWD_METHOD="sha-256"
Expand Down Expand Up @@ -416,7 +416,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="0"
BR2_TARGET_GENERIC_GETTY_TERM="vt100"
BR2_TARGET_GENERIC_GETTY_OPTIONS=""
BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y
BR2_SYSTEM_DHCP=""
BR2_SYSTEM_DHCP="wlan0"
BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
# BR2_ENABLE_LOCALE_PURGE is not set
BR2_GENERATE_LOCALE="af_ZA am_ET bg_BG ca_ES cs_CZ da_DK de_DE el_GR en_US es_ES et_EE fi_FI fil_PH fr_FR he_IL hi_IN hr_HR hu_HU id_ID is_IS it_IT ja_JP ko_KR lt_LT lv_LV ms_MY nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sr_RS sv_SE sw_KE th_TH tr_TR uk_UA vi_VN zh_CN zh_TW zu_ZA"
Expand Down
6 changes: 3 additions & 3 deletions configs/garlicos_armhf_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,8 @@ BR2_FORTIFY_SOURCE_1=y
#
BR2_ROOTFS_SKELETON_DEFAULT=y
# BR2_ROOTFS_SKELETON_CUSTOM is not set
BR2_TARGET_GENERIC_HOSTNAME="buildroot"
BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot"
BR2_TARGET_GENERIC_HOSTNAME="GarlicOS"
BR2_TARGET_GENERIC_ISSUE="Welcome to GarlicOS"
BR2_TARGET_GENERIC_PASSWD_SHA256=y
# BR2_TARGET_GENERIC_PASSWD_SHA512 is not set
BR2_TARGET_GENERIC_PASSWD_METHOD="sha-256"
Expand Down Expand Up @@ -448,7 +448,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="0"
BR2_TARGET_GENERIC_GETTY_TERM="vt100"
BR2_TARGET_GENERIC_GETTY_OPTIONS=""
BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y
BR2_SYSTEM_DHCP=""
BR2_SYSTEM_DHCP="wlan0"
BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
# BR2_ENABLE_LOCALE_PURGE is not set
BR2_GENERATE_LOCALE="af_ZA am_ET bg_BG ca_ES cs_CZ da_DK de_DE el_GR en_US es_ES et_EE fi_FI fil_PH fr_FR he_IL hi_IN hr_HR hu_HU id_ID is_IS it_IT ja_JP ko_KR lt_LT lv_LV ms_MY nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sr_RS sv_SE sw_KE th_TH tr_TR uk_UA vi_VN zh_CN zh_TW zu_ZA"
Expand Down
6 changes: 3 additions & 3 deletions configs/garlicos_mipsel_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ BR2_FORTIFY_SOURCE_1=y
#
BR2_ROOTFS_SKELETON_DEFAULT=y
# BR2_ROOTFS_SKELETON_CUSTOM is not set
BR2_TARGET_GENERIC_HOSTNAME="buildroot"
BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot"
BR2_TARGET_GENERIC_HOSTNAME="GarlicOS"
BR2_TARGET_GENERIC_ISSUE="Welcome to GarlicOS"
BR2_TARGET_GENERIC_PASSWD_SHA256=y
# BR2_TARGET_GENERIC_PASSWD_SHA512 is not set
BR2_TARGET_GENERIC_PASSWD_METHOD="sha-256"
Expand Down Expand Up @@ -364,7 +364,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="0"
BR2_TARGET_GENERIC_GETTY_TERM="vt100"
BR2_TARGET_GENERIC_GETTY_OPTIONS=""
BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y
BR2_SYSTEM_DHCP=""
BR2_SYSTEM_DHCP="wlan0"
BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
# BR2_ENABLE_LOCALE_PURGE is not set
BR2_GENERATE_LOCALE="af_ZA am_ET bg_BG ca_ES cs_CZ da_DK de_DE el_GR en_US es_ES et_EE fi_FI fil_PH fr_FR he_IL hi_IN hr_HR hu_HU id_ID is_IS it_IT ja_JP ko_KR lt_LT lv_LV ms_MY nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sr_RS sv_SE sw_KE th_TH tr_TR uk_UA vi_VN zh_CN zh_TW zu_ZA"
Expand Down
1 change: 1 addition & 0 deletions package/garlicui/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ menuconfig BR2_PACKAGE_GARLICUI
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_CJSON
select BR2_PACKAGE_ICU
select BR2_PACKAGE_NETWORK_MANAGER
help
Provides the Garlic user interface
7 changes: 4 additions & 3 deletions package/garlicui/garlicui.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
GARLICUI_VERSION = 2.0
GARLICUI_SITE = package/garlicui/src
GARLICUI_SITE_METHOD = local
GARLICUI_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/librsvg-2.0 -I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include -I$(STAGING_DIR)/usr/include/cairo -I$(STAGING_DIR)/usr/include/gdk-pixbuf-2.0 -I$(STAGING_DIR)/usr/include/libxml2 -I$(STAGING_DIR)/usr/include/cjson
GARLICUI_DEPENDENCIES = librsvg sdl sdl_gfx sdl_image sdl_ttf libxml2 cjson icu
GARLICUI_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/librsvg-2.0 -I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include -I$(STAGING_DIR)/usr/include/cairo -I$(STAGING_DIR)/usr/include/gdk-pixbuf-2.0 -I$(STAGING_DIR)/usr/include/libxml2 -I$(STAGING_DIR)/usr/include/cjson -I$(STAGING_DIR)/usr/include/libnm -I$(STAGING_DIR)/usr/include/libmount -I$(STAGING_DIR)/usr/include/blkid
GARLICUI_LDFLAGS = -lSDL -lSDL_image -lSDL_ttf -lSDL_gfx -lrsvg-2 -lcairo -lgobject-2.0 -lglib-2.0 -lxml2 -lcjson -licuuc -lm -pthread -lnm -lgio-2.0
GARLICUI_DEPENDENCIES = librsvg sdl sdl_gfx sdl_image sdl_ttf libxml2 cjson icu network-manager

define GARLICUI_BUILD_CMDS
$(MAKE) CFLAGS="$(GARLICUI_CFLAGS)" CC="$(TARGET_CC)" LD="$(TARGET_LD)" VERSION=$(GARLICUI_VERSION) -C $(@D)
$(MAKE) CFLAGS="$(GARLICUI_CFLAGS)" LDFLAGS="$(GARLICUI_LDFLAGS)" CC="$(TARGET_CC)" LD="$(TARGET_LD)" VERSION=$(GARLICUI_VERSION) -C $(@D)
endef

define GARLICUI_INSTALL_TARGET_CMDS
Expand Down
4 changes: 2 additions & 2 deletions package/garlicui/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ MO_FILES = $(patsubst %.po,%.mo,$(PO_FILES))
all: $(TARGET) translations

$(TARGET): $(wildcard *.c)
$(CC) $(CFLAGS) -lSDL -lSDL_image -lSDL_ttf -lSDL_gfx -lrsvg-2 -lcairo -lgobject-2.0 -lglib-2.0 -lxml2 -lcjson -licuuc -lm -DVERSION='"$(VERSION)"' -o '$@' $^
$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION='"$(VERSION)"' -o '$@' $^

translations: $(MO_FILES)

%.mo: %.po
msgfmt -o $@ $<
$(HOST_DIR)/bin/msgfmt -o $@ $<

clean:
-rm -rf $(TARGET) $(MO_FILES) *.o
4 changes: 4 additions & 0 deletions package/garlicui/src/clock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include <sys/time.h>
#include <sys/ioctl.h>
#ifdef __linux__
#include <linux/rtc.h>
#endif
#include <fcntl.h>

#include "clock.h"
Expand Down Expand Up @@ -66,6 +68,7 @@ void clock_set_current_time(time_t timestamp, int utc_offset)
// Open the device for read/write access
int dev_fd = open(dev_path, O_RDWR);

#ifdef __linux__
// We managed to open the device for read/write access
if (dev_fd >= 0)
{
Expand All @@ -87,6 +90,7 @@ void clock_set_current_time(time_t timestamp, int utc_offset)
// Close the device
close(dev_fd);
}
#endif

// Free the device path buffer
free(dev_path);
Expand Down
Loading