Skip to content

Bugfix broken makefile and install in ExamplePackage #4

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

Open
pjdubya wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bugfix broken makefile and install in ExamplePackage #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
933530a
Update Makefile to avoid broken call to packageinstall
pjdubya Jun 5, 2024
426272e
Update install to fix problem with create_package_tgz not being execu…
pjdubya Jun 5, 2024
47cac29
Merge pull request #1 from pjdubya/bugfix-broken-makefile-and-install
pjdubya Jun 5, 2024
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
28 changes: 7 additions & 21 deletions ExamplePackage/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,13 @@

## You can use CC CFLAGS LD LDFLAGS CXX CXXFLAGS AR RANLIB READELF STRIP after include env.mak
include /env.mak

EXEC= examplePkg
OBJS= examplePkg.o

SUBDIR=ui WIZARD_UIFILES

.PHONY: all install $(SUBDIR)

all: $(EXEC) $(SUBDIR)

$(SUBDIR):
@echo "===>" $@
GenerateModuleFiles.php $@ $@
$(MAKE) -C $@ INSTALLDIR=$(INSTALLDIR)/$@ DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) $(MAKECMDGOALS);
@echo "<===" $@

packageinstall: $(SUBDIR)

install: $(EXEC) $(SUBDIR)
mkdir -p $(DESTDIR)/usr/local/bin/
install $< $(DESTDIR)/usr/local/bin/

all: $(EXEC)
$(EXEC): $(OBJS)
$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
install: $(EXEC)
mkdir -p $(DESTDIR)/usr/bin/
install $< $(DESTDIR)/usr/bin/
clean:
rm -rf *.o $(EXEC)
rm -rf *.o $(EXEC)
23 changes: 8 additions & 15 deletions ExamplePackage/SynoBuildConf/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,14 @@ mkdir -p $PKG_DIR
source /pkgscripts/include/pkg_util.sh

create_package_tgz() {
local firewere_version=
local package_tgz_dir=/tmp/_package_tgz
local binary_dir=$package_tgz_dir/usr/local/bin

### clear destination directory
rm -rf $package_tgz_dir && mkdir -p $package_tgz_dir

### install needed file into PKG_DIR
mkdir -p $binary_dir
cp -av examplePkg $binary_dir
make install DESTDIR="$package_tgz_dir" INSTALLDIR="$package_tgz_dir"
make packageinstall DESTDIR="$package_tgz_dir" PKG_DIR="$PKG_DIR"

### create package.tgz $1: source_dir $2: dest_dir
pkg_make_package $package_tgz_dir "${PKG_DIR}"
local firewere_version=
local package_tgz_dir=/tmp/_package_tgz
local binary_dir=$package_tgz_dir/usr/bin
rm -rf $package_tgz_dir && mkdir -p $package_tgz_dir
mkdir -p $binary_dir
cp -av examplePkg $binary_dir
make install DESTDIR="$package_tgz_dir"
pkg_make_package $package_tgz_dir "${PKG_DIR}"
}

create_spk(){
Expand Down